commit d2019d13733625336c375cb8bd19ca4188bb39bc
author Alexandra Gherghina <alexgherghina@google.com> Thu May 01 10:37:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 01 10:37:23 2014 +0000
tree 38e51144fb1dd486dfd99c90f97e8bfea70a1484
parent c5f5e937024250380148220bc0a8e291a3929f0a
parent 9a1baec5a330a175e4b36d4ae3d67a15acb5b1a5

Merge "Disable profile enabled check (API is changing)"

src/com/android/settings/users/UserSettings.java

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 0a66046..bd5d58d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -649,9 +649,8 @@
             } else if (user.isRestricted()) {
                 pref.setSummary(R.string.user_summary_restricted_profile);
             } else if (user.isManagedProfile()) {
-                DevicePolicyManager dpm = (DevicePolicyManager)
-                        getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
-                if (dpm.isProfileEnabled(user.id)) {
+                // TODO: Change this to use the new flag
+                if (true) {
                     pref.setSummary(R.string.user_summary_managed_profile);
                 } else {
                     pref.setSummary(R.string.user_summary_managed_profile_not_enabled);