Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 256637ff authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Handle renamed APIs" into klp-dev

parents 8aea7b4d 14912666

src/com/android/settings/MasterClear.java

+2 −2
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ public class MasterClear extends Fragment { 
    }



    private boolean runRestrictionsChallenge() {

        if (UserManager.get(getActivity()).hasRestrictionsPin()) {

        if (UserManager.get(getActivity()).hasRestrictionsChallenge()) {

            startActivityForResult(

                    new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE), PIN_REQUEST);

                    new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE), PIN_REQUEST);

            return true;

        }

        return false;

src/com/android/settings/RestrictedSettingsFragment.java

+4 −4
Original line number Diff line number Diff line
@@ -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();

   }



   /**

src/com/android/settings/TrustedCredentialsSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ public class TrustedCredentialsSettings extends Fragment { 
        removeButton.setText(certHolder.mTab.getButtonLabel(certHolder));

        removeButton.setOnClickListener(new View.OnClickListener() {

            @Override public void onClick(View v) {

                if (mUserManager.hasRestrictionsPin() && !mChallengeSucceeded) {

                if (mUserManager.hasRestrictionsChallenge() && !mChallengeSucceeded) {

                    ensurePin();

                    return;

                }
@@ -426,9 +426,9 @@ public class TrustedCredentialsSettings extends Fragment { 
        if (!mChallengeSucceeded) {

            final UserManager um = UserManager.get(getActivity());

            if (!mChallengeRequested) {

                if (um.hasRestrictionsPin()) {

                if (um.hasRestrictionsChallenge()) {

                    Intent requestPin =

                            new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE);

                            new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);

                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);

                    mChallengeRequested = true;

                }