PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexandra Gherghina
2014-05-01 10:37:22 +00:00
committed by Android (Google) Code Review
parent c5f5e93702 9a1baec5a3
commit d2019d1373
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/users/UserSettings.java
View File

@@ -649,9 +649,8 @@ public class UserSettings extends RestrictedSettingsFragment
} else if (user.isRestricted()) { } else if (user.isRestricted()) {
pref.setSummary(R.string.user_summary_restricted_profile); pref.setSummary(R.string.user_summary_restricted_profile);
} else if (user.isManagedProfile()) { } else if (user.isManagedProfile()) {
DevicePolicyManager dpm = (DevicePolicyManager) // TODO: Change this to use the new flag
getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE); if (true) {
if (dpm.isProfileEnabled(user.id)) {
pref.setSummary(R.string.user_summary_managed_profile); pref.setSummary(R.string.user_summary_managed_profile);
} else { } else {
pref.setSummary(R.string.user_summary_managed_profile_not_enabled); pref.setSummary(R.string.user_summary_managed_profile_not_enabled);