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

Revert "Fix app uninstalling/stopping possible in screen pinning mode"

Browse Source 
This reverts commit 161c359508.

Reason for revert: This solution has a bug.

Change-Id: I925dab9b1a8d50de538a4fc652f722744fe3fadf
This commit is contained in:
Stanley Wang
2019-08-06 03:38:05 +00:00
parent 161c359508
commit 064b21e0b6
2 changed files with 10 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
View File

@@ -33,7 +33,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
@@ -87,8 +86,6 @@ public final class AppInfoDashboardFragmentTest {
private DevicePolicyManager mDevicePolicyManager;
@Mock
private PackageManager mPackageManager;
@Mock
private ActivityManager mActivityManager;
private AppInfoDashboardFragment mFragment;
private Context mShadowContext;
@@ -96,13 +93,11 @@ public final class AppInfoDashboardFragmentTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mShadowContext = spy(RuntimeEnvironment.application);
mShadowContext = RuntimeEnvironment.application;
mFragment = spy(new AppInfoDashboardFragment());
doReturn(mActivity).when(mFragment).getActivity();
doReturn(mShadowContext).when(mFragment).getContext();
doReturn(mPackageManager).when(mActivity).getPackageManager();
doReturn(mShadowContext).when(mActivity).getApplicationContext();
doReturn(mActivityManager).when(mActivity).getSystemService(ActivityManager.class);
when(mUserManager.isAdminUser()).thenReturn(true);
ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
@@ -207,6 +202,7 @@ public final class AppInfoDashboardFragmentTest {
ShadowAppUtils.addHiddenModule(PACKAGE_NAME);
ReflectionHelpers.setField(mFragment, "mPackageName", PACKAGE_NAME);
assertThat(mFragment.ensureDisplayableModule(mActivity)).isFalse();
}
@@ -218,14 +214,6 @@ public final class AppInfoDashboardFragmentTest {
assertThat(mFragment.ensureDisplayableModule(mActivity)).isTrue();
}
@Test
public void isLockTaskModePinned_pinned_shouldReturnTrue() {
doReturn(ActivityManager.LOCK_TASK_MODE_PINNED).when(
mActivityManager).getLockTaskModeState();
assertThat(mFragment.isLockTaskModePinned(mActivity)).isTrue();
}
@Test
public void createPreference_hasNoPackageInfo_shouldSkip() {
ReflectionHelpers.setField(mFragment, "mPackageInfo", null);
@@ -279,8 +267,9 @@ public final class AppInfoDashboardFragmentTest {
public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() {
doReturn(true).when(mFragment).refreshUi();
mFragment.onActivityResult(AppInfoDashboardFragment.REQUEST_UNINSTALL, 0,
mock(Intent.class));
mFragment
.onActivityResult(AppInfoDashboardFragment.REQUEST_UNINSTALL, 0,
mock(Intent.class));
verify(mActivity).invalidateOptionsMenu();
}