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

Commit 2043fd98 authored by Benjamin Franz's avatar Benjamin Franz Committed by Android (Google) Code Review
Browse files

Merge "Resolve new intent that allows setting the parent challenge"

parents 4ccc2c35 ae07b508

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ 
            android:excludeFromRecents="true" >

            <intent-filter android:priority="1">

                <action android:name="android.app.action.SET_NEW_PASSWORD" />

                <action android:name="android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

src/com/android/settings/ChooseLockGeneric.java

+14 −2
Original line number Diff line number Diff line
@@ -162,8 +162,20 @@ public class ChooseLockGeneric extends SettingsActivity { 
                        ENCRYPT_REQUESTED_DISABLED);

            }



            // Only take this argument into account if it belongs to the current profile.

            int targetUser = Utils.getSecureTargetUser(

                    getActivity().getActivityToken(),

                    UserManager.get(getActivity()),

                    null,

                    getActivity().getIntent().getExtras()).getIdentifier();

            if (DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD.equals(

                    getActivity().getIntent().getAction()) ||

                    !mLockPatternUtils.isSeparateProfileChallengeAllowed(targetUser)) {

                // Always use parent if explicitely requested or if profile challenge is not

                // supported

                mUserId = Utils.getSameOwnerUserId(getContext(), getArguments());

            } else {

                mUserId = targetUser;

            }



            if (mPasswordConfirmed) {

                updatePreferencesOrFinish();