Commit Graph

16415 Commits

Author SHA1 Message Date
Jeff Sharkey
13bf562810 Merge "Add legacy DownloadManager actions to SystemApi." into oc-dev am: cd77661682
am: b69a811663

Change-Id: I8fffc67efba50df539ff07a8f7f472959596ae88
2017-04-04 22:56:17 +00:00
Todd Kennedy
158a760a54 Merge "Change name of the intent fields" into oc-dev am: 5379b05256
am: 368628cd8e

Change-Id: I0861afea841e3e5b4b2bf94d522e6ddc2eca2cc4
2017-04-04 22:54:13 +00:00
Jeff Sharkey
b69a811663 Merge "Add legacy DownloadManager actions to SystemApi." into oc-dev
am: cd77661682

Change-Id: I8ce4e00a78c4ac4b3ffd783bccee10855fa19df0
2017-04-04 22:48:24 +00:00
Todd Kennedy
368628cd8e Merge "Change name of the intent fields" into oc-dev
am: 5379b05256

Change-Id: Iad6fe0e4e64820fafd3bfbfb0d721293d03784cf
2017-04-04 22:46:15 +00:00
TreeHugger Robot
cd77661682 Merge "Add legacy DownloadManager actions to SystemApi." into oc-dev 2017-04-04 22:42:10 +00:00
Tyler Gunn
65f1f8b36a Merge "Merge "Add api to retrieve call creation time." am: f19c52d20d am: 777adc636b am: eee4d5157a" into oc-dev-plus-aosp
am: c5cedc7bb7

Change-Id: Ic0b481c3cbab39e2a521588ef907144221018edd
2017-04-04 22:01:08 +00:00
Tyler Gunn
36cd1fd124 Merge "Add api to retrieve call creation time." am: f19c52d20d am: 777adc636b
am: eee4d5157a

Change-Id: I9af3abdb0cf76b4e70547b1c58732fef3e07f86b
2017-04-04 21:53:01 +00:00
Tyler Gunn
f19c52d20d Merge "Add api to retrieve call creation time." 2017-04-04 21:35:26 +00:00
Jeff Sharkey
8d5d065cdf Add legacy DownloadManager actions to SystemApi.
They're still used by at least one bundled app.

Test: builds, boots
Bug: 35256608
Change-Id: I45966b3e0ed506ead4544bbbfc9d82b7f9d5205d
2017-04-04 14:38:47 -06:00
Todd Kennedy
d46a1604b7 Change name of the intent fields
Change-Id: I67d3f5c7fb3189fdb35908011e92cc82c24b9154
Fixes: 36594944
Test: cts-tradefed run commandAndExit cts-dev -m CtsSignatureTestCases -t android.signature.cts.IntentTest#shouldNotFindUnexpectedIntents
2017-04-04 13:33:13 -07:00
Selim Gurun
4b2b262de5 Merge "Disable WebView autocomplete feature." into oc-dev am: dd7414a644
am: 912a291335

Change-Id: I57d82168042a67bbbdd5f4a59a9ecefdb8ca0940
2017-04-04 19:49:25 +00:00
Dongwon Kang
2b4465cee2 Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev am: 8d84e4cd1c
am: 9ecff180af

Change-Id: Ia3a31f0c20273fb1fe0fd230c0544a46af54f9d6
2017-04-04 19:48:20 +00:00
Selim Gurun
912a291335 Merge "Disable WebView autocomplete feature." into oc-dev
am: dd7414a644

Change-Id: I7ca639fbafb543dba5d226de3b66e7d90d22da89
2017-04-04 19:39:16 +00:00
Jean-Michel Trivi
f52ef25a43 Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev am: 6cf445bd3d
am: f81f4c09b6

Change-Id: Id0163eb6545d772bb13ade341064310bcd7aed43
2017-04-04 19:39:11 +00:00
Dongwon Kang
9ecff180af Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev
am: 8d84e4cd1c

Change-Id: If9ffaf1fd87e3cbc75da01c28142797e58d1cc7f
2017-04-04 19:33:33 +00:00
TreeHugger Robot
dd7414a644 Merge "Disable WebView autocomplete feature." into oc-dev 2017-04-04 19:31:51 +00:00
Jean-Michel Trivi
f81f4c09b6 Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev
am: 6cf445bd3d

Change-Id: Ia8cd7ef85f4577aea668335396ec27533615b3d7
2017-04-04 19:31:13 +00:00
TreeHugger Robot
8d84e4cd1c Merge "TIF: hide BaseProgramColumns and BasePreviewColumns" into oc-dev 2017-04-04 19:23:25 +00:00
Jean-Michel Trivi
6cf445bd3d Merge "Revert "AudioAttributes: remove static getVolumeControlStream method"" into oc-dev 2017-04-04 19:08:37 +00:00
Seigo Nonaka
05c4205a34 Merge "Change justification parameter from boolean to int." into oc-dev am: 04fc05cd66
am: c81f06186b

Change-Id: I156f5acc74bd7bda77217698dd3756e2c729a035
2017-04-04 18:45:30 +00:00
Seigo Nonaka
c81f06186b Merge "Change justification parameter from boolean to int." into oc-dev
am: 04fc05cd66

Change-Id: Ie4fcc93178abfb850068612b02cf3c82dba71377
2017-04-04 18:39:06 +00:00
TreeHugger Robot
4e4252354d Merge changes from topics 'KeyboardFocusHighlight_mUseDefaultFocusHighlight', 'KeyboardFocusHighlight', 'KeyboardFocusHighlight_DetectUnhandled'
* changes:
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.
2017-04-04 18:38:21 +00:00
TreeHugger Robot
04fc05cd66 Merge "Change justification parameter from boolean to int." into oc-dev 2017-04-04 18:29:58 +00:00
Jean-Michel Trivi
e4a9911b68 Revert "AudioAttributes: remove static getVolumeControlStream method"
This reverts commit e0b5bf50d6.

Change-Id: I2f3f10c149b205d22c41d5c9767ea10b0dee7682
2017-04-04 18:26:44 +00:00
Kang Li
8b0979666a Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am: 6df90fa53b

Change-Id: I667b1f9d07305d58f921280f8b8fe9ede0aeea1e
2017-04-04 17:51:03 +00:00
Kang Li
6df90fa53b Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-04 17:42:32 +00:00
Selim Gurun
13e5b0bb97 Disable WebView autocomplete feature.
Platform is now providing autofill feature. Disable WebView's simple
form data save feature for platform O and above.

Test: Removing the functionality and the test
Bug: 36869838

Change-Id: If6b9fc12edbe4146fca99d9c6ef8fde36d61f852
2017-04-04 10:19:28 -07:00
Dongwon Kang
0a1c6a54d2 TIF: hide BaseProgramColumns and BasePreviewColumns
Note: BaseColumns(API 1) and BaseTvColumns(API 21) remains public due to
the backward compatability. Plus, inheritence between BaseProgramColumns
and BasePreviewColumns is also removed to follow patterns in other
Contracts.

Test: cts-tradefed run cts -m CtsTvTestCases -t android.media.tv.cts.TvContractTest
Bug: 36395855
Change-Id: Ie73a2e48217676be53f373f8524afd04f7d8fc37
2017-04-04 10:11:45 -07:00
Seigo Nonaka
c802751704 Merge "Reorganize font enumeration API." into oc-dev am: 2ac9698271
am: de5fa6b3d8

Change-Id: I72a02f3f681b3b5f82cffc317fe0668e842464fe
2017-04-04 17:04:40 +00:00
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
2017-04-04 16:59:13 +00:00
Seigo Nonaka
de5fa6b3d8 Merge "Reorganize font enumeration API." into oc-dev
am: 2ac9698271

Change-Id: Ie9bdcdb8d5997db421b783475e1058027cc4bb6f
2017-04-04 16:56:29 +00:00
TreeHugger Robot
2ac9698271 Merge "Reorganize font enumeration API." into oc-dev 2017-04-04 16:49:56 +00:00
Treehugger Robot
35e9a94dee Merge "Make some intents public in SubscriptionManager." 2017-04-04 16:48:33 +00:00
Jean-Michel Trivi
847cef792a Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev am: adc1605530
am: ce7558003b

Change-Id: If92d1355d0b3ee28ee7f3c51fdf8a736c6ce5f98
2017-04-04 15:49:01 +00:00
Jean-Michel Trivi
ce7558003b Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev
am: adc1605530

Change-Id: I41e42c383dd1746835fab4a7d1712ab4323636d2
2017-04-04 15:40:34 +00:00
TreeHugger Robot
adc1605530 Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev 2017-04-04 15:32:25 +00:00
Jean-Michel Trivi
9eab2eaed8 Merge "Audio focus: API for external audio focus policy" into oc-dev am: 4d52ae9707
am: 23e6cea555

Change-Id: Ica9bca5dde505616999eafded3f0861ce0fcffff
2017-04-04 02:52:15 +00:00
Jean-Michel Trivi
23e6cea555 Merge "Audio focus: API for external audio focus policy" into oc-dev
am: 4d52ae9707

Change-Id: I68deedce617588f0d7947183892727b5ed6c18b4
2017-04-04 02:47:17 +00:00
TreeHugger Robot
4d52ae9707 Merge "Audio focus: API for external audio focus policy" into oc-dev 2017-04-04 02:40:02 +00:00
Philip P. Moltmann
872c968c0d Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev am: c56defe9c0
am: b0ed6b837e

Change-Id: I7cef506e23205de73d337b54979ed9f59d283495
2017-04-04 02:13:00 +00:00
Philip P. Moltmann
b0ed6b837e Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev
am: c56defe9c0

Change-Id: I1f35ccc57b721fc72fdb22f0bd98c9436b1570e8
2017-04-04 02:05:16 +00:00
TreeHugger Robot
c56defe9c0 Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 2017-04-04 01:57:23 +00:00
Daniel Cardenas
a66371e9be Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52
am: dbcf5279ad

Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8
2017-04-04 01:47:15 +00:00
Daniel Cardenas
dbcf5279ad Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev
am: d017221a52

Change-Id: Icf9271e418052931ca15c3a7727f01cfedd044c9
2017-04-04 01:38:16 +00:00
TreeHugger Robot
d017221a52 Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 2017-04-04 01:28:43 +00:00
Dongwon Kang
10b9632eac Merge "TIF: use integer for constants instead of string" into oc-dev am: b43a5305bd
am: 2227541021

Change-Id: Ib3661309d1969e5b6407c739e4112d9c2a83e00d
2017-04-04 01:26:33 +00:00
Dongwon Kang
2227541021 Merge "TIF: use integer for constants instead of string" into oc-dev
am: b43a5305bd

Change-Id: I84143eee4102a8e40f74571b8c8903ff5a10cb56
2017-04-04 01:19:09 +00:00
TreeHugger Robot
b43a5305bd Merge "TIF: use integer for constants instead of string" into oc-dev 2017-04-04 01:10:44 +00:00
Hangyu Kuang
60024fca06 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev am: 99442d3427
am: 958a284426

Change-Id: I0df6e5b0ba764b5b1f80e3e96b9ab7ecaf756a61
2017-04-04 00:50:07 +00:00
Hangyu Kuang
958a284426 Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev
am: 99442d3427

Change-Id: I4fc864ea29049ea4585dd71ee8a921b35ae7e147
2017-04-04 00:42:31 +00:00