OSDN Git Service

Fix 'Modifying dpm.setSecureSetting call for install_non_market_apps'
authorSuprabh Shukla <suprabh@google.com>
Tue, 21 Feb 2017 22:33:50 +0000 (14:33 -0800)
committerSuprabh Shukla <suprabh@google.com>
Wed, 22 Feb 2017 02:36:28 +0000 (18:36 -0800)
commit0b1356ff1f3cd2fd06d770af1ad466822173cc3a
tree74ef29de28c77d85de08e90fe85d5d9605fe030a
parent160bf4cbac1d4c8d8c22b6dbcd8c2421d61541b0
Fix 'Modifying dpm.setSecureSetting call for install_non_market_apps'

The previous change was reverted as it broke work profile provisioning.
Clearing binder calling identity before calling into settings provider
should fix the issue.

Test: runtest managed-provisioning
Test: runtest -x services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: Manually tested that work profile is inflated with expected values
of install_non_market_apps

Bug: 33947615
Bug: 35590590

Change-Id: I3c31a73fef0c25c0e682e18f637272adad39b28d
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java
packages/SettingsProvider/res/values/defaults.xml
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
packages/SettingsProvider/test/src/com/android/providers/settings/InstallNonMarketAppsDeprecationTest.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java