diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-11-18 19:28:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-18 19:28:17 +0000 |
| commit | 0925db87150300a679090a41f6eec26aad5c75e5 (patch) | |
| tree | 1847e36d478744b1c3c200eeb90d07021515f40d /core/java | |
| parent | d4e55bdfc50635903e04934785ed82c39257506c (diff) | |
| parent | 5a1442589f3fd3e1eca74e70ca666eb7b3a0f9b2 (diff) | |
| download | frameworks_base-0925db87150300a679090a41f6eec26aad5c75e5.zip frameworks_base-0925db87150300a679090a41f6eec26aad5c75e5.tar.gz frameworks_base-0925db87150300a679090a41f6eec26aad5c75e5.tar.bz2 | |
Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index ad1cf44..f0136ab 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -182,8 +182,8 @@ public class DevicePolicyManager { * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner * provisioning via an NFC bump. */ - public static final String EXTRA_PROVISIONING_DONT_DISABLE_SYSTEM_APPS = - "android.app.extra.PROVISIONING_DONT_DISABLE_SYSTEM_APPS"; + public static final String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = + "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED"; /** * A String extra holding the time zone {@link android.app.AlarmManager} that the device |