summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-04-28 14:11:08 +0100
committerAlexandra Gherghina <alexgherghina@google.com>2014-04-28 14:11:35 +0100
commit9a1baec5a330a175e4b36d4ae3d67a15acb5b1a5 (patch)
tree514d6b751c8666170fe2f2991bff28fd4a13b7a4 /src/com/android
parentab8d3e5a03e292f1842532a763cfd4b6defdaaa0 (diff)
downloadpackages_apps_Settings-9a1baec5a330a175e4b36d4ae3d67a15acb5b1a5.tar.gz
packages_apps_Settings-9a1baec5a330a175e4b36d4ae3d67a15acb5b1a5.tar.bz2
packages_apps_Settings-9a1baec5a330a175e4b36d4ae3d67a15acb5b1a5.zip
Disable profile enabled check (API is changing)
Bug: 14377459 Change-Id: Ie79db95bcc5c7e3a95b479832dceaf628ae36728
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/users/UserSettings.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 0a66046f5..bd5d58db0 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -649,9 +649,8 @@ public class UserSettings extends RestrictedSettingsFragment
} 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);