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

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

Change-Id: I8752904ce14c7ca84787e260b0bdb1a4aefb047c
This commit is contained in:
TreeHugger Robot
2021-09-14 04:14:22 +00:00
committed by Automerger Merge Worker
parent 90659d877e 40e9a8aaaf
commit 5be7a95a99
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); mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
if (tile.userHandle == null || tile.isPrimaryProfileOnly()) { if (tile.userHandle == null || tile.isPrimaryProfileOnly()) {
activity.startActivityForResult(intent, 0); activity.startActivity(intent);
} else if (tile.userHandle.size() == 1) { } else if (tile.userHandle.size() == 1) {
activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0)); activity.startActivityAsUser(intent, tile.userHandle.get(0));
} else { } else {
final UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER); final UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER);
if (userHandle != null && tile.userHandle.contains(userHandle)) { if (userHandle != null && tile.userHandle.contains(userHandle)) {
activity.startActivityForResultAsUser(intent, 0, userHandle); activity.startActivityAsUser(intent, userHandle);
return; return;
} }
final List<UserHandle> resolvableUsers = getResolvableUsers(intent, tile); final List<UserHandle> resolvableUsers = getResolvableUsers(intent, tile);
if (resolvableUsers.size() == 1) { if (resolvableUsers.size() == 1) {
activity.startActivityForResultAsUser(intent, 0, resolvableUsers.get(0)); activity.startActivityAsUser(intent, resolvableUsers.get(0));
return; return;
} }

16
tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
View File

@@ -239,7 +239,7 @@ public class DashboardFeatureProviderImplTest {
any(Intent.class), any(Intent.class),
eq(MetricsEvent.SETTINGS_GESTURES)); eq(MetricsEvent.SETTINGS_GESTURES));
verify(mActivity) verify(mActivity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class)); .startActivityAsUser(any(Intent.class), any(UserHandle.class));
} }
@Test @Test
@@ -257,7 +257,7 @@ public class DashboardFeatureProviderImplTest {
any(Intent.class), any(Intent.class),
anyInt()); anyInt());
verify(mActivity) verify(mActivity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class)); .startActivityAsUser(any(Intent.class), any(UserHandle.class));
} }
@Test @Test
@@ -568,7 +568,7 @@ public class DashboardFeatureProviderImplTest {
mImpl.openTileIntent(mActivity, tile); mImpl.openTileIntent(mActivity, tile);
verify(mActivity, never()) verify(mActivity, never())
.startActivityForResult(any(Intent.class), eq(0)); .startActivity(any(Intent.class));
verify(mActivity).getSupportFragmentManager(); verify(mActivity).getSupportFragmentManager();
} }
@@ -585,7 +585,7 @@ public class DashboardFeatureProviderImplTest {
mImpl.openTileIntent(mActivity, tile); mImpl.openTileIntent(mActivity, tile);
verify(mActivity, never()) verify(mActivity, never())
.startActivityForResult(any(Intent.class), eq(0)); .startActivity(any(Intent.class));
verify(mActivity).getSupportFragmentManager(); verify(mActivity).getSupportFragmentManager();
} }
@@ -602,7 +602,7 @@ public class DashboardFeatureProviderImplTest {
mImpl.openTileIntent(mActivity, tile); mImpl.openTileIntent(mActivity, tile);
verify(mActivity) verify(mActivity)
.startActivityForResult(any(Intent.class), eq(0)); .startActivity(any(Intent.class));
verify(mActivity, never()).getSupportFragmentManager(); verify(mActivity, never()).getSupportFragmentManager();
} }
@@ -623,7 +623,7 @@ public class DashboardFeatureProviderImplTest {
final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class); final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class);
verify(mActivity) verify(mActivity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), argument.capture()); .startActivityAsUser(any(Intent.class), argument.capture());
assertThat(argument.getValue().getIdentifier()).isEqualTo(userId); assertThat(argument.getValue().getIdentifier()).isEqualTo(userId);
verify(mActivity, never()).getSupportFragmentManager(); verify(mActivity, never()).getSupportFragmentManager();
} }
@@ -642,7 +642,7 @@ public class DashboardFeatureProviderImplTest {
mImpl.openTileIntent(mActivity, tile); mImpl.openTileIntent(mActivity, tile);
verify(mActivity, never()) verify(mActivity, never())
.startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class)); .startActivityAsUser(any(Intent.class), any(UserHandle.class));
verify(mActivity).getSupportFragmentManager(); verify(mActivity).getSupportFragmentManager();
} }
@@ -665,7 +665,7 @@ public class DashboardFeatureProviderImplTest {
final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class); final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class);
verify(mActivity) verify(mActivity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), argument.capture()); .startActivityAsUser(any(Intent.class), argument.capture());
assertThat(argument.getValue().getIdentifier()).isEqualTo(0); assertThat(argument.getValue().getIdentifier()).isEqualTo(0);
verify(mActivity, never()).getSupportFragmentManager(); verify(mActivity, never()).getSupportFragmentManager();
} }