[Settings] Avoids disabled component when page start from setup wizard.
Fixs when disable component during system busy, the framework have high possibility to force closing activities on the same task.
test
1. setup a pin code and go through to the anything else page. click "control info on lock screen".
>> The SetupRedactionInterstitial not been disabled.
>> The lock screen can be setup repeatedly.
2. into home screen. using adb command to start SetupRedactionInterstitial.
>> the screen not shown.
3. using adb command to start RedactionInterstitial and click "done".
>> the activity existed normally.
Bug: 158961310
Test: Manual
Change-Id: I09fe95db591d3d3603b2c13623a0873bfab3bac0
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 90f6c21..4747d84 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -20,9 +20,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.os.Bundle;
import com.android.settings.notification.RedactionInterstitial;
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
/**
* Setup Wizard's version of RedactionInterstitial screen. It inherits the logic and basic structure
* from RedactionInterstitial class, and should remain similar to that behaviorally. This class
@@ -47,6 +50,15 @@
}
@Override
+ protected void onCreate(Bundle savedInstance) {
+ // Only allow to start the activity from Setup Wizard.
+ if (!WizardManagerHelper.isAnySetupWizard(getIntent())) {
+ finish();
+ }
+ super.onCreate(savedInstance);
+ }
+
+ @Override
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT,