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

Merge "Fix SpaActivity launched twice for App Info" into udc-dev am: 8dc3e7752c

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

Change-Id: I8238932d87d545553f0aa37663a4107822e017b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-29 01:43:43 +00:00
committed by Automerger Merge Worker
parent f04f7fcf52 8dc3e7752c
commit 24fc60010f
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();
} }