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

Disable CryptKeeper activity for secondary users

Browse Source 
For secondary users, disable CryptKeeper activity in a broadcast receiver of
USER_INITIALIZE intent. This change has the following benefits for guest
user switching:
 - The code will be executed earlier in the user switching flow, when the
   screen is frozen by WindowManager.
 - Initialization of CryptKeeperActivity is skipped

Bug:18670536
Change-Id: I60300198b605c26ad15afe2c874d5f1be7da5087
This commit is contained in:
Fyodor Kupolov
2014-12-08 16:13:11 -08:00
parent a754c6ba05
commit 1b5cc427f0
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -1726,6 +1726,12 @@
</intent-filter> </intent-filter>
</activity> </activity>
<receiver android:name=".CryptKeeper$UserInitBroadcastReceiver" >
<intent-filter>
<action android:name="android.intent.action.USER_INITIALIZE" />
</intent-filter>
</receiver>
<activity android:name=".CryptKeeper$FadeToBlack" <activity android:name=".CryptKeeper$FadeToBlack"
android:immersive="true" android:immersive="true"
android:launchMode="singleTop" android:launchMode="singleTop"

29
src/com/android/settings/CryptKeeper.java
View File

@@ -17,7 +17,9 @@
package com.android.settings; package com.android.settings;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager;
import android.app.StatusBarManager; import android.app.StatusBarManager;
import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -408,11 +410,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
// If we are not encrypted or encrypting, get out quickly. // If we are not encrypted or encrypting, get out quickly.
final String state = SystemProperties.get("vold.decrypt"); final String state = SystemProperties.get("vold.decrypt");
if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) { if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
// Disable the crypt keeper. disableCryptKeeperComponent(this);
PackageManager pm = getPackageManager();
ComponentName name = new ComponentName(this, CryptKeeper.class);
pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
// Typically CryptKeeper is launched as the home app. We didn't // Typically CryptKeeper is launched as the home app. We didn't
// want to be running, so need to finish this activity. We can count // want to be running, so need to finish this activity. We can count
// on the activity manager re-launching the new home app upon finishing // on the activity manager re-launching the new home app upon finishing
@@ -1021,4 +1019,25 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
return; return;
} }
private static void disableCryptKeeperComponent(Context context) {
PackageManager pm = context.getPackageManager();
ComponentName name = new ComponentName(context, CryptKeeper.class);
Log.d(TAG, "Disabling component " + name);
pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
}
public static class UserInitBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
final String intentAction = intent.getAction();
// Disable CryptKeeper activity if user is not primary
if (Intent.ACTION_USER_INITIALIZE.equals(intentAction)
&& UserHandle.USER_OWNER != UserHandle.myUserId()) {
disableCryptKeeperComponent(context);
}
}
}
} }