PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings unexpectedly open after turning work profile on"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-02 18:17:14 +00:00
committed by Android (Google) Code Review
parent cd0e0d79c5 c0754b35ba
commit 33df2e72bf
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1474,6 +1474,7 @@
<!-- Lock screen settings --> <!-- Lock screen settings -->
<activity android:name=".password.ConfirmDeviceCredentialActivity" <activity android:name=".password.ConfirmDeviceCredentialActivity"
android:exported="true" android:exported="true"
android:taskAffinity=".password.ConfirmDeviceCredentialActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" /> <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
@@ -1491,6 +1492,7 @@
android:exported="false" android:exported="false"
android:permission="android.permission.MANAGE_USERS" android:permission="android.permission.MANAGE_USERS"
android:resizeableActivity="false" android:resizeableActivity="false"
android:taskAffinity=".password.ConfirmDeviceCredentialActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" /> <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />