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

Merge "Don't start two pane for singleInstance deep links" into tm-dev

Browse Source
This commit is contained in:
Jason Chiu
2022-05-27 09:52:30 +00:00
committed by Android (Google) Code Review
parent fa5407c60f 0c732f2a80
commit bd6107d172
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/SettingsActivity.java
View File

@@ -466,6 +466,15 @@ public class SettingsActivity extends SettingsBaseActivity
return false; return false;
} }
// If the activity's launch mode is "singleInstance", it can't be embedded in Settings since
// it will be created in a new task.
ActivityInfo info = intent.resolveActivityInfo(getPackageManager(),
PackageManager.MATCH_DEFAULT_ONLY);
if (info.launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE) {
Log.w(LOG_TAG, "launchMode: singleInstance");
return false;
}
if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) { if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {
// Slice deep link starts the Intent using SubSettingLauncher. Returns true to show // Slice deep link starts the Intent using SubSettingLauncher. Returns true to show
// 2-pane deep link. // 2-pane deep link.