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

Handle renamed APIs

Browse Source 
Bug: 10461761
Change-Id: If63c3801663b347a4643e44d5bd3bab4e3049578
This commit is contained in:
Amith Yamasani
2013-09-05 12:40:31 -07:00
parent 97df982296
commit 14912666d9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/RestrictedSettingsFragment.java
View File

@@ -173,7 +173,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
if (!mChallengeSucceeded) {
final UserManager um = UserManager.get(getActivity());
if (!mChallengeRequested) {
if (um.hasRestrictionsPin()) {
if (um.hasRestrictionsChallenge()) {
mResumeActionBundle = new Bundle();
if (preference != null) {
mResumeActionBundle.putString(EXTRA_PREFERENCE, preference.getKey());
@@ -182,7 +182,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
((CheckBoxPreference)preference).isChecked());
}
}
Intent requestPin = new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE);
Intent requestPin = new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
mChallengeRequested = true;
}
@@ -200,7 +200,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
return false;
}
return mUserManager.hasUserRestriction(mRestrictionKey)
&& !mUserManager.hasRestrictionsPin();
&& !mUserManager.hasRestrictionsChallenge();
}
/**
@@ -230,7 +230,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
}
boolean restricted = RESTRICTIONS_PIN_SET.equals(restrictionKey)
|| mUserManager.hasUserRestriction(restrictionKey);
return restricted && mUserManager.hasRestrictionsPin();
return restricted && mUserManager.hasRestrictionsChallenge();
}
/**