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

Commit 33df2e72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Settings unexpectedly open after turning work profile on"

parents cd0e0d79 c0754b35

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,7 @@ 
        <!-- Lock screen settings -->

        <activity android:name=".password.ConfirmDeviceCredentialActivity"

            android:exported="true"

            android:taskAffinity=".password.ConfirmDeviceCredentialActivity"

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

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

                <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
@@ -1491,6 +1492,7 @@ 
            android:exported="false"

            android:permission="android.permission.MANAGE_USERS"

            android:resizeableActivity="false"

            android:taskAffinity=".password.ConfirmDeviceCredentialActivity"

            android:theme="@android:style/Theme.Translucent.NoTitleBar">

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

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