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

Fix SpaActivity launched twice for App Info

Browse Source 
This happens when shouldShowTwoPaneDeepLink() return true, the
InstalledAppDetailsTop onCreate() is called twice.

Only try start spa when the activity is not finishing to fix.

Bug: 236346018
Test: Manually with Settings
Change-Id: I4b09fba0733a6451a2ba6fd90960f9151692a2ad
This commit is contained in:
Chaohui Wang
2023-03-24 22:57:48 +08:00
parent 3bc2805914
commit 88e20ec62e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/applications/InstalledAppDetailsTop.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.applications; package com.android.settings.applications;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
@@ -30,12 +31,16 @@ public class InstalledAppDetailsTop extends SettingsActivity {
@Override @Override
protected void onCreate(Bundle savedState) { protected void onCreate(Bundle savedState) {
super.onCreate(savedState); super.onCreate(savedState);
if (!FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_ENABLE_SPA)) { if (isFinishing() ||
!FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_ENABLE_SPA)) {
return; return;
} }
String packageName = super.getIntent().getData().getSchemeSpecificPart(); Uri data = super.getIntent().getData();
SpaActivity.startSpaActivity( if (data != null) {
this, AppInfoSettingsProvider.INSTANCE.getRoute(packageName, getUserId())); String packageName = data.getSchemeSpecificPart();
String route = AppInfoSettingsProvider.INSTANCE.getRoute(packageName, getUserId());
SpaActivity.startSpaActivity(this, route);
}
finish(); finish();
} }