Commit Graph

13473 Commits

Author SHA1 Message Date
Jason Monk
0a83fef4ac Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev am: 3c33d2b997
am: a1bb34ac1f

Change-Id: I1fc7cecd154e4151792c90ada582f19aec53b2a1
2018-04-10 19:08:28 -07:00
Jason Monk
a1bb34ac1f Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
am: 3c33d2b997

Change-Id: I5afdd7f0a7e00de6305b3a930bf432a351df8d7b
2018-04-10 18:58:45 -07:00
Jason Monk
4572d6cbaf Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev am: 9107b53c6d
am: fa220e219b

Change-Id: Ib3910f93bc872e1bf2d059092173aebac935271f
2018-04-10 17:30:04 -07:00
Jason Monk
2d3932eb4d List<SliceSpec> -> Set<SliceSpec>
Test: update-api
Bug: 73123786
Change-Id: I5668023eda0efcadf40a20259a92624e6680659f
2018-04-10 20:25:51 -04:00
Jason Monk
fa220e219b Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
am: 9107b53c6d

Change-Id: I392e8d905457bcd11a7d83bc330d992636e9e407
2018-04-10 17:14:38 -07:00
Jason Monk
9107b53c6d Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev 2018-04-11 00:00:26 +00:00
Jason Monk
e280990dd6 Revert "List<SliceSpec> -> Set<SliceSpec>"
This reverts commit e2a04b3ea4.

Bug: 73123786
Change-Id: I1f09893fb3c68650340495f2833eb678099a895f
2018-04-11 00:00:04 +00:00
Jason Monk
9eff6399c0 Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev am: ae42e1d0c2
am: 67e71049b1

Change-Id: Idaa30c93f338228a19e8deb9852274e5e518fd18
2018-04-10 16:58:23 -07:00
Jason Monk
67e71049b1 Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
am: ae42e1d0c2

Change-Id: I4b5af94ddc84fd7c49b13bc6e072f4cba345d882
2018-04-10 16:48:47 -07:00
Jason Monk
ae42e1d0c2 Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev 2018-04-10 23:23:43 +00:00
Julia Reynolds
d7d346a32d Merge changes I3a35ed86,I74a9c767 into pi-dev am: 02db955ed8
am: 9aa4b2b3df

Change-Id: I0e26596917735be3e93d77e23f008cfa3c387390
2018-04-10 13:52:02 -07:00
Suprabh Shukla
040bf34479 Merge "setPackagesSuspended now overwrites all the state" into pi-dev am: e901d69ea6
am: f283b41a63

Change-Id: I39ec00edf07095ae63d28dfd2fb69cd6a11f89c9
2018-04-10 13:46:14 -07:00
Julia Reynolds
9aa4b2b3df Merge changes I3a35ed86,I74a9c767 into pi-dev
am: 02db955ed8

Change-Id: I206953b1112aec235f08107488159dcdbc3453e9
2018-04-10 13:37:28 -07:00
Suprabh Shukla
f283b41a63 Merge "setPackagesSuspended now overwrites all the state" into pi-dev
am: e901d69ea6

Change-Id: I0c323bdb3fdbf36a732b383040db5f016db9b212
2018-04-10 13:31:42 -07:00
Jason Monk
c181afacdf Merge "Slice permissions++" into pi-dev am: 964631d1a7
am: a68c3352f8

Change-Id: I63e8240c59aa8c5c2699cb9293a3a3030e24a0c7
2018-04-10 13:20:53 -07:00
TreeHugger Robot
02db955ed8 Merge changes I3a35ed86,I74a9c767 into pi-dev
* changes:
  Update incorrect documentation
  Ringer toggle should obey theme color
2018-04-10 20:17:28 +00:00
TreeHugger Robot
e901d69ea6 Merge "setPackagesSuspended now overwrites all the state" into pi-dev 2018-04-10 20:15:24 +00:00
Jason Monk
a68c3352f8 Merge "Slice permissions++" into pi-dev
am: 964631d1a7

Change-Id: Ifdb8d967c0f80838e378748e6f80ff6272663293
2018-04-10 12:56:58 -07:00
TreeHugger Robot
964631d1a7 Merge "Slice permissions++" into pi-dev 2018-04-10 19:41:41 +00:00
Jason Monk
e2a04b3ea4 List<SliceSpec> -> Set<SliceSpec>
Test: update-api
Bug: 73123786
Change-Id: Ia618a35fbe81d2aeb5f58d58add0a14069f21bed
2018-04-10 19:23:34 +00:00
Julia Reynolds
82a9cf60f3 Update incorrect documentation
Test: make
Change-Id: I3a35ed86600b3b12ced4aecc35a0415e8e05a502
Fixes: 77862126
2018-04-10 14:59:19 -04:00
TreeHugger Robot
234afe0fcd Merge "Fixes in KeyguardManager doc." 2018-04-10 17:26:24 +00:00
Julia Reynolds
d9674ba37c Merge "Add link to onboarding screen" into pi-dev am: e5d97dd6f9
am: af330f184e

Change-Id: Ieab2c03a1d49e9c45e22ef1be3a687d97914ad9b
2018-04-10 07:59:45 -07:00
Jason Monk
bf3eedcc6b Slice permissions++
New permissions system for slices. Its up a little disk space at the
optimization of CPU/Mem usage, and most importantly doesn't have a
limit on the number that can exist.

Test: runtest --path frameworks/base/services/tests/uiservicestests
Test: runtest --path cts/tests/tests/slices
Test: manual grant through SliceBrowser
Bug: 77323760
Change-Id: Ie601bca042a7b28113a511383ca7e3a35c7c8c71
2018-04-10 10:50:42 -04:00
Julia Reynolds
af330f184e Merge "Add link to onboarding screen" into pi-dev
am: e5d97dd6f9

Change-Id: I6ca7fbf3b1e9a14a12a1b3ecefd07549df11ff4d
2018-04-10 07:49:59 -07:00
Julia Reynolds
9aa1c9e925 Add link to onboarding screen
Test: runtest systemui-notification
Bug: 77658931
Change-Id: I70210b5d5e0de27ff38a6b2f5d8201266b6ec4d6
2018-04-10 08:47:07 -04:00
Suprabh Shukla
45b9e40a4f setPackagesSuspended now overwrites all the state
Earlier setPackagesSuspended ignored the rest of the paramters when
suspend state did not change. This was a problem because then there was
no good way to update the other parameters without unsuspending the app,
which is not desirable.
Removed setSuspendedPackageAppExtras as now they can be update with this
api.
Also sending broadcasts when packages get unsuspended due to suspending
package removed.

Test: Existing tests pass:
atest com.android.server.pm.PackageUserStateTest
atest com.android.server.pm.SuspendPackagesTest
atest com.android.server.pm.PackageManagerSettingsTests

Bug: 77522553
Change-Id: I72a3c228d3d65c430e242da97b2bc6997ec6a135
2018-04-09 17:49:54 -07:00
Julia Reynolds
98f9c897be Merge "Helper methods for settings screen" into pi-dev am: 6a66f4e8cf
am: 4ebbfef3cf

Change-Id: Ib77e2cebb2c788adc74bc640eaa3cef7331663d4
2018-04-09 12:17:55 -07:00
Julia Reynolds
4ebbfef3cf Merge "Helper methods for settings screen" into pi-dev
am: 6a66f4e8cf

Change-Id: I7c82e16f2c1004114484bc422afe47cb894ca3a3
2018-04-09 12:10:14 -07:00
TreeHugger Robot
6a66f4e8cf Merge "Helper methods for settings screen" into pi-dev 2018-04-09 18:52:25 +00:00
Philip P. Moltmann
325f7284d9 Merge "Expose TestAPIs needed by GtsOsTestCases" into pi-dev am: d565f04957
am: e2e7dd4eda

Change-Id: I57cbfacd181876b65447e5fe7497c83802a55b60
2018-04-09 09:17:38 -07:00
Philip P. Moltmann
e2e7dd4eda Merge "Expose TestAPIs needed by GtsOsTestCases" into pi-dev
am: d565f04957

Change-Id: Ifa630db3e1d20f3b96cb3d9637391590ce2652bf
2018-04-09 09:08:37 -07:00
TreeHugger Robot
d565f04957 Merge "Expose TestAPIs needed by GtsOsTestCases" into pi-dev 2018-04-09 15:57:42 +00:00
Lucas Dupin
972a138851 Merge "NO PARTIAL RERUN: Do not return recycled bitmaps" into pi-dev am: 6f34a9b2d3
am: adf468be06

Change-Id: I64a1225a7dace679a59c5e9d3e86dcb992682716
2018-04-09 07:58:15 -07:00
Lucas Dupin
adf468be06 Merge "NO PARTIAL RERUN: Do not return recycled bitmaps" into pi-dev
am: 6f34a9b2d3

Change-Id: I2068bb87657abf2c36af2026b351122d2758f96d
2018-04-09 07:50:00 -07:00
TreeHugger Robot
6f34a9b2d3 Merge "NO PARTIAL RERUN: Do not return recycled bitmaps" into pi-dev 2018-04-09 14:32:41 +00:00
Benjamin Franz
c66c34bbcf Merge "Update Javadoc of setLockTaskEnabled to reflect known issue" into pi-dev am: fdef00a5ae
am: 375f7260c4

Change-Id: Iadf4bd2b71a06fe09d078e7b909c89bf7254229a
2018-04-09 07:02:10 -07:00
Benjamin Franz
375f7260c4 Merge "Update Javadoc of setLockTaskEnabled to reflect known issue" into pi-dev
am: fdef00a5ae

Change-Id: Ia3a12099b9c87d5fc655a4f0b4afb7b96da674af
2018-04-09 06:53:42 -07:00
TreeHugger Robot
fdef00a5ae Merge "Update Javadoc of setLockTaskEnabled to reflect known issue" into pi-dev 2018-04-09 13:39:31 +00:00
Eric Sandness
cea884244e Merge "Permission Check For DPM.getPermittedAccessibilityServices" into pi-dev am: 0997a32523
am: bdfd63688c

Change-Id: I493a042d5d8c8e174597553c265fe7570ba07315
2018-04-09 06:37:01 -07:00
Eric Sandness
bdfd63688c Merge "Permission Check For DPM.getPermittedAccessibilityServices" into pi-dev
am: 0997a32523

Change-Id: I73acdc186de59877a558c5ad464f504c47a28bce
2018-04-09 06:25:44 -07:00
Julia Reynolds
47f4280b4f Helper methods for settings screen
Bug: 77657376
Test: make -j RunSettingsRoboTests
Change-Id: I2002cf98f26312e074c40c085044c60f7ce52ff7
2018-04-09 08:47:39 -04:00
Eric Sandness
5ab98de315 Permission Check For DPM.getPermittedAccessibilityServices
Require the callers of DPM.getPermittedAccessibilityServices(userId) to
hold the MANAGE_USERS permission.  The only known callers of this API
are settings apps that already hold this permission.

Bug: 62343414
Test: com.android.server.devicepolicy.DevicePolicyManagerTest
Test: com.google.android.gts.devicepolicy.DeviceOwnerTest
Test: Manually checked accessibility settings in DO and PO modes
Change-Id: I8ee3f876fcaffa63636645f0f59709cd147254ef
2018-04-09 07:47:13 +00:00
Lucas Dupin
61df45cd18 NO PARTIAL RERUN: Do not return recycled bitmaps
There's also no need to offload WallpaperManager#forgetLoadedBitmap
because Bitmap#recycle is asynchronous - and the whole method is
synchronized.

Fixes 77597550
Test: atest cts/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java

Change-Id: I88014e21bd05e10c2f524393bb637596708e4e63
2018-04-08 18:45:59 +00:00
Jan Althaus
f967132284 Merge "Fixing incomplete RemoteAction clone" into pi-dev am: 739199f3e9
am: a1ef7a933b

Change-Id: I07ba0ae9fbfc795f36fd2ddd6acf4c5d18cfd154
2018-04-07 01:48:47 -07:00
Jan Althaus
a1ef7a933b Merge "Fixing incomplete RemoteAction clone" into pi-dev
am: 739199f3e9

Change-Id: I7e21a751ab3693c67ad6521e661a21d109e0c1fd
2018-04-07 01:31:35 -07:00
Jan Althaus
739199f3e9 Merge "Fixing incomplete RemoteAction clone" into pi-dev 2018-04-07 08:16:28 +00:00
Lorenzo Colitti
b595ce0d03 Merge changes from topic "unwanted" into pi-dev am: 2eae1e3a45
am: 9c119c93c9

Change-Id: I5acdadb525252f849d191012be62149b597389b4
2018-04-06 20:19:07 -07:00
Lorenzo Colitti
9c119c93c9 Merge changes from topic "unwanted" into pi-dev
am: 2eae1e3a45

Change-Id: Ib6f46ff91a6d774a516fa299284d9d552081dde6
2018-04-06 20:01:23 -07:00
Lorenzo Colitti
2eae1e3a45 Merge changes from topic "unwanted" into pi-dev
* changes:
  Add @param tag for state in queryDetailsForUidTagState.
  Remove unwanted capability code per API council feedback.
2018-04-07 02:41:40 +00:00