09c529a9bc85bfd0d50b65f447472ad064eac16c |
|
01-May-2017 |
Makoto Onuki <omakoto@google.com> |
Reconnect to DAService after binding is dead - When the DO/PO process crashes twice with a short interval, AM gives up and the binding will be "died". Once binding is in this state it'll never be re-connected. (Still, DO/PO can disable and re-enable their DAS to force DPMS to bind again though.) - Detect this and re-connect after one hour. - Back-off time will be exponentially increased and never reset until DPMS explicitly re-connects, which happens when: -- the device rebooted, -- the user stopped and re-started, or -- the DAS is disabled and re-enabled. Test: adb shell am instrument -e class com.android.server.am.PersistentConnectionTest -w com.android.frameworks.servicestests Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyConstantsTest -w com.android.frameworks.servicestests Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest Bug 37711907 Change-Id: Ie0b227a94e6ce85d72a969a4dea1020baf734e2f
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
4f4f6f83c20162814e95e9ca0654eee89a818bde |
|
28-Mar-2017 |
Pavel Grafov <pgrafov@google.com> |
Introduce DISALLOW_BLUETOOTH_SHARING. When this restriction is enforced Bluetooth sharing option should not be present when the user tries to share something. Previously this was handled by explicitly disabling bluetooth sharing activity during managed provisioning, now this code is to be removed (see topic CLs) and the same behavior should be achieved by setting this restriction for profile owners by default. In Bluetooth: 1) Don't check restrictions on boot, it is invoked anyway through the listener during boot. 2) Ignore when the restriction is "changed" from true to true - i think it was the initial intent in that condition. 3) Disable the component for a particular user and not always the system user. This is something that has to be fixed in O I think since currently in secondary user the bluetooth itself gets disabled but the sharing thing still shows up. In DPMS: 1) Now ActiveAdmin for PO also contains a set of restrictions applied by default. 2) Now all ActiveAdmins for POs are loaded quite early. That shouldn't have huge impact though. Bug: 36249732 Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testBluetoothSharingRestriction Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java Change-Id: I78c4ffbd503c4a10138e8c0862a9f206f24c5631 Merged-in: I78c4ffbd503c4a10138e8c0862a9f206f24c5631 (cherry picked from commit 7f4ad75218bdd3f1bdf9022a146147eae032cc0c)
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
088d7aa9c1e9b73ea9dce1616b4958f0c41ca05e |
|
17-Mar-2017 |
Robin Lee <rgl@google.com> |
Exfiltrate cert code from DevicePolicyManager The intent is for this not to cause any behaviour changes, just to make it easier to see what is going on with the code. Permissions are checked in DevicePolicyManagerService. All calls to CertificateMonitor are privileged. Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases Change-Id: I98224087315a62234732f08b53fe91884be86386
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
aff5e9c21c28f21f7a3688d84e747727cf17f382 |
|
25-Jan-2017 |
Bartosz Fabianowski <bartfab@google.com> |
Add API for checking whether the default IME was set by the DO/PO With this API, the system can determine whether a user's default IME was set by the user or the user's DO/PO. Bug: 32692748 Test: DPMS unit tests and CTS CtsDevicePolicyManagerTestCases Change-Id: Ibd703ff5c9e4c072599ad8d6023c94a97d728109
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
7f5c91c6bce6a8ff2414549219a321a98a98ab31 |
|
08-Feb-2017 |
Robin Lee <rgl@google.com> |
MonitoringCertTask no longer relies on software.device_admin Added a test to validate that it still works the way it should before and after the change. Bug: 33258404 Bug: 35196414 Fix: 35129745 Test: runtest -x services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java Test: also manual, instructions: Test: (1) Disable software.device_admin from tablet_core_hardware, rebuild. Test: (2) Install CA cert. Notification should appear. Test: (3) Reboot. Notification should still be there. Change-Id: Id992725c1844a2fffbde4d8acaba531e99f853ad
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
b88f42b6b1414ae8107be13c0d2f3957549ecaaf |
|
24-Jan-2017 |
Esteban Talavera <etalavera@google.com> |
Wipe device or profile if max failed attempt reached If the device or profile owner have set a max password failed attempts policy, the device or profile should be wiped even if DISALLOW_FACTORY_RESET / DISALLOW_REMOVE_USER / DISALLOW_REMOVE_MANAGED_PROFILE was set by that admin. However it should still fail if another device admin set the policy - this is in line with what wipeData() does at the moment. Bug: 34450538 Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerPlusManagedProfileTest#testWipeData Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testWipeData Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testDisallowFactoryReset Change-Id: Ifac240692ce74432f7b57f3dfbbbac2a7282297b
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
b21b241f0f12377c115e9c4f5bae26814fdab3fb |
|
17-Nov-2016 |
Bartosz Fabianowski <bartfab@google.com> |
Keep track of admin actions for DO disclosures This CL adds bookkeeping to DPMS which will allow us to tell the user in the Settings UI whether/when the admin requested a bug report or retrieved logs from the device. Bug: 32692748 Test: Full DevicePolicyManagerTest unit test coverage; end-to-end tests will follow as Settings CTS verifier tests Change-Id: I89728fce4b7e0ff061b354c73caf3742e95a3a3e
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
3577ed2556f20f7ab09e58b6b286217c7e1560c9 |
|
25-Aug-2016 |
Victor Chang <vichang@google.com> |
forceUpdateUserSetupComplete should have no effect in user build Bug:30031808 Change-Id: I908a495633e03ace770a8ec19196841d19dfd41d
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
c29f62c7388f550da2c7368c5dbc0aec7d1564fe |
|
07-Jun-2016 |
Makoto Onuki <omakoto@google.com> |
Push DO/PO package names from DPMS to PM Bug 29126573 Change-Id: I95ea1559f6acf5d2f0e1b0953568cdfc938e83b9
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
3e794afb82228199c0a83bed5463dbeb3c48dd62 |
|
04-Mar-2016 |
Victor Chang <vichang@google.com> |
Unit test for isProvisioningAllowed Note: DevicePolicyManagerService is changed to inject ContentObserver notifier Test: all test cases in DevicePolicyManagerTest pass BUG: 25710621 Change-Id: I347cec71769d0e9dd6a334d7d6339d5ce6a3fa6a
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
1216ae5d023e8f6e4f158a447a5764288e4ccc3e |
|
11-Mar-2016 |
Mahaver Chopra <mahaver@google.com> |
Update DPM.reboot with new restriction DPM.reboot() should not be called when there is an ongoing call on the device. Bug:27531799 Change-Id: Idc1fa4c7aa79b20ec9c2afcccf855455ee316787
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
d4c9e541ec7110d3c842d6f92c3ec6beb0b6d997 |
|
26-Feb-2016 |
Makoto Onuki <omakoto@google.com> |
Add ENCRYPTION_STATUS_ACTIVE_PER_USER to... getStorageEncryptionStatus() Use StorageManager APIs to get the encryption state instead of from the system properties directly. Bug 26547262 Change-Id: Ic27baa9489d43a93873f8bb0428084f8886aed67
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
49caead1c2608f57ac6c260396c6bfd058b921ae |
|
02-Feb-2016 |
Rubin Xu <rubinxu@google.com> |
Call SecurityLog methods via Injector This is to make sure the unit test can mock them out. Bug: 26911599 Change-Id: I07a1a8b43ad5716a4b667bc5266b3b03997268c5
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
3f3657a61b54d495bf2e692289eb92a48fe5a0b2 |
|
28-Jan-2016 |
Makoto Onuki <omakoto@google.com> |
Fix DPM unit tests Bug 26911599 Change-Id: I874c9cd4f63c79bc984777ef3b1b654a414c4911
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
f8373b5afc6dd25350bbca7093178807f1cc9ed6 |
|
23-Dec-2015 |
Mahaver Chopra <mahaver@google.com> |
DPM Test: DA and PO cannot call DPM.reboot() Bug: 25304994 Change-Id: Ifaccf3625314f4bfcd7f99413abc9067cc3dd2f9
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
e7927da1b6dc4f96714aa9bc4fbb71b3659f8cea |
|
25-Nov-2015 |
Makoto Onuki <omakoto@google.com> |
Don't call DPM from UserManager to avoid lock inversion - Also make sure DPMS.mOwners is always guarded with DPMS.this. (and remove synchronization from Owners.) Bug 25796840 Change-Id: I83f7b78e7b437d9c2a2b1d6e714346cd15f95330
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
cb6fd80721253ffa9dcab5cf8c2f4e9b9cd17ccc |
|
05-Nov-2015 |
Fyodor Kupolov <fkupolov@google.com> |
Added keep-uninstalled-packages DO policy This policy allows DO to specify a list of apps to cache even without being installed on any user. Bug: 23938464 Change-Id: I2eeab7f148409739fc23a5c44e955ad12b63fd04
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
219bbafc3fa40dae163d652365cc4a97d613011f |
|
12-Nov-2015 |
Makoto Onuki <omakoto@google.com> |
Revert "Do not call into ActivityManager from DPMS within DPMS lock" Bug 25567963 This reverts commit 53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd. Change-Id: I4faaa0b4c50d75e208f37b99bc1d6e2f0fff8127
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
53de36f9c40c9a4ac1eb9cca8f458aa6c998c1fd |
|
07-Nov-2015 |
Makoto Onuki <omakoto@google.com> |
Do not call into ActivityManager from DPMS within DPMS lock This will allow AMS to call into DPMS within the AMS lock instead, which will help I1537bd57b34696768ee81a979d53bb396efbc12a. - AM.clearApplicationUserData() will not be allowed for any DA apps. Bug 25567963 Change-Id: I9f0d071c815a011be4f4c85c502c39d0fe0fe5e8
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
068c54a5be697c3df4657dcda33cd17c4b547710 |
|
13-Oct-2015 |
Makoto Onuki <omakoto@google.com> |
Layer user restrictions - Now DPMS remembers user restrictions set by DO / PO in their ActiveAdmin. - User restrictions set by DO/PO will no longer be saved by UserManger. Instead, when needed, UMS will consult DPMS to build "effective" user restrictions. - UM.getUserRestrictions() will now always return "effective" user restrictions. - DPMS migrates existing user restrictions per the eng spec. - Also now UM.setUserRestrictions() will crash. UMS.setUserRestrictions() has been removed. This was needed because UM.setUserRestrctions(UM.getUserRestrictions()) will no longer be a valid use like it used to be. - Also introduced a fined-grained lock for user restrictions in UM to avoid deadlock between DPMS and also for better performance. Bug 23902097 Change-Id: If0e1e49344e2f3e9226532d00777976d1eaa7df3
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
a4f119790e32fcce56586e7324d508e35cb30a2a |
|
01-Oct-2015 |
Makoto Onuki <omakoto@google.com> |
First cut of user restriction layering. - Start persisting restrictions set by DO/PO. - Also dump user restrictions on dumpsys - More changes will follow, including migration. - Now System settings are mockable. Bug 23902097 Bug 23902477 Change-Id: I0bda22f484e1a8e259a1feb2df83c5f4a29116da
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
d932f7689d799b07a6776bc7c59749f672528239 |
|
30-Sep-2015 |
Makoto Onuki <omakoto@google.com> |
Refactor DPMS tests to be able to test more different cases. - DpmMockContext.addUser() allows to create more users. This will set up UserManager properly and create a data directory. - Updated DevicePolicyManagerTest so it can now easily emulate calls from different secondary users. Change-Id: Ic9d3e8d0d1e7f41e184c82e6dc323c244535b8d8
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
b643fb0e67460344ade2e3db92738999f8168496 |
|
23-Sep-2015 |
Makoto Onuki <omakoto@google.com> |
Use a factory class for dependency injection, add more tests. - Extracting into a factory allows us to use mocks in other classes. (Such as Owners.) - Also removed broken test ApplicationRestrictionsTest. Instead added a new simplified test to DevicePolicyManagerTest. - Also stop caching rarely used instances in DPMS. Bug 24061108 Bug 24275172 Change-Id: Ice9e57204b18e7b5f6b115126dab2209041439c2
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
f76b06a6b546f430cf85e561858ed12eedc32b81 |
|
23-Sep-2015 |
Makoto Onuki <omakoto@google.com> |
Test more DPM APIs. Bug 24061108 Change-Id: Ia9da19f62c0f4edf53ca1f4c213f0368ec1983ba
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|
cc4bbeb76af92a8484fe05f37c4ff412b4c47ccc |
|
17-Sep-2015 |
Makoto Onuki <omakoto@google.com> |
Make DPM/DPMS unit-testable - Now all services that DPMS uses are injectable. - Introduce some wrappers to make static methods and final class mockable. (e.g. for Binder.getCallingUid()) - In unit tests we replace those with Mockito mocks, except we use a partial mock for PackageManager, because we use way too many methods of this and most of them are okay to use directly. - To install a partial mock to PackageManager, I needed to make ApplicationPackageManager @hide public non-final. - For a starter, added tests for DPM.setAmin(). Bug 24061108 Change-Id: I2afd51d8bc0038992d5f9be38c686260be775b75
/frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
|