Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Logs a warning on some setters called when the device doesn't support the feature."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-08 18:49:41 +00:00
committed by Android (Google) Code Review
parent a32bde83cd 2695df2069
commit 75f48b1254
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -7132,9 +7132,22 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return (deviceOwner != null) ? deviceOwner.keepUninstalledPackages : null;
}
/**
* Logs a warning when the device doesn't have {@code PackageManager.FEATURE_DEVICE_ADMIN}.
*
* @param message action that was not executed; should not end with a period because the missing
* feature will be appended to it.
*/
private void logMissingFeatureAction(String message) {
Slog.w(LOG_TAG, message + " because device does not have the "
+ PackageManager.FEATURE_DEVICE_ADMIN + " feature.");
}
@Override
public boolean setDeviceOwner(ComponentName admin, String ownerName, int userId) {
if (!mHasFeature) {
logMissingFeatureAction("Cannot set " + ComponentName.flattenToShortString(admin)
+ " as device owner for user " + userId);
return false;
}
if (admin == null
@@ -7456,6 +7469,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@Override
public boolean setProfileOwner(ComponentName who, String ownerName, int userHandle) {
if (!mHasFeature) {
logMissingFeatureAction("Cannot set " + ComponentName.flattenToShortString(who)
+ " as profile owner for user " + userHandle);
return false;
}
if (who == null
@@ -7676,6 +7691,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@Override
public void setUserProvisioningState(int newState, int userHandle) {
if (!mHasFeature) {
logMissingFeatureAction("Cannot set provisioning state " + newState + " for user "
+ userHandle);
return;
}
@@ -7753,6 +7770,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@Override
public void setProfileEnabled(ComponentName who) {
if (!mHasFeature) {
logMissingFeatureAction("Cannot enable profile for "
+ ComponentName.flattenToShortString(who));
return;
}
Objects.requireNonNull(who, "ComponentName is null");