Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev (062b18c7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,11 @@ public class Settings extends SettingsActivity {
		/** Redirects to SafetyCenter if enabled. */
		@VisibleForTesting
		public void handleSafetyCenterRedirection() {
		if (isFinishing()) {
		// Don't trampoline if already exiting this activity.
		return;
		}

		if (SafetyCenterManagerWrapper.get().isEnabled(this)) {
		try {
		startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));
		@@ -213,6 +218,11 @@ public class Settings extends SettingsActivity {
		/** Redirects to SafetyCenter if enabled. */
		@VisibleForTesting
		public void handleSafetyCenterRedirection() {
		if (isFinishing()) {
		// Don't trampoline if already exiting this activity.
		return;
		}

		if (ACTION_PRIVACY_SETTINGS.equals(getIntent().getAction())
		&& SafetyCenterManagerWrapper.get().isEnabled(this)) {
		try {