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

Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev am: 062b18c736 am: cf14410f5c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209765

Change-Id: I457654172b46fff1b1059a8058894caad3021e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Simon Wingrove
2022-10-19 09:50:59 +00:00
committed by Automerger Merge Worker
parent 99698c344c cf14410f5c
commit c359630286
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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