Commit Graph

11768 Commits

Author SHA1 Message Date
Wale Ogunwale
822e512127 Introducing WindowConfiguration
Used to house configurations that don't affect resources and that
we don't want to communicate to apps, but need to be propagated
along side Configuration.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I97de3efbe6d5e1d3b07156a8cfbce9be5eae5cb5
2017-08-18 07:57:06 -07:00
Julia Reynolds
33515a25cb Merge changes I36636687,I4c45f787 into oc-mr1-dev am: 54ff7e7582
am: d82e4add2a

Change-Id: I8b3eded4fb3f3e0913db1176aae1197a1020db2b
2017-08-17 16:10:59 +00:00
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
1b5b4a9b38 Merge changes from topic "revert-injectors" into oc-mr1-dev am: d33fe05c66
am: bb143bafe2

Change-Id: Ifb14907d0ac210a247d3014235193c13c7e20263
2017-08-17 14:50:53 +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
Charles He
478b2b7cbf Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev am: 8b2513e439
am: 337ee0771e

Change-Id: Ib4eca8d5ea79e5ac65496bee8390e5ce4cd8fb64
2017-08-17 08:12:56 +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
Felipe Leme
e48324fecd Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev am: 10d176009d
am: d946caaaef

Change-Id: Icff915376a79348074c2b84ef9e52cc15e27d35c
2017-08-17 06:05:30 +00:00
Selim Cinek
3315d9837e Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev am: c4ed76f527
am: c5762848c3

Change-Id: Ie695f07751d32a01c0a119be155fed8865eff486
2017-08-17 05:21:14 +00:00
Lucas Dupin
1d0eda938a Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
am: fda1152e59

Change-Id: I056fbfc35e8523f50c6194ce4b80e70eb17b8aee
2017-08-17 03:24:34 +00: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
Lucas Dupin
bc3a3df807 Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
am: 69bb2bae90

Change-Id: I04da1b0857fcdecf8f662936f41ddb7bc026dd21
2017-08-17 01:03:22 +00:00
Bryce Lee
a7ec0565c6 Merge "Update references to O MR1 to proper codename." into oc-mr1-dev am: 92a84efba1
am: a0cc0c5c90

Change-Id: Ie7b34d91f91109f909af486fdb2affaacc7d544b
2017-08-17 00:39:20 +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
a9774680f8 Merge "Do not filter out some colors" into oc-mr1-dev 2017-08-16 19:38:45 +00:00
Benjamin Miller
1bb5a1e5b3 Merge "Docs: Javadoc comment fixups for secure passcode reset methods." into oc-mr1-dev am: 947528607f
am: 96d506af85

Change-Id: I67da9e4d4a2500d08b0db58f1bff5ad793e3a852
2017-08-16 18:29:38 +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
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
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
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
Felipe Leme
50563050c6 Merge "Dismiss Autofill Save UI when a new Activity is launched." into oc-mr1-dev am: 3568046048
am: 409ae8857e

Change-Id: I0d48ebe7fa7c5b033e2f3b72d6444ada8c05200f
2017-08-15 18:36:44 +00: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
David Stevens
1583a4f9c8 Merge "Let external activities run when the primary display is off" 2017-08-15 18:07:15 +00: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
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
David Stevens
9440dc87a6 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
2017-08-14 21:59:06 -07:00
Felipe Leme
05ea98a3f9 Dismiss Autofill Save UI when a new Activity is launched.
Test: manual verification using Settings
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -tandroid.autofillservice.cts.SimpleSaveActivityTest#testDismissSave_byLaunchingNewActivity
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -tandroid.autofillservice.cts.LoginActivityTest#testSaveGoesAwayWhenLaunchingNewActivity
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 64693551

Change-Id: I323031c7285a4b49f9f0ca06618425a0ab7833da
2017-08-14 17:56:30 -07:00
Jeff Sharkey
b358b9f673 Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev am: c2e09129e0
am: b2a9f55488

Change-Id: Ib7e00ad3b02bf62fad1cc32c9e6002b2b7a45369
2017-08-12 03:38:00 +00:00
Jeff Sharkey
c2e09129e0 Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev 2017-08-12 03:21:01 +00:00
Michal Karpinski
2acdbae855 Merge "Merge "Add "Threading" section to BackupAgent's class level javadoc" into oc-mr1-dev am: 5500732584" into oc-mr1-dev-plus-aosp
am: 3e7f323481

Change-Id: I6ab2c9d851ebfe46b7e62753f047ef2976524f6a
2017-08-11 22:53:04 +00:00
Jeff Sharkey
8478911f5e Remove a bunch of deprecated @SystemApi.
Verified that nobody should be using these APIs, and they've been
deprecated long enough that we can remove them.

Bug: 62341924, 62263907, 62264550
Test: make -j32 update-api && make
Change-Id: I9a2333ca13e4984b71374aa7ffed081e5106c67e
2017-08-11 14:45:47 -06:00
Bryce Lee
0e7b7c96be Update references to O MR1 to proper codename.
Bug: 38225467
Test: manual
Change-Id: I5ae29e5763967f6a752f720e043ccb1ceb57e311
2017-08-10 15:01:53 -07:00
Michal Karpinski
6aa05b82d8 Add "Threading" section to BackupAgent's class level javadoc
Test: make -j40 docs
Bug: 34326112
Change-Id: I3038de3f7159b92c72fa714f9ed55159fe3bb66b
2017-08-09 17:25:03 +01:00
Calin Juravle
152cc62627 Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev am: 284b584499
am: b2963f3351

Change-Id: I6de5ec46a0d93de01acec80a43a8856ca74dc488
2017-08-08 00:32:36 +00:00
Calin Juravle
284b584499 Merge "Change the location of current profiles for secondary dex files" into oc-mr1-dev 2017-08-08 00:17:44 +00:00
Jeff Sharkey
1fb3a312e7 Merge "Fix broken javadocs." into oc-mr1-dev am: b79eb54d36
am: 1ad38fe278

Change-Id: I21266d20be036196dbeddb9c4366d641ab1b68a8
2017-08-06 17:00:09 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
TreeHugger Robot
acd9589dd7 Merge "Restricting background apps from running jobs" 2017-08-05 04:04:02 +00:00
Calin Juravle
eec18f41e2 Change the location of current profiles for secondary dex files
Move the secondary dex profiles inside the oat folder. This makes it
easier to clean them up and "protects" them against apps which may delete
unknown files from their directories (e.g. search).

Bug: 62336157
Test: Manual: boot the device, use the app, check the profiles are
collected in the new location.

Change-Id: I2fbce7591589d162775e4652b12e4698083adcff
2017-08-04 17:14:22 -07:00
Suprabh Shukla
3ac1daac40 Restricting background apps from running jobs
Introducing a new app op which controls whether apps are allowed to run
jobs in the background. When the app op mode is set to ignored, jobs
will be delayed until the app is in the foreground. The same semantics
as background check for O apps will apply, which means power whitelisted
apps can still run jobs freely and apps will have some settle time after
going to background after which their jobs will be stopped.

Test:
Added AppOpsUpgradeTest for upgrading appops to inherit existing value of
OP_RUN_ANY_IN_BACKGROUND from OP_RUN_IN_BACKGROUND
Added backgroundRestrictionsTest for background jobs. To run the test:
mmm -j32 services/tests/servicestests/
adb install -r \
out/target/product/marlin/data/app/JobTestApp/JobTestApp.apk
adb install -r \
out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
adb  shell am instrument -e class
'com.android.server.job.BackgroundRestrictionsTest' -w
'com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner'

Bug: 63001625
Change-Id: I6eb01adb6cd2c1d0e7be4f7eca960f57ad9581bf
2017-08-04 16:13:06 -07:00
Lucas Dupin
eeb36bee98 API Council feedback
Change-Id: I35b1d2a8a32d2fdf1b698640030dc42c1e595904
Fixes: 64330915
Fixes: 64331343
Test: read the docs
2017-08-04 10:45:12 -07:00
Christopher Tate
1fb409cbf5 Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev am: 4204f1658c
am: 454f1466b7

Change-Id: I0e7f9f1297ca3f8a8fd02b7b578905fc38a5b8a9
2017-08-03 23:30:09 +00:00
TreeHugger Robot
4204f1658c Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev 2017-08-03 23:07:53 +00:00
Christopher Tate
9f22443b4e Use normal API for legacy wallpaper restore
No longer do we play crazy rename-into-place tricks!  Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work.  While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.

In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place.  We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.

Fix 64269208
Fix 62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
      force restore)

Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
2017-08-03 11:10:41 -07:00
Lucas Dupin
23789bc947 Merge "Multi-user and WallpaperColors" into oc-mr1-dev am: 22b418448b
am: 430d7450ed

Change-Id: I65ff692f77886bfed6f64ec71f0bab569a6354c0
2017-08-03 16:46:16 +00:00