Commit Graph

70039 Commits

Author SHA1 Message Date
Adam Lesinski
6db2ee975e Merge "Merge "Fix issue with fontScale changes not taking effect" into oc-dev am: 83c9413b75" into oc-dev-plus-aosp
am: a79d516e63

Change-Id: Ib158c3a45ec89b7374418c064d7b46cc4ab8f551
2017-04-19 23:34:56 +00:00
Sunny Goyal
89106cdbdf Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev am: 7790695bf2
am: fa7cc65529

Change-Id: Ic916650a42614c88dca4050078bd854c3546288a
2017-04-19 23:01:03 +00:00
TreeHugger Robot
5f21d7befa Merge "Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c" 2017-04-19 22:56:55 +00:00
TreeHugger Robot
54639924c3 Merge "Add implementation alternatives for OemLockManager." 2017-04-19 22:53:17 +00:00
TreeHugger Robot
1dcb94632a Merge "Opt out default focus highlight for TV." 2017-04-19 22:18:57 +00:00
TreeHugger Robot
92dd7193d4 Merge "Pre-merge hide API for a11y service state" 2017-04-19 21:52:07 +00:00
Robert Greenwalt
2a7fee4e33 Merge commit '695d2c6df10c99cef25cfca584db9b0e164cdc9f' into manual_merge_695d2c6df10c
Change-Id: I768181b347ac5676f3535d94a26ca9e81178a110
2017-04-19 14:03:30 -07:00
Tomasz Wasilczyk
66519b9083 Merge "Make RadioService actually talking to the HAL." 2017-04-19 20:51:36 +00:00
Adam Lesinski
cb81f508cc Merge "Fix issue with fontScale changes not taking effect" into oc-dev
am: 83c9413b75

Change-Id: I8afef55cae842c94c24c7cece1b8c5c90e6841c1
2017-04-19 18:41:00 +00:00
Sunny Goyal
fa7cc65529 Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev
am: 7790695bf2

Change-Id: I3520dc3c3a5cbe933894764e2d3f7ac9df11582e
2017-04-19 18:33:04 +00:00
Robert Greenwalt
695d2c6df1 Merge commit 'd6c9efa3323f3f5ae44abe312ae5a1e6ef3816ce' into manual_merge_d6c9efa3323f
Change-Id: I86d5e87cc3884d8fc3eb326a92b8871ef0926aa6
2017-04-19 11:24:03 -07:00
Tomasz Wasilczyk
d7c21d3cbf Make RadioService actually talking to the HAL.
For now, only opening and closing a tuner is implemented.

Test: instrumentation, KitchenSink
Bug: b/36863239
Change-Id: Ib2e14c0108c0714524d50b9557f24465c68f5ef2
2017-04-19 10:59:00 -07:00
Jiaquan He
f5a0d099b3 Opt out default focus highlight for TV.
Test: Checked that the default focus highlight doesn't show on TV.
Bug: 37160940
Change-Id: Id3719ce1aa602ba6792cc94c9fa034670509cda0
2017-04-19 10:54:10 -07:00
TreeHugger Robot
83c9413b75 Merge "Fix issue with fontScale changes not taking effect" into oc-dev 2017-04-19 17:32:30 +00:00
Sunny Goyal
7790695bf2 Merge "Adding API AppWidgetHost.getAppWidgetIds() to get active widgets of the host" into oc-dev 2017-04-19 17:10:42 +00:00
Robert Greenwalt
d6c9efa332 Merge "Mark Restricted APN connections as restricted." into oc-dev 2017-04-19 17:09:35 +00:00
Tao Bao
a37881db3d Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev am: a532f4d7f8
am: 9da2190238

Change-Id: Ic99e657d13ee7a6390aa1af57ce3b85925e953be
2017-04-19 16:44:24 +00:00
Tao Bao
9da2190238 Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev
am: a532f4d7f8

Change-Id: Ia44184bcefda25a8cbf362d4b911713669bace32
2017-04-19 16:38:58 +00:00
Tao Bao
a532f4d7f8 Merge "RecoverySystem: Enable the package compatibility verification." into oc-dev 2017-04-19 16:30:28 +00:00
Jakub Pawlowski
d605930b90 Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21 am: 0c9c0969cc am: 8359e191ae
am: cf990de525

Change-Id: I0ea7e4b4231a0eacbe3d5803debf3d2571690166
2017-04-19 16:27:03 +00:00
Jakub Pawlowski
cf990de525 Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21 am: 0c9c0969cc
am: 8359e191ae

Change-Id: I435d7755d39068730089764916de56b23411cc49
2017-04-19 16:20:37 +00:00
Jakub Pawlowski
8359e191ae Merge "Read by UUID for PTS tests (1/5)" am: 7826c08e21
am: 0c9c0969cc

Change-Id: Ia850b9ad1d0d2e92a2c987c2c1cd24a44f7cfb3f
2017-04-19 16:13:50 +00:00
Tao Bao
5b7925d78d Merge "RecoverySystem: Verify the package compatibility." into oc-dev am: e3872a4fc9
am: a9fd199fdd

Change-Id: I65c9418a651dd66f274ab6e331185731be10e8ea
2017-04-19 16:10:20 +00:00
Tao Bao
a9fd199fdd Merge "RecoverySystem: Verify the package compatibility." into oc-dev
am: e3872a4fc9

Change-Id: I120d13b68e837c6ebb60baf8d3fe3aecb495159f
2017-04-19 16:05:25 +00:00
Tao Bao
e3872a4fc9 Merge "RecoverySystem: Verify the package compatibility." into oc-dev 2017-04-19 15:54:24 +00:00
Andrew Scull
5d7027db6e Add implementation alternatives for OemLockManager.
The OEM lock can be implemented with the persistent data block or the
OemLock HAL.

Test: gts-tradefed run gts -m GtsOemLockServiceTestCases -t com.google.android.oemlock.gts.OemLockServiceTest
Bug: 34766843
Change-Id: I16b31785d9af58212a050a299ef024be3139f0c6
2017-04-19 15:17:34 +01:00
Felipe Leme
20ab6c550d Merge "Some Autofill API changes." into oc-dev am: fe1bddfbb5
am: a4d2749cf8

Change-Id: I460229f5bf0c4fc832256e00746a813fd08991ea
2017-04-19 05:18:57 +00:00
Felipe Leme
a4d2749cf8 Merge "Some Autofill API changes." into oc-dev
am: fe1bddfbb5

Change-Id: I682065cd5fcfb2de9639874705fefdeaed06d343
2017-04-19 05:13:19 +00:00
Felipe Leme
fe1bddfbb5 Merge "Some Autofill API changes." into oc-dev 2017-04-19 05:05:48 +00:00
Lucas Dupin
74411669a2 Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev am: 9cd92959e6
am: 9169df47c5

Change-Id: I52ee3b55f0e6e7735738ec1ac07dd0e44d04124d
2017-04-19 03:29:45 +00:00
Lucas Dupin
9169df47c5 Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev
am: 9cd92959e6

Change-Id: Ib71474073088c9098652f1f1a792aab615676cd9
2017-04-19 03:24:40 +00:00
TreeHugger Robot
9cd92959e6 Merge "Fix for SurfaceView out of a view hierarchy" into oc-dev 2017-04-19 03:17:50 +00:00
Svetoslav Ganov
35f1fe1854 Merge "Address API council comments" into oc-dev am: 57ed0ba69d
am: dca67a7f48

Change-Id: I991a268bf1dfc908249c3114802ea0cc2b567c63
2017-04-19 03:06:36 +00:00
Sunny Goyal
bfb5991945 Merge "Creating a common class for loading drawables and handling various badging" into oc-dev am: 15b48ff4de
am: cdb51ebb41

Change-Id: If4ee1ff513c4f52b102a9252c99e813d783f6d1d
2017-04-19 03:03:37 +00:00
Svetoslav Ganov
dca67a7f48 Merge "Address API council comments" into oc-dev
am: 57ed0ba69d

Change-Id: I28253a456f288da02506367a2b9039cffb1d0a25
2017-04-19 02:56:39 +00:00
Philip P. Moltmann
e43fe0af9d Merge "Add a way to read the last AutofillSelection." into oc-dev am: 42775f2a89
am: ded76ed806

Change-Id: I8cf4a959e9d60bd15c61955a802115904a2baead
2017-04-19 02:56:07 +00:00
Sunny Goyal
cdb51ebb41 Merge "Creating a common class for loading drawables and handling various badging" into oc-dev
am: 15b48ff4de

Change-Id: Ifce032deebbe1dd66d4e80dd211030765daab4a0
2017-04-19 02:53:05 +00:00
Philip P. Moltmann
ded76ed806 Merge "Add a way to read the last AutofillSelection." into oc-dev
am: 42775f2a89

Change-Id: I6be640dc4bf6ceba6889c59a4e464540f3834e6e
2017-04-19 02:50:01 +00:00
Svetoslav Ganov
57ed0ba69d Merge "Address API council comments" into oc-dev 2017-04-19 02:44:18 +00:00
TreeHugger Robot
15b48ff4de Merge "Creating a common class for loading drawables and handling various badging" into oc-dev 2017-04-19 02:43:47 +00:00
TreeHugger Robot
42775f2a89 Merge "Add a way to read the last AutofillSelection." into oc-dev 2017-04-19 02:43:08 +00:00
Felipe Leme
e5f9c30688 Some Autofill API changes.
- Added View.IMPORTANT_FOR_AUTOFILL_YES_INCLUDE_DESCENDANTS
- Added View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS
- Added FillResponse.Builder.setIgnoredIds()
- Fixed javadoc links.

These changes are not implemented yet....

Bug: 37424141
Bug: 36171235
Test: m update-api

Change-Id: I604960443ab08cd3f2a84a70b0a2cece7cb0a00c
2017-04-18 19:27:58 -07:00
Todd Kennedy
f84fedf2d4 Merge "update docs per API council" into oc-dev am: e28cccab24
am: 62fc9fd7e7

Change-Id: I187df43e72344e73e1c3d9572a3d692a284ca51b
2017-04-19 01:45:37 +00:00
Todd Kennedy
62fc9fd7e7 Merge "update docs per API council" into oc-dev
am: e28cccab24

Change-Id: I156e1547adab002afee19bacbd13808936a48775
2017-04-19 01:40:36 +00:00
TreeHugger Robot
e28cccab24 Merge "update docs per API council" into oc-dev 2017-04-19 01:31:46 +00:00
Nathan Harold
fca728da6c Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev 2017-04-19 00:36:21 +00:00
Nathan Harold
01307a7e94 Merge "Consistenly Throw IOExceptions from IpSecManager" into oc-dev 2017-04-19 00:34:24 +00:00
Felipe Leme
8a7b06d865 Merge "Clone autofill service settings on managed profile." into oc-dev am: fad9b07e31
am: 0f3a9cf166

Change-Id: I24535dee497b3a4c0e7247f0cf5bb3e6054f62f0
2017-04-19 00:33:58 +00:00
Felipe Leme
0f3a9cf166 Merge "Clone autofill service settings on managed profile." into oc-dev
am: fad9b07e31

Change-Id: I0c65659302047536a2b2b594cdb90e1aa05b4621
2017-04-19 00:28:27 +00:00
TreeHugger Robot
fad9b07e31 Merge "Clone autofill service settings on managed profile." into oc-dev 2017-04-19 00:20:09 +00:00