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

Merge "Correct how the injection mechanism starts activities" into sc-v2-dev am: 40e9a8aaaf am: 5be7a95a99

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

Change-Id: Ib6b6c20b95653e23e79183e8ec30ac6a7c462d0d
This commit is contained in:
TreeHugger Robot
2021-09-14 04:23:42 +00:00
committed by Automerger Merge Worker
parent 3c7843be0f 5be7a95a99
commit d604c56542
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
View File

@@ -422,19 +422,19 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
if (tile.userHandle == null || tile.isPrimaryProfileOnly()) {
activity.startActivityForResult(intent, 0);
activity.startActivity(intent);
} else if (tile.userHandle.size() == 1) {
activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
activity.startActivityAsUser(intent, tile.userHandle.get(0));
} else {
final UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER);
if (userHandle != null && tile.userHandle.contains(userHandle)) {
activity.startActivityForResultAsUser(intent, 0, userHandle);
activity.startActivityAsUser(intent, userHandle);
return;
}
final List<UserHandle> resolvableUsers = getResolvableUsers(intent, tile);
if (resolvableUsers.size() == 1) {
activity.startActivityForResultAsUser(intent, 0, resolvableUsers.get(0));
activity.startActivityAsUser(intent, resolvableUsers.get(0));
return;
}