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

Merge "DPC can be uninstalled in personal profile in New COPE" into rvc-dev am: 37fa5bd059

Browse Source 
Change-Id: I19c97f204b39f0097b32f433937fa40e555f03d5
This commit is contained in:
Automerger Merge Worker
2020-03-13 14:47:29 +00:00
parent 43d0d904c9 37fa5bd059
commit 91002efcd6
3 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/Utils.java
View File

@@ -887,6 +887,27 @@ public final class Utils extends com.android.settingslib.Utils {
return false;
}
/**
* Return {@code true} if the supplied package is the device owner or profile owner of a
* given user.
*
* @param devicePolicyManager used to check whether it is device owner and profile owner app
* @param packageName package to check about
* @param userId the if of the relevant user
*/
public static boolean isProfileOrDeviceOwner(DevicePolicyManager devicePolicyManager,
String packageName, int userId) {
if ((devicePolicyManager.getDeviceOwnerUserId() == userId)
&& devicePolicyManager.isDeviceOwnerApp(packageName)) {
return true;
}
final ComponentName cn = devicePolicyManager.getProfileOwnerAsUser(userId);
if (cn != null && cn.getPackageName().equals(packageName)) {
return true;
}
return false;
}
/**
* Return the resource id to represent the install status for an app
*/

16
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -25,8 +25,8 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.om.OverlayManager;
import android.content.om.OverlayInfo;
import android.content.om.OverlayManager;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -393,11 +393,19 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
enabled = false;
}
// We don't allow uninstalling DO/PO on *any* users, because if it's a system app,
// We don't allow uninstalling DO/PO on *any* users if it's a system app, because
// "uninstall" is actually "downgrade to the system version + disable", and "downgrade"
// will clear data on all users.
if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
enabled = false;
if (Utils.isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {
if (Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mPackageInfo.packageName)) {
enabled = false;
}
// We allow uninstalling if the calling user is not a DO/PO and if it's not a system app,
// because this will not have device-wide consequences.
} else {
if (Utils.isProfileOrDeviceOwner(mDpm, mPackageInfo.packageName, mUserId)) {
enabled = false;
}
}
// Don't allow uninstalling the device provisioning package.

36
tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
View File

@@ -36,7 +36,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.app.Application;
import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -51,8 +50,6 @@ import android.os.UserManager;
import android.util.ArraySet;
import android.view.View;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -277,7 +274,8 @@ public class AppButtonsPreferenceControllerTest {
}
@Test
public void updateUninstallButton_isProfileOrDeviceOwner_setButtonDisable() {
public void updateUninstallButton_isSystemAndIsProfileOrDeviceOwner_setButtonDisable() {
mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
doReturn(true).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());
mController.updateUninstallButton();
@@ -285,6 +283,36 @@ public class AppButtonsPreferenceControllerTest {
verify(mButtonPrefs).setButton2Enabled(false);
}
@Test
public void updateUninstallButton_isSystemAndIsNotProfileOrDeviceOwner_setButtonEnabled() {
mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
doReturn(false).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());
mController.updateUninstallButton();
verify(mButtonPrefs).setButton2Enabled(true);
}
@Test
public void updateUninstallButton_isNotSystemAndIsProfileOrDeviceOwner_setButtonDisable() {
doReturn(0).when(mDpm).getDeviceOwnerUserId();
doReturn(true).when(mDpm).isDeviceOwnerApp(anyString());
mController.updateUninstallButton();
verify(mButtonPrefs).setButton2Enabled(false);
}
@Test
public void updateUninstallButton_isNotSystemAndIsNotProfileOrDeviceOwner_setButtonEnabled() {
doReturn(10).when(mDpm).getDeviceOwnerUserId();
doReturn(false).when(mDpm).isDeviceOwnerApp(anyString());
mController.updateUninstallButton();
verify(mButtonPrefs).setButton2Enabled(true);
}
@Test
public void updateUninstallButton_isDeviceProvisioningApp_setButtonDisable() {
doReturn(true).when(mDpm).isDeviceOwnerAppOnAnyUser(anyString());