Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: 7b2a48fc58

Change-Id: Ifb3a2d14183ce06d45056d93d6bd40dace6e0dfc
This commit is contained in:
Winson Chung
2020-04-24 23:49:27 +00:00
committed by Automerger Merge Worker

View File

@@ -2269,6 +2269,7 @@
android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode" android:configChanges="mnc|mcc|keyboard|keyboardHidden|uiMode"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
android:screenOrientation="nosensor" android:screenOrientation="nosensor"
android:taskAffinity="com.android.settings.CryptKeeper"
android:process=":CryptKeeper"> android:process=":CryptKeeper">
<intent-filter android:priority="10"> <intent-filter android:priority="10">
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />