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

am 644fa424: Work on issue #5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500

Browse Source 
* commit '644fa4243b4c288c85845b3f86aab25135635729':
  Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
This commit is contained in:
Dianne Hackborn
2011-10-18 14:36:30 -07:00
committed by Android Git Automerger
parent abda8c0fba 644fa4243b
commit bc6e84602a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,17 +224,13 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
// Typically CryptKeeper is launched as the home app. We didn't
// want to be running, so need to finish this activity and re-launch
// its intent now that we are not in the way of doing what is really
// supposed to happen.
// 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
// this one, since this will leave the activity stack empty.
// NOTE: This is really grungy. I think it would be better for the
// activity manager to explicitly launch the crypt keeper instead of
// home in the situation where we need to decrypt the device
finish();
Intent intent = getIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setComponent(null);
startActivity(intent);
return;
}