Commit Graph

74187 Commits

Author SHA1 Message Date
TreeHugger Robot
54ff7e7582 Merge changes I36636687,I4c45f787 into oc-mr1-dev
* changes:
  Doc updates
  Translate default channel on locale change
2017-08-17 15:54:52 +00:00
Daniel Sandler
d33fe05c66 Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
  Revert "Add API to allow apps more control over instantiation"
  Revert "Add plugin to swap out recents"
2017-08-17 14:32:40 +00:00
TreeHugger Robot
c3e7f875b4 Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev 2017-08-17 09:06:57 +00:00
Charles He
8b2513e439 Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev 2017-08-17 07:54:05 +00:00
Lorenzo Colitti
d66cf56ba6 Tell the system when tethering offload hits a limit.
Add a new tetherLimitReached method to INetworkManagementService,
and call it when the HAL notifies OffloadController because the
limit has been reached.

Bug: 29337859
Bug: 32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I0304e555544ee18c83244672766c767cbad650a1
2017-08-17 15:33:18 +09:00
TreeHugger Robot
10d176009d Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev 2017-08-17 03:07:02 +00:00
TreeHugger Robot
c4ed76f527 Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev 2017-08-17 01:27:06 +00:00
Philip P. Moltmann
4c0e55d0fc Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev 2017-08-16 23:49:21 +00:00
Felipe Leme
cf1ff6ca3d Revert "Dismiss Autofill Save UI when a new Activity is launched."
This reverts commit 05ea98a3f9.

Bug: 64693551

Change-Id: I8e7a7b2c5f575cee28f977ae7f3c10752a15d49c
2017-08-16 23:34:06 +00:00
David Stevens
341cd735cb Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev 2017-08-16 23:15:05 +00:00
TreeHugger Robot
07c83d00c9 Merge "API Council feedback" into oc-mr1-dev 2017-08-16 22:55:52 +00:00
TreeHugger Robot
ee3602595a Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev 2017-08-16 22:49:49 +00:00
TreeHugger Robot
6598a4ed52 Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev 2017-08-16 22:10:46 +00:00
TreeHugger Robot
a9774680f8 Merge "Do not filter out some colors" into oc-mr1-dev 2017-08-16 19:38:45 +00:00
Kevin Hufnagle
9c43a77971 Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
am: d6d6d2cf79

Change-Id: I63af60b006618bdd8bb74d351f9c17432f411b63
2017-08-16 19:16:10 +00:00
Kevin Hufnagle
d6d6d2cf79 Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
am: 80376a98a5

Change-Id: Iae8814e722f7861ecd96980d16c06a676c6ad1dc
2017-08-16 19:01:36 +00:00
Kevin Hufnagle
80376a98a5 Merge "docs: Updated ShortcutManager API reference guide." into oc-dev 2017-08-16 18:44:34 +00:00
Bryce Lee
92a84efba1 Merge "Update references to O MR1 to proper codename." into oc-mr1-dev 2017-08-16 17:30:43 +00:00
Romain Guy
010f082490 Hide shared buffer mode/auto refresh on Surface
Bug: 63858546
Test: Compile & boot

Change-Id: I34372593d4b47b143e65d30f669f883c69653f62
2017-08-16 10:02:10 -07:00
Philip P. Moltmann
083d8aace7 Don't get struct of children of !laidout viewGroup
Some view groups (e.g. the support.v4.viewPager) need to be laid out
to determine the order of it's children. As we need the order before
being able to collect the structure of the children we need to skip
their collection until they are laid out.

Fixes: 38198484
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
      cts-tradefed run cts-dev -m CtsAccessibilityTestCases
      cts-tradefed run cts-dev -m CtsAccessibilityServiceTestCases

Change-Id: I1f7bee1505edaf70c9d9a686be6f9a76d8aedd0b
2017-08-16 16:03:15 +00:00
TreeHugger Robot
947528607f Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev 2017-08-16 10:13:09 +00:00
Selim Cinek
a8cb126d86 Reducing the image sizes further for low-ram devices
We're reducing the image sizes by a factor of 2, which is
a good compromise between image quality and memory reduction.

Test: add notifications on a low ram device, observe normal notifications
Change-Id: I344494bdcda950ad7461c43d9a08bf63c0bae266
Fixes: 62253442
2017-08-15 17:00:58 -07:00
TreeHugger Robot
6ba128762f Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev 2017-08-15 22:23:57 +00:00
Felipe Leme
2220049d58 Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880
am: a3c2cee055

Change-Id: Ie107dd462a47009a34ee3768183dfda2e36107c3
2017-08-15 21:48:32 +00:00
Charles He
77f3300f48 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf am: 0fa9328b80
am: b0fa5855dc

Change-Id: Iaadf2350cd86ffc598e666e0d9dc735e5a7889f0
2017-08-15 21:35:05 +00:00
Felipe Leme
a3c2cee055 Merge "Additional documentation about Autofill / WebView security." into oc-dev
am: 36cbdef880

Change-Id: Ie198dbbdc7ab4ea1089c7363f1b1d2df333c1d8f
2017-08-15 21:33:01 +00:00
Charles He
b0fa5855dc [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
am: 0fa9328b80

Change-Id: I4fc74296d3da5fef830e9ffe0eedc74bb4fb047b
2017-08-15 21:16:36 +00:00
TreeHugger Robot
36cbdef880 Merge "Additional documentation about Autofill / WebView security." into oc-dev 2017-08-15 21:12:32 +00:00
Dan Sandler
07fe63e5de Revert "Add API to allow apps more control over instantiation"
This reverts commit 6945710e12.

Bug: 64345190
Test: n/a
Change-Id: Id0aa0f3c9fca64476d163ea8b42a74182050b3ae
2017-08-15 16:48:42 -04:00
Android Build Merger (Role)
0fa9328b80 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf
Change-Id: If5cad5c0f361acda25df4d90de06821d16e689c0
2017-08-15 20:47:03 +00:00
Charles He
24587d57cf [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
am: 159cd14334

Change-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014
2017-08-15 20:42:11 +00:00
TreeHugger Robot
3d141421f8 Merge "Improved WallpaperService.Engine tests" into oc-mr1-dev 2017-08-15 20:24:27 +00:00
David Stevens
f62360cafa DO NOT MERGE Let external activities run when the primary display is off
- Make activity sleep state independent of power manager wakefulness
  state. The state is now entirely dependent on sleep tokens (and the
  voice interactor).
- Make sleep tokens operate on a per-display basis (and convert the
  keyguard to a sleep token).
- Make ActivityStackSupervisor acquire/release sleep tokens for
  non-default displays when the displays are turned on/off.
- Make WindowManagerService.okToDisplay operate on a per-display basis.

Bug: 34280365
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testExternalDisplayActivityTurnPrimaryOff
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Test: #testExternalDisplayToggleState
Change-Id: I92086d7006a67b4b4f320c9bb3aa606954f85012
(cherry picked from commit 9440dc87a6)
2017-08-15 18:57:48 +00:00
Julia Reynolds
399d9bfa21 Doc updates
Bug: 64445247
Change-Id: I366366870dae0ab5f3bc9f22d6388234083a758a
Fixes: 63712730
Test: make
2017-08-15 14:57:09 -04:00
Lucas Dupin
e2efebc8a2 Do not filter out some colors
Colors specified manually using the public WallpaperColors
constructor should not be blacklisted.

Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I96faf413e3629c247220d825bb7c3480ed2f1003
Fixes: 64361146
2017-08-15 11:30:19 -07:00
Charles He
159cd14334 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4
Change-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00
2017-08-15 17:54:35 +00:00
Charles He
40317127f4 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4
Change-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478
2017-08-15 17:54:05 +00:00
Charles He
4acf4fabf4 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49
Change-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741
2017-08-15 17:53:35 +00:00
Charles He
a3c1de7e49 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d
Change-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7
2017-08-15 17:52:57 +00:00
Charles He
6dfc8d8d4d [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
2017-08-15 17:52:27 +00:00
Charles He
1cd9e8096f [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
2017-08-15 17:51:58 +00:00
Charles He
b1141b6ff0 [automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
2017-08-15 17:51:28 +00:00
Felipe Leme
f480e8cad5 Improved autofill support on DatePicker and TimePicker:
- Save autofilled value so UI is properly highlighted.
- Notify TimePicker listener just once.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsWidgetTestCases -t android.widget.cts.DatePickerTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsWidgetTestCases -t android.widget.cts.TimePickerTest

Fixes: 37098837

Change-Id: I38d64c107f6059b94c92676ea37681006474f519
2017-08-15 10:42:58 -07:00
TreeHugger Robot
3568046048 Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev 2017-08-15 17:22:18 +00:00
Lucas Dupin
416fe954e9 Improved WallpaperService.Engine tests
Using final variables when possible, also testing if
overlaping invalidation requests will be posted to
the handler.

Bug: 63585249
Test: runtest -x services/tests/servicestests/src/com/android/server/wallpaper/WallpaperServiceTests.java
Change-Id: I01cdbdfd5313e55d7a58c77f705aea0f6f817518
2017-08-15 10:19:48 -07:00
Benjamin Miller
1aed7889c0 Docs: Javadoc comment fixups for secure passcode reset methods.
Exceptions corrected for methods and cross references linked up.
Clarification about resetPassword() and work profiles.
Staged at: go/dac-stage/reference/android/app/admin/DevicePolicyManager.html

Test: make ds-docs with output staged and visually checked in DevicePolicyManager page
Bug: 38026339
Change-Id: I3346144193061fad7988c92e0d4be4b341ef7410
2017-08-15 18:34:06 +02:00
Neil Fuller
a22dcfed28 Merge "Change SystemApi as per API council feedback" into oc-mr1-dev 2017-08-15 15:57:33 +00:00
Charles He
c57a01c166 Opt-out for always-on VPN: rename API.
Rename the opt-out flag in AndroidManifest to
SERVICE_META_DATA_SUPPORTS_ALWAYS_ON
as directed by the API Council.

Bug: 64331776
Bug: 36650087
Test: runtest --path java/com/android/server/connectivity/VpnTest.java
Change-Id: I24326fad7a89083a2409134640bda81ee0359d08
2017-08-15 15:52:39 +01:00
Lorenzo Colitti
4faae82855 Merge changes Ifbd1e8d9,I1e017b6f into oc-mr1-dev
* changes:
  Pass data usage limits to tethering offload code.
  Don't time out when fetching tether offload stats.
2017-08-15 06:47:24 +00:00
Lorenzo Colitti
62801ec2b7 Pass data usage limits to tethering offload code.
(cherry picked from commit 50b60fc34d)

Bug: 29337859
Bug: 32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: Ifbd1e8d9057aa12b956e3b4501c32aa6bcf420bd
2017-08-15 12:12:04 +09:00