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

Replace actionId and scriptUri extras with wizardBundle

Browse Source 
https://cs.android.com/android/platform/superproject/main/+/main:frameworks/opt/setupwizard/library/test/robotest/src/com/android/setupwizardlib/util/WizardManagerHelperTest.java;l=307;drc=93689222672ea2da9e3948785ab3c8d53d771c84

Change-Id: I084fee70a4fcd4617d788eb6e609e0d00c9ee103
This commit is contained in:
Oliver Scott
2024-07-16 19:33:50 -04:00
parent 0e299f2129
commit ab9a5ea27b
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/lineageos/setupwizard/SubBaseActivity.java
View File

@@ -7,8 +7,8 @@ package org.lineageos.setupwizard;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_SCRIPT_URI;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_WIZARD_BUNDLE;
import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import android.annotation.NonNull;
@@ -58,9 +58,9 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
protected void startSubactivity(Intent subactivityIntent) {
Intent intent = getIntent();
if (intent.hasExtra(EXTRA_SCRIPT_URI)) {
subactivityIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
subactivityIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
Bundle wizardBundle = intent.getBundleExtra(EXTRA_WIZARD_BUNDLE);
if (wizardBundle.containsKey(EXTRA_SCRIPT_URI)) {
subactivityIntent.putExtra(EXTRA_WIZARD_BUNDLE, wizardBundle);
}
try {
startActivityForResult(subactivityIntent);