am 2412af97: am 91648629: Merge "Follow API change for method name" into lmp-dev

* commit '2412af973b071a7fa363b3f55f73f64a480d2662':
  Follow API change for method name
This commit is contained in:
Amith Yamasani
2014-09-05 20:21:14 +00:00
committed by Android Git Automerger

View File

@@ -141,7 +141,7 @@ public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
private void ensurePin() { private void ensurePin() {
if (!mChallengeSucceeded && !mChallengeRequested if (!mChallengeSucceeded && !mChallengeRequested
&& mRestrictionsManager.hasRestrictionsProvider()) { && mRestrictionsManager.hasRestrictionsProvider()) {
Intent intent = mRestrictionsManager.getLocalApprovalIntent(); Intent intent = mRestrictionsManager.createLocalApprovalIntent();
if (intent != null) { if (intent != null) {
mChallengeRequested = true; mChallengeRequested = true;
mChallengeSucceeded = false; mChallengeSucceeded = false;