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
Selim Cinek
31e078d50b
Merge "Added nullability annotations to API" into pi-dev am: 66b90a035f
...
am: 0bc1a4fab7
Change-Id: I5d1c67b2592bc5847059fac8e9ff2a8282f7acb3
2018-04-06 15:40:13 -07:00
Selim Cinek
0bc1a4fab7
Merge "Added nullability annotations to API" into pi-dev
...
am: 66b90a035f
Change-Id: I3b0101036d8c8929accb2632584a7464f1479e32
2018-04-06 15:19:27 -07:00
TreeHugger Robot
66b90a035f
Merge "Added nullability annotations to API" into pi-dev
2018-04-06 22:06:04 +00:00
Philip P. Moltmann
f80809ffd7
Expose TestAPIs needed by GtsOsTestCases
...
Test: atest GtsOsTestCases on pi-dev:taimen and oc-mr1:sailfish
Bug: 77497338
Change-Id: I5de976991a857bfbed2faa943822af542601fa8b
2018-04-06 14:59:07 -07:00
Selim Cinek
eb53c228f0
Added nullability annotations to API
...
Certain methods where left out in the new APIs
Change-Id: Ide1e2f387a4918f2134254d862eeff06bfd3a730
Fixes: 74409592
Test: only non-semantic changes
2018-04-06 13:39:59 -07:00
Fyodor Kupolov
8e75020431
Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev am: 28faced973
...
am: 35ebfcac8c
Change-Id: I26d047e9ff7e6eaa4a2026a4ce0ad6aca0b30eee
2018-04-06 11:40:19 -07:00
Fyodor Kupolov
35ebfcac8c
Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev
...
am: 28faced973
Change-Id: Ieb5de4b3547ea38ea8e0dbdb14e296dde43142d3
2018-04-06 11:20:52 -07:00
Fyodor Kupolov
28faced973
Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev
2018-04-06 17:57:10 +00:00
Selim Cinek
108ebd0c4d
Merge "Migrated the Person class to its own file" into pi-dev am: cecec7bf5b
...
am: b1226660f6
Change-Id: I1066f90cf4a5a415dcf35abd9e27fea02073faf4
2018-04-06 09:37:58 -07:00
Selim Cinek
b1226660f6
Merge "Migrated the Person class to its own file" into pi-dev
...
am: cecec7bf5b
Change-Id: Iaa9543718ff66e305b6b3a4967d1a6c5edc81ca1
2018-04-06 09:19:34 -07:00
Selim Cinek
cecec7bf5b
Merge "Migrated the Person class to its own file" into pi-dev
2018-04-06 15:59:34 +00:00
Lorenzo Colitti
53765e00d8
Add @param tag for state in queryDetailsForUidTagState.
...
Change-Id: I22de424ccb2b30b2a56edd17dc982565b8aa7d4a
Fix: 77518425
Test: make doc-comment-check-docs
2018-04-06 23:17:23 +09:00
Rubin Xu
e6402303c0
Merge "Tweak SystemUpdatePolicy APIs" into pi-dev am: 892ebd0285
...
am: 2171b32fff
Change-Id: Icbbeef7c835a1d685615bdf2bf19eb76adcbb68f
2018-04-06 06:20:55 -07:00
Rubin Xu
2171b32fff
Merge "Tweak SystemUpdatePolicy APIs" into pi-dev
...
am: 892ebd0285
Change-Id: I8cd170af9b8b15fbd1010aad50e337e95fbfb97d
2018-04-06 06:07:54 -07:00
Rubin Xu
892ebd0285
Merge "Tweak SystemUpdatePolicy APIs" into pi-dev
2018-04-06 12:54:24 +00:00
Selim Cinek
0932cf70b2
Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev am: d7c3ba204c
...
am: a2508cb0d8
Change-Id: I3f8fe5bb3dd347a949576e4ac8ff703d32dbd1e2
2018-04-05 17:23:12 -07:00
Selim Cinek
9acd673c0d
Migrated the Person class to its own file
...
Because we are expecting usage of Person across
other surfaces, we migrate the class out
of he Notification class which is already incredibly
huge.
Test: Migrated existing cts test
Change-Id: Ia487ae7965b5ca2b016245d21faa63e3b4628344
Fixes: 75980526
2018-04-05 17:21:11 -07:00
Selim Cinek
a2508cb0d8
Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev
...
am: d7c3ba204c
Change-Id: Ib660becd9ea2df4ffdc7808c75232c33200ed28d
2018-04-05 17:12:28 -07:00
TreeHugger Robot
d7c3ba204c
Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev
2018-04-05 23:57:11 +00:00
Suprabh Shukla
acdfc1df62
Merge "Activity interceptor dialog for suspended apps" into pi-dev am: 822ce4f3aa
...
am: fce7bf015e
Change-Id: I20ef2001636ee1a75bcf5d9d7b097848bb15c710
2018-04-05 14:41:00 -07:00
Suprabh Shukla
fce7bf015e
Merge "Activity interceptor dialog for suspended apps" into pi-dev
...
am: 822ce4f3aa
Change-Id: Id54f6edcbc854d6f58eae23d877884d1390c28c8
2018-04-05 14:29:46 -07:00
TreeHugger Robot
822ce4f3aa
Merge "Activity interceptor dialog for suspended apps" into pi-dev
2018-04-05 21:15:19 +00:00
Jan Althaus
ab78047aa2
Fixing incomplete RemoteAction clone
...
Bug: 77631078
Test: atest CtsAndroidAppTestCases:android.app.cts.RemoteActionTest
Change-Id: Ifd6617baf67993141e2ee85def8fb84c88cbe3e7
2018-04-05 21:22:51 +02:00
Daniel Cardenas
a621840b7a
Merge "Reduce log spam in TimeSparseArray" into pi-dev am: bd2e790946
...
am: a930996c24
Change-Id: I13a1bab02996e02a66ed6218bba0140223881b51
2018-04-05 11:52:22 -07:00
Daniel Cardenas
a930996c24
Merge "Reduce log spam in TimeSparseArray" into pi-dev
...
am: bd2e790946
Change-Id: Iffacb38ca50741f78c3d49aa5ace6416eb7280ab
2018-04-05 11:18:24 -07:00
TreeHugger Robot
bd2e790946
Merge "Reduce log spam in TimeSparseArray" into pi-dev
2018-04-05 18:01:52 +00:00
Rubin Xu
1b2f374018
Tweak SystemUpdatePolicy APIs
...
* Introduce a FreezePeriod class that represents a single freeze period
and is defined by two MonthDay instances.
* Add ERROR_UNKNOWN to ValidationFailedException
* Make SystemUpdatePolicy final
* Document SystemUpdatePolicy.InstallationOption and add IntDef to getType()
Test: runtest frameworks-services -c com.android.server.devicepolicy.SystemUpdatePolicyTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testSystemUpdatePolicy
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testSystemUpdatePolicy
Bug: 74976911
Change-Id: I85cf636c3a98c97bd03b7b296c3130028051a791
2018-04-05 14:26:52 +01:00