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

Finish trampoline activity for ConfirmDeviceCredential immediately

Browse Source 
Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.

Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
This commit is contained in:
Jorim Jaggi
2015-09-10 20:12:19 -07:00
parent 69671dafc8
commit 74a2283d24
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1409,7 +1409,7 @@
<!-- Lock screen settings --> <!-- Lock screen settings -->
<activity android:name="ConfirmDeviceCredentialActivity" <activity android:name="ConfirmDeviceCredentialActivity"
android:exported="true" android:exported="true"
android:theme="@style/Transparent"> android:theme="@android:style/Theme.NoDisplay">
<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" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

15
src/com/android/settings/ChooseLockSettingsHelper.java
View File

@@ -158,10 +158,19 @@ public final class ChooseLockSettingsHelper {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName()); intent.setClassName(ConfirmDeviceCredentialBaseFragment.PACKAGE, activityClass.getName());
if (mFragment != null) { if (external) {
mFragment.startActivityForResult(intent, request); intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
if (mFragment != null) {
mFragment.startActivity(intent);
} else {
mActivity.startActivity(intent);
}
} else { } else {
mActivity.startActivityForResult(intent, request); if (mFragment != null) {
mFragment.startActivityForResult(intent, request);
} else {
mActivity.startActivityForResult(intent, request);
}
} }
return true; return true;
} }

21
src/com/android/settings/ConfirmDeviceCredentialActivity.java
View File

@@ -58,23 +58,12 @@ public class ConfirmDeviceCredentialActivity extends Activity {
String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE); String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION); String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
// Ignore rotates and ensure we only launch this once ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
if (savedInstanceState == null) { if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this); details, false /* returnCredentials */, true /* isExternal */)) {
if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title, Log.d(TAG, "No pattern, password or PIN set.");
details, false /* returnCredentials */, true /* isExternal */)) { setResult(Activity.RESULT_OK);
Log.d(TAG, "No pattern, password or PIN set.");
setResult(Activity.RESULT_OK);
finish();
}
} }
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
boolean credentialsConfirmed = (resultCode == Activity.RESULT_OK);
Log.d(TAG, "Device credentials confirmed: " + credentialsConfirmed);
setResult(credentialsConfirmed ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
finish(); finish();
} }
} }