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

Commit c0754b35 authored by Mill Chen's avatar Mill Chen
Browse files

Settings unexpectedly open after turning work profile on 

ConfirmDeviceCredentialActivity doesn't set a taskAffinity, so the
default taskAffinity is the package name. That's why Settings
unexpectedly open after users turn work profile on. We specified an
unique name to taskAffinity to avoid launching Settings activity.

Fixes: 129330530
Test: turn work profile off then turn it on, repeat
Change-Id: I1f71c3d1bb37a09a6393fae4c01bc9b18cab49a8
parent 77d8cff0

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" />