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

Revert "Kill uid when REQUEST_INSTALL_PACKAGES is denied"

Browse Source 
This reverts commit 732edc3e39.
The kill is already done by StorageManagerService these days.

Bug: 133504844
Test: flip toggle, verify app is still killed.
Change-Id: I1de15108e1e214478c2b67701e95208f280195b6
This commit is contained in:
Martijn Coenen
2020-10-05 13:10:22 +02:00
parent 4866b0ae7c
commit 98c7ad9953
2 changed files with 1 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import android.app.ActivityManager;
import android.app.AppOpsManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -30,7 +29,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.applications.AppInfoWithHeader;
@@ -46,7 +44,6 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
private AppStateInstallAppsBridge mAppBridge;
private AppOpsManager mAppOpsManager;
private ActivityManager mActivityManager;
private UserManager mUserManager;
private RestrictedSwitchPreference mSwitchPref;
private InstallAppsState mInstallAppsState;
@@ -58,7 +55,6 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
final Context context = getActivity();
mAppBridge = new AppStateInstallAppsBridge(context, mState, null);
mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
mActivityManager = context.getSystemService(ActivityManager.class);
mUserManager = UserManager.get(context);
addPreferencesFromResource(R.xml.external_sources_details);
@@ -103,21 +99,10 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
: R.string.app_permission_summary_not_allowed);
}
@VisibleForTesting
void setCanInstallApps(boolean newState) {
private void setCanInstallApps(boolean newState) {
mAppOpsManager.setMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES,
mPackageInfo.applicationInfo.uid, mPackageName,
newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
if (!newState) {
killApp(mPackageInfo.applicationInfo.uid);
}
}
private void killApp(int uid) {
if (UserHandle.isCore(uid)) {
return;
}
mActivityManager.killUid(uid, "User denied OP_REQUEST_INSTALL_PACKAGES");
}
@Override

47
tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
View File

@@ -19,17 +19,11 @@ package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.app.AppOpsManager;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
@@ -61,10 +55,6 @@ public class ExternalSourcesDetailsTest {
@Mock
private UserManager mUserManager;
@Mock
private ActivityManager mActivityManager;
@Mock
private AppOpsManager mAppOpsManager;
@Mock
private RestrictedSwitchPreference mSwitchPref;
@Mock
private RestrictedPreferenceHelper mHelper;
@@ -79,46 +69,9 @@ public class ExternalSourcesDetailsTest {
mFragment = new ExternalSourcesDetails();
ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
ReflectionHelpers.setField(mFragment, "mActivityManager", mActivityManager);
ReflectionHelpers.setField(mFragment, "mAppOpsManager", mAppOpsManager);
ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
}
@Test
public void setCanInstallApps_false_shouldKillNonCoreUid() {
int mockUid = 23456;
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
mPackageInfo.applicationInfo = new ApplicationInfo();
mPackageInfo.applicationInfo.uid = mockUid;
assertThat(UserHandle.isCore(mockUid)).isFalse();
mFragment.setCanInstallApps(false);
verify(mActivityManager).killUid(eq(mockUid), anyString());
}
@Test
public void setCanInstallApps_false_shouldNotKillCoreUid() {
int mockUid = 1234;
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
mPackageInfo.applicationInfo = new ApplicationInfo();
mPackageInfo.applicationInfo.uid = mockUid;
assertThat(UserHandle.isCore(mockUid)).isTrue();
mFragment.setCanInstallApps(false);
verify(mActivityManager, never()).killUid(eq(mockUid), anyString());
}
@Test
public void setCanInstallApps_true_shouldNotKillUid() {
int mockUid = 23456;
ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
mPackageInfo.applicationInfo = new ApplicationInfo();
mPackageInfo.applicationInfo.uid = mockUid;
mFragment.setCanInstallApps(true);
verify(mActivityManager, never()).killUid(eq(mockUid), anyString());
}
@Test
public void refreshUi_noPackageInfo_shouldReturnFalseAndNoCrash() {
mFragment.refreshUi();