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

Merge "Minor improvements on DevicePolicyManagerService." into sc-dev

Browse Source
This commit is contained in:
Felipe Leme
2021-03-16 19:58:23 +00:00
committed by Android (Google) Code Review
parent 1b529aa19d a9583ff915
commit 6e91d799b7
3 changed files with 140 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/devicepolicy/java/com/android/server/devicepolicy/CertificateMonitor.java
View File

@@ -79,16 +79,16 @@ public class CertificateMonitor {
X509Certificate cert = parseCert(certBuffer);
pemCert = Credentials.convertToPem(cert);
} catch (CertificateException | IOException ce) {
Slog.e(LOG_TAG, ce, "Problem converting cert");
Slog.e(LOG_TAG, "Problem converting cert", ce);
return null;
}
try (KeyChainConnection keyChainConnection = mInjector.keyChainBindAsUser(userHandle)) {
return keyChainConnection.getService().installCaCertificate(pemCert);
} catch (RemoteException e) {
Slog.e(LOG_TAG, e, "installCaCertsToKeyChain(): ");
Slog.e(LOG_TAG, "installCaCertsToKeyChain(): ", e);
} catch (InterruptedException e1) {
Slog.w(LOG_TAG, e1, "installCaCertsToKeyChain(): ");
Slog.w(LOG_TAG, "installCaCertsToKeyChain(): ", e1);
Thread.currentThread().interrupt();
}
return null;
@@ -100,9 +100,9 @@ public class CertificateMonitor {
keyChainConnection.getService().deleteCaCertificate(aliases[i]);
}
} catch (RemoteException e) {
Slog.e(LOG_TAG, e, "from CaCertUninstaller: ");
Slog.e(LOG_TAG, "from CaCertUninstaller: ", e);
} catch (InterruptedException ie) {
Slog.w(LOG_TAG, ie, "CaCertUninstaller: ");
Slog.w(LOG_TAG, "CaCertUninstaller: ", ie);
Thread.currentThread().interrupt();
}
}

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

@@ -1056,7 +1056,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
service.removeCredentialManagementApp();
}
} catch (RemoteException | InterruptedException | IllegalStateException e) {
Log.e(LOG_TAG, "Unable to remove the credential management app");
Slog.e(LOG_TAG, "Unable to remove the credential management app");
}
});
}
@@ -1149,18 +1149,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@OperationSafetyReason int reason) {
Preconditions.checkCallAuthorization(
hasCallingOrSelfPermission(permission.MANAGE_DEVICE_ADMINS));
Slog.i(LOG_TAG, String.format("setNextOperationSafety(%s, %s)",
Slog.i(LOG_TAG, "setNextOperationSafety(%s, %s)",
DevicePolicyManager.operationToString(operation),
DevicePolicyManager.operationSafetyReasonToString(reason)));
DevicePolicyManager.operationSafetyReasonToString(reason));
mSafetyChecker = new OneTimeSafetyChecker(this, operation, reason);
}
@Override
public boolean isSafeOperation(@OperationSafetyReason int reason) {
if (VERBOSE_LOG) {
Slog.v(LOG_TAG, "checking isSafeOperation("
+ DevicePolicyManager.operationSafetyReasonToString(reason)
+ ") using mSafetyChecker " + mSafetyChecker);
Slog.v(LOG_TAG, "checking isSafeOperation(%s) using mSafetyChecker %s",
DevicePolicyManager.operationSafetyReasonToString(reason), mSafetyChecker);
}
return mSafetyChecker == null ? true : mSafetyChecker.isSafeOperation(reason);
}
@@ -1893,9 +1892,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return;
}
Slog.i(LOG_TAG, String.format(
"Migrating COMP to PO on a corp owned device; primary user: %d; profile: %d",
doUserId, poUserId));
Slog.i(LOG_TAG, "Migrating COMP to PO on a corp owned device; primary user: %d; "
+ "profile: %d", doUserId, poUserId);
Slog.i(LOG_TAG, "Giving the PO additional power...");
markProfileOwnerOnOrganizationOwnedDeviceUncheckedLocked(poAdminComponent, poUserId);
@@ -1940,11 +1938,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
private void uninstallOrDisablePackage(String packageName, int userHandle) {
private void uninstallOrDisablePackage(String packageName, @UserIdInt int userId) {
final ApplicationInfo appInfo;
try {
appInfo = mIPackageManager.getApplicationInfo(
packageName, MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userHandle);
packageName, MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, userId);
} catch (RemoteException e) {
// Shouldn't happen.
return;
@@ -1954,10 +1952,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return;
}
if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
Slog.i(LOG_TAG, String.format(
"Package %s is pre-installed, marking disabled until used", packageName));
Slog.i(LOG_TAG, "Package %s is pre-installed, marking disabled until used",
packageName);
mContext.getPackageManager().setApplicationEnabledSetting(packageName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED, 0 /* flags */);
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED, /* flags= */ 0);
return;
}
@@ -1968,17 +1966,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int status = intent.getIntExtra(
PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE);
if (status == PackageInstaller.STATUS_SUCCESS) {
Slog.i(LOG_TAG, String.format(
"Package %s uninstalled for user %d", packageName, userHandle));
Slog.i(LOG_TAG, "Package %s uninstalled for user %d", packageName, userId);
} else {
Slog.e(LOG_TAG, String.format(
"Failed to uninstall %s; status: %d", packageName, status));
Slog.e(LOG_TAG, "Failed to uninstall %s; status: %d", packageName, status);
}
}
};
final PackageInstaller pi = mInjector.getPackageManager(userHandle).getPackageInstaller();
pi.uninstall(packageName, 0 /* flags */, new IntentSender((IIntentSender) mLocalSender));
final PackageInstaller pi = mInjector.getPackageManager(userId).getPackageInstaller();
pi.uninstall(packageName, /* flags= */ 0, new IntentSender((IIntentSender) mLocalSender));
}
@GuardedBy("getLockObject()")
@@ -2177,7 +2173,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
!mOwners.getDeviceOwnerUserRestrictionsNeedsMigration());
mOwners.writeDeviceOwner();
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "Device owner component filled in");
Slog.v(LOG_TAG, "Device owner component filled in");
}
}
}
@@ -2192,7 +2188,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// except for the "system controlled" ones.
if (mOwners.getDeviceOwnerUserRestrictionsNeedsMigration()) {
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "Migrating DO user restrictions");
Slog.v(LOG_TAG, "Migrating DO user restrictions");
}
migrated = true;
@@ -2220,7 +2216,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int userId = ui.id;
if (mOwners.getProfileOwnerUserRestrictionsNeedsMigration(userId)) {
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "Migrating PO user restrictions for user " + userId);
Slog.v(LOG_TAG, "Migrating PO user restrictions for user %d", userId);
}
migrated = true;
@@ -2243,7 +2239,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
if (VERBOSE_LOG && migrated) {
Log.v(LOG_TAG, "User restrictions migrated.");
Slog.v(LOG_TAG, "User restrictions migrated.");
}
}
@@ -2271,9 +2267,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "origRestrictions=" + origRestrictions);
Log.v(LOG_TAG, "newBaseRestrictions=" + newBaseRestrictions);
Log.v(LOG_TAG, "newOwnerRestrictions=" + newOwnerRestrictions);
Slog.v(LOG_TAG, "origRestrictions=%s", origRestrictions);
Slog.v(LOG_TAG, "newBaseRestrictions=%s", newBaseRestrictions);
Slog.v(LOG_TAG, "newOwnerRestrictions=%s", newOwnerRestrictions);
}
mUserManagerInternal.setBaseUserRestrictionsByDpmsForMigration(user.getIdentifier(),
newBaseRestrictions);
@@ -2768,9 +2764,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
private JournaledFile makeJournaledFile(@UserIdInt int userId, String fileName) {
final String base = new File(getPolicyFileDirectory(userId), fileName)
.getAbsolutePath();
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "Opening " + base);
}
if (VERBOSE_LOG) Slog.v(LOG_TAG, "Opening %s", base);
return new JournaledFile(new File(base), new File(base + ".tmp"));
}
@@ -4920,8 +4914,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
if (!validationErrors.isEmpty()) {
Log.w(LOG_TAG, "Failed to reset password due to constraint violation: "
+ validationErrors.get(0));
Slog.w(LOG_TAG, "Failed to reset password due to constraint violation: %s",
validationErrors.get(0));
return false;
}
}
@@ -5349,7 +5343,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
});
if (alias == null) {
Log.w(LOG_TAG, "Problem installing cert");
Slog.w(LOG_TAG, "Problem installing cert");
return false;
}
@@ -5422,12 +5416,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
.write();
return true;
} catch (RemoteException e) {
Log.e(LOG_TAG, "Installing certificate", e);
Slog.e(LOG_TAG, "Installing certificate", e);
} finally {
keyChainConnection.close();
}
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while installing certificate", e);
Slog.w(LOG_TAG, "Interrupted while installing certificate", e);
Thread.currentThread().interrupt();
} finally {
mInjector.binderRestoreCallingIdentity(id);
@@ -5472,12 +5466,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
.write();
return keyChain.removeKeyPair(alias);
} catch (RemoteException e) {
Log.e(LOG_TAG, "Removing keypair", e);
Slog.e(LOG_TAG, "Removing keypair", e);
} finally {
keyChainConnection.close();
}
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while removing keypair", e);
Slog.w(LOG_TAG, "Interrupted while removing keypair", e);
Thread.currentThread().interrupt();
} finally {
Binder.restoreCallingIdentity(id);
@@ -5495,9 +5489,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
KeyChain.bindAsUser(mContext, caller.getUserHandle())) {
return keyChainConnection.getService().containsKeyPair(alias);
} catch (RemoteException e) {
Log.e(LOG_TAG, "Querying keypair", e);
Slog.e(LOG_TAG, "Querying keypair", e);
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while querying keypair", e);
Slog.w(LOG_TAG, "Interrupted while querying keypair", e);
Thread.currentThread().interrupt();
}
return false;
@@ -5539,7 +5533,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
return false;
} catch (RemoteException e) {
Log.e(LOG_TAG, "Querying grant to wifi auth. ", e);
Slog.e(LOG_TAG, "Querying grant to wifi auth.", e);
return false;
}
});
@@ -5580,11 +5574,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
keyChain.setGrant(granteeUid, alias, hasGrant);
return true;
} catch (RemoteException e) {
Log.e(LOG_TAG, "Setting grant for package.", e);
Slog.e(LOG_TAG, "Setting grant for package.", e);
return false;
}
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while setting key grant", e);
Slog.w(LOG_TAG, "Interrupted while setting key grant", e);
Thread.currentThread().interrupt();
} finally {
mInjector.binderRestoreCallingIdentity(id);
@@ -5621,9 +5615,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
return result;
} catch (RemoteException e) {
Log.e(LOG_TAG, "Querying keypair grants", e);
Slog.e(LOG_TAG, "Querying keypair grants", e);
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while querying keypair grants", e);
Slog.w(LOG_TAG, "Interrupted while querying keypair grants", e);
Thread.currentThread().interrupt();
}
return Collections.emptyList();
@@ -5748,7 +5742,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// As the caller will be granted access to the key, ensure no UID was specified, as
// it will not have the desired effect.
if (keySpec.getUid() != KeyStore.UID_SELF) {
Log.e(LOG_TAG, "Only the caller can be granted access to the generated keypair.");
Slog.e(LOG_TAG, "Only the caller can be granted access to the generated keypair.");
logGenerateKeyPairFailure(caller, isCredentialManagementApp);
return false;
}
@@ -5774,8 +5768,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int generationResult = keyChain.generateKeyPair(algorithm,
new ParcelableKeyGenParameterSpec(keySpec));
if (generationResult != KeyChain.KEY_GEN_SUCCESS) {
Log.e(LOG_TAG, String.format(
"KeyChain failed to generate a keypair, error %d.", generationResult));
Slog.e(LOG_TAG, "KeyChain failed to generate a keypair, error %d.",
generationResult);
logGenerateKeyPairFailure(caller, isCredentialManagementApp);
switch (generationResult) {
case KeyChain.KEY_GEN_STRONGBOX_UNAVAILABLE:
@@ -5814,7 +5808,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
attestationChain.shallowCopyFrom(new KeymasterCertificateChain(encodedCerts));
} catch (CertificateException e) {
logGenerateKeyPairFailure(caller, isCredentialManagementApp);
Log.e(LOG_TAG, "While retrieving certificate chain.", e);
Slog.e(LOG_TAG, "While retrieving certificate chain.", e);
return false;
}
@@ -5829,9 +5823,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return true;
}
} catch (RemoteException e) {
Log.e(LOG_TAG, "KeyChain error while generating a keypair", e);
Slog.e(LOG_TAG, "KeyChain error while generating a keypair", e);
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while generating keypair", e);
Slog.w(LOG_TAG, "Interrupted while generating keypair", e);
Thread.currentThread().interrupt();
} finally {
mInjector.binderRestoreCallingIdentity(id);
@@ -5889,10 +5883,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
.write();
return true;
} catch (InterruptedException e) {
Log.w(LOG_TAG, "Interrupted while setting keypair certificate", e);
Slog.w(LOG_TAG, "Interrupted while setting keypair certificate", e);
Thread.currentThread().interrupt();
} catch (RemoteException e) {
Log.e(LOG_TAG, "Failed setting keypair certificate", e);
Slog.e(LOG_TAG, "Failed setting keypair certificate", e);
} finally {
mInjector.binderRestoreCallingIdentity(id);
}
@@ -5966,7 +5960,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
} catch (Exception e) {
// Caller could throw RuntimeException or RemoteException back across processes. Catch
// everything just to be sure.
Log.e(LOG_TAG, "error while responding to callback", e);
Slog.e(LOG_TAG, "error while responding to callback", e);
}
}
@@ -6323,7 +6317,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
boolean isUserSelectable) {
// Should not be user selectable
if (isUserSelectable) {
Log.e(LOG_TAG, "The credential management app is not allowed to install a "
Slog.e(LOG_TAG, "The credential management app is not allowed to install a "
+ "user selectable key pair");
return false;
}
@@ -6523,8 +6517,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// Persist the request so the device is automatically factory-reset on next start if
// the system crashes or reboots before the {@code DevicePolicySafetyChecker} calls
// its callback.
Slog.i(LOG_TAG, String.format("Persisting factory reset request as it could be "
+ "delayed by %s", mSafetyChecker));
Slog.i(LOG_TAG, "Persisting factory reset request as it could be delayed by %s",
mSafetyChecker);
synchronized (getLockObject()) {
DevicePolicyData policy = getUserData(UserHandle.USER_SYSTEM);
policy.setDelayedFactoryReset(reason, wipeExtRequested, wipeEuicc,
@@ -6638,8 +6632,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
int userId = admin != null ? admin.getUserHandle().getIdentifier()
: caller.getUserId();
Slog.i(LOG_TAG, String.format("wipeDataWithReason(%s): admin=%s, user=%d",
wipeReasonForUser, admin, userId));
Slog.i(LOG_TAG, "wipeDataWithReason(%s): admin=%s, user=%d", wipeReasonForUser, admin,
userId);
if (calledByProfileOwnerOnOrgOwnedDevice) {
// When wipeData is called on the parent instance, it implies wiping the entire device.
if (calledOnParentInstance) {
@@ -7439,7 +7433,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
try {
mInjector.getIWindowManager().refreshScreenCaptureDisabled(userHandle);
} catch (RemoteException e) {
Log.w(LOG_TAG, "Unable to notify WindowManager.", e);
Slog.w(LOG_TAG, "Unable to notify WindowManager.", e);
}
});
}
@@ -8906,19 +8900,18 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// thrown but null data can be returned; if the appInfo for the specified package cannot
// be found then return false to prevent crashing the app.
if (appInfo == null) {
Log.w(LOG_TAG,
String.format("appInfo could not be found for package %s", packageName));
Slog.w(LOG_TAG, "appInfo could not be found for package %s", packageName);
return false;
} else if (uid != appInfo.uid) {
String message = String.format("Package %s (uid=%d) does not match provided uid %d",
packageName, appInfo.uid, uid);
Log.w(LOG_TAG, message);
Slog.w(LOG_TAG, message);
throw new SecurityException(message);
}
} catch (RemoteException e) {
// If an exception is caught obtaining the appInfo just return false to prevent crashing
// apps due to an internal error.
Log.e(LOG_TAG, "Exception caught obtaining appInfo for package " + packageName, e);
Slog.e(LOG_TAG, e, "Exception caught obtaining appInfo for package %s", packageName);
return false;
}
return true;
@@ -8934,7 +8927,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
String message = String.format(
"Calling uid %d, pid %d cannot check device identifier access for package %s "
+ "(uid=%d, pid=%d)", callingUid, callingPid, packageName, uid, pid);
Log.w(LOG_TAG, message);
Slog.w(LOG_TAG, message);
throw new SecurityException(message);
}
}
@@ -8942,14 +8935,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
/**
* Canonical name for a given package.
*/
private String getApplicationLabel(String packageName, int userHandle) {
private String getApplicationLabel(String packageName, @UserIdInt int userId) {
return mInjector.binderWithCleanCallingIdentity(() -> {
final Context userContext;
try {
UserHandle handle = new UserHandle(userHandle);
userContext = mContext.createPackageContextAsUser(packageName, 0, handle);
UserHandle userHandle = UserHandle.of(userId);
userContext = mContext.createPackageContextAsUser(packageName, /* flags= */ 0,
userHandle);
} catch (PackageManager.NameNotFoundException nnfe) {
Log.w(LOG_TAG, packageName + " is not installed for user " + userHandle, nnfe);
Slog.w(LOG_TAG, nnfe, "%s is not installed for user %d", packageName, userId);
return null;
}
ApplicationInfo appInfo = userContext.getApplicationInfo();
@@ -9568,9 +9562,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
result.add(info.options);
} else {
Log.w(LOG_TAG, "Ignoring admin " + active.info
+ " because it has trust options but doesn't declare "
+ "KEYGUARD_DISABLE_TRUST_AGENTS");
Slog.w(LOG_TAG, "Ignoring admin %s because it has trust options but doesn't"
+ " declare KEYGUARD_DISABLE_TRUST_AGENTS", active.info);
}
} else if (disablesTrust) {
allAdminsHaveOptions = false;
@@ -9708,7 +9701,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
userIdToCheck);
systemService = (applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
} catch (RemoteException e) {
Log.i(LOG_TAG, "Can't talk to package managed", e);
Slog.i(LOG_TAG, "Can't talk to package managed", e);
}
if (!systemService && !permittedList.contains(enabledPackage)) {
return false;
@@ -10189,7 +10182,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
user = userInfo.getUserHandle();
}
} catch (UserManager.CheckedUserOperationException e) {
Log.e(LOG_TAG, "Couldn't createUserEvenWhenDisallowed", e);
Slog.e(LOG_TAG, "Couldn't createUserEvenWhenDisallowed", e);
}
} finally {
mInjector.binderRestoreCallingIdentity(id);
@@ -10260,8 +10253,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
} catch (RemoteException e) {
// Does not happen, same process
Slog.wtf(LOG_TAG, String.format("Failed to install admin package %s for user %d",
adminPkg, userId), e);
Slog.wtf(LOG_TAG, e, "Failed to install admin package %s for user %d",
adminPkg, userId);
}
// Set admin.
@@ -10310,7 +10303,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
manageUserUnchecked(/* deviceOwner= */ admin, /* profileOwner= */ admin,
/* managedUser= */ userId, /* adminExtras= */ null, /* showDisclaimer= */ true);
} else {
Log.i(LOG_TAG, "User " + userId + " added on DO mode; setting ShowNewUserDisclaimer");
Slog.i(LOG_TAG, "User %d added on DO mode; setting ShowNewUserDisclaimer", userId);
setShowNewUserDisclaimer(userId, DevicePolicyData.NEW_USER_DISCLAIMER_NEEDED);
}
}
@@ -10366,8 +10359,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
? UserManager.DISALLOW_REMOVE_MANAGED_PROFILE
: UserManager.DISALLOW_REMOVE_USER;
if (isAdminAffectedByRestriction(who, restriction, caller.getUserId())) {
Log.w(LOG_TAG, "The device owner cannot remove a user because "
+ restriction + " is enabled, and was not set by the device owner");
Slog.w(LOG_TAG, "The device owner cannot remove a user because %s is enabled, and "
+ "was not set by the device owner", restriction);
return false;
}
return mUserManagerInternal.removeUserEvenWhenDisallowed(userHandle.getIdentifier());
@@ -10404,7 +10397,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
return mInjector.getIActivityManager().switchUser(userId);
} catch (RemoteException e) {
Log.e(LOG_TAG, "Couldn't switch user", e);
Slog.e(LOG_TAG, "Couldn't switch user", e);
return false;
} finally {
mInjector.binderRestoreCallingIdentity(id);
@@ -10422,19 +10415,19 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int userId = userHandle.getIdentifier();
if (isManagedProfile(userId)) {
Log.w(LOG_TAG, "Managed profile cannot be started in background");
Slog.w(LOG_TAG, "Managed profile cannot be started in background");
return UserManager.USER_OPERATION_ERROR_MANAGED_PROFILE;
}
final long id = mInjector.binderClearCallingIdentity();
try {
if (!mInjector.getActivityManagerInternal().canStartMoreUsers()) {
Log.w(LOG_TAG, "Cannot start user " + userId + ", too many users in background");
Slog.w(LOG_TAG, "Cannot start user %d, too many users in background", userId);
return UserManager.USER_OPERATION_ERROR_MAX_RUNNING_USERS;
}
if (mInjector.getIActivityManager().startUserInBackground(userId)) {
Log.i(LOG_TAG, "Started used " + userId + " in background");
Slog.i(LOG_TAG, "Started used %d in background", userId);
return UserManager.USER_OPERATION_SUCCESS;
} else {
return UserManager.USER_OPERATION_ERROR_UNKNOWN;
@@ -10457,7 +10450,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int userId = userHandle.getIdentifier();
if (isManagedProfile(userId)) {
Log.w(LOG_TAG, "Managed profile cannot be stopped");
Slog.w(LOG_TAG, "Managed profile cannot be stopped");
return UserManager.USER_OPERATION_ERROR_MANAGED_PROFILE;
}
@@ -10480,14 +10473,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
if (isManagedProfile(callingUserId)) {
Log.w(LOG_TAG, "Managed profile cannot be logout");
Slog.w(LOG_TAG, "Managed profile cannot be logout");
return UserManager.USER_OPERATION_ERROR_MANAGED_PROFILE;
}
final long id = mInjector.binderClearCallingIdentity();
try {
if (!mInjector.getIActivityManager().switchUser(UserHandle.USER_SYSTEM)) {
Log.w(LOG_TAG, "Failed to switch to primary user");
Slog.w(LOG_TAG, "Failed to switch to primary user");
// This should never happen as target user is UserHandle.USER_SYSTEM
return UserManager.USER_OPERATION_ERROR_UNKNOWN;
}
@@ -11264,8 +11257,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
if (isCrossProfileQuickContactDisabled(managedUserId)) {
if (VERBOSE_LOG) {
Log.v(LOG_TAG,
"Cross-profile contacts access disabled for user " + managedUserId);
Slog.v(LOG_TAG, "Cross-profile contacts access disabled for user %d",
managedUserId);
}
return;
}
@@ -11278,7 +11271,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
/**
* @return true if cross-profile QuickContact is disabled
*/
private boolean isCrossProfileQuickContactDisabled(int userId) {
private boolean isCrossProfileQuickContactDisabled(@UserIdInt int userId) {
return getCrossProfileCallerIdDisabledForUser(userId)
&& getCrossProfileContactsSearchDisabledForUser(userId);
}
@@ -11287,23 +11280,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
* @return the user ID of the managed user that is linked to the current user, if any.
* Otherwise -1.
*/
public int getManagedUserId(int callingUserId) {
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "getManagedUserId: callingUserId=" + callingUserId);
}
public int getManagedUserId(@UserIdInt int callingUserId) {
if (VERBOSE_LOG) Slog.v(LOG_TAG, "getManagedUserId: callingUserId=%d", callingUserId);
for (UserInfo ui : mUserManager.getProfiles(callingUserId)) {
if (ui.id == callingUserId || !ui.isManagedProfile()) {
continue; // Caller user self, or not a managed profile. Skip.
}
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "Managed user=" + ui.id);
}
if (VERBOSE_LOG) Slog.v(LOG_TAG, "Managed user=%d", ui.id);
return ui.id;
}
if (VERBOSE_LOG) {
Log.v(LOG_TAG, "Managed user not found.");
}
if (VERBOSE_LOG) Slog.v(LOG_TAG, "Managed user not found.");
return -1;
}
@@ -11602,7 +11589,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// Some settings are no supported any more. However we do not want to throw a
// SecurityException to avoid breaking apps.
if (GLOBAL_SETTINGS_DEPRECATED.contains(setting)) {
Log.i(LOG_TAG, "Global setting no longer supported: " + setting);
Slog.i(LOG_TAG, "Global setting no longer supported: %s", setting);
return;
}
@@ -12338,7 +12325,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
synchronized (getLockObject()) {
if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_PRINTING,
UserHandle.of(userId))) {
Log.e(LOG_TAG, "printing is enabled");
Slog.e(LOG_TAG, "printing is enabled for user %d", userId);
return null;
}
String ownerPackage = mOwners.getProfileOwnerPackage(userId);
@@ -12351,22 +12338,22 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
try {
return pm.getPackageInfo(packageName, 0);
} catch (NameNotFoundException e) {
Log.e(LOG_TAG, "getPackageInfo error", e);
Slog.e(LOG_TAG, "getPackageInfo error", e);
return null;
}
});
if (packageInfo == null) {
Log.e(LOG_TAG, "packageInfo is inexplicably null");
Slog.e(LOG_TAG, "packageInfo is inexplicably null");
return null;
}
ApplicationInfo appInfo = packageInfo.applicationInfo;
if (appInfo == null) {
Log.e(LOG_TAG, "appInfo is inexplicably null");
Slog.e(LOG_TAG, "appInfo is inexplicably null");
return null;
}
CharSequence appLabel = pm.getApplicationLabel(appInfo);
if (appLabel == null) {
Log.e(LOG_TAG, "appLabel is inexplicably null");
Slog.e(LOG_TAG, "appLabel is inexplicably null");
return null;
}
return ((Context) ActivityThread.currentActivityThread().getSystemUiContext())
@@ -12420,9 +12407,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
Objects.requireNonNull(intent);
Objects.requireNonNull(parentHandle);
final int userId = parentHandle.getIdentifier();
Slog.i(LOG_TAG,
String.format("Sending %s broadcast to manifest receivers.",
intent.getAction()));
Slog.i(LOG_TAG, "Sending %s broadcast to manifest receivers.", intent.getAction());
try {
final List<ResolveInfo> receivers = mIPackageManager.queryIntentReceivers(
intent, /* resolvedType= */ null,
@@ -12432,9 +12417,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
if (checkCrossProfilePackagePermissions(packageName, userId,
requiresPermission)
|| checkModifyQuietModePermission(packageName, userId)) {
Slog.i(LOG_TAG,
String.format("Sending %s broadcast to %s.", intent.getAction(),
packageName));
Slog.i(LOG_TAG, "Sending %s broadcast to %s.", intent.getAction(),
packageName);
final Intent packageIntent = new Intent(intent)
.setComponent(receiver.getComponentInfo().getComponentName())
.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
@@ -12442,9 +12426,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
}
} catch (RemoteException ex) {
Slog.w(LOG_TAG,
String.format("Cannot get list of broadcast receivers for %s because: %s.",
intent.getAction(), ex));
Slog.w(LOG_TAG, "Cannot get list of broadcast receivers for %s because: %s.",
intent.getAction(), ex);
}
}
@@ -12462,9 +12445,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
android.Manifest.permission.MODIFY_QUIET_MODE, uid, /* owningUid= */
-1, /* exported= */ true);
} catch (NameNotFoundException ex) {
Slog.w(LOG_TAG,
String.format("Cannot find the package %s to check for permissions.",
packageName));
Slog.w(LOG_TAG, "Cannot find the package %s to check for permissions.",
packageName);
return false;
}
}
@@ -12493,9 +12475,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return crossProfileAppsService.verifyPackageHasInteractAcrossProfilePermission(
packageName, userId);
} catch (NameNotFoundException ex) {
Slog.w(LOG_TAG,
String.format("Cannot find the package %s to check for permissions.",
packageName));
Slog.w(LOG_TAG, "Cannot find the package %s to check for permissions.",
packageName);
return false;
}
}
@@ -12569,8 +12550,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// TODO(b/178494483): use EventLog instead
// TODO(b/178494483): log metrics?
if (VERBOSE_LOG) {
Slog.v(LOG_TAG, String.format("notifyUnsafeOperationStateChanged(): %s=%b",
DevicePolicyManager.operationSafetyReasonToString(reason), isSafe));
Slog.v(LOG_TAG, "notifyUnsafeOperationStateChanged(): %s=%b",
DevicePolicyManager.operationSafetyReasonToString(reason), isSafe);
}
Preconditions.checkArgument(mSafetyChecker == checker,
"invalid checker: should be %s, was %s", mSafetyChecker, checker);
@@ -12852,7 +12833,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
runningUserIds = mInjector.getIActivityManager().getRunningUserIds();
} catch (RemoteException e) {
// Shouldn't happen.
Log.e(LOG_TAG, "Could not retrieve the list of running users", e);
Slog.e(LOG_TAG, "Could not retrieve the list of running users", e);
return;
}
// Send broadcasts to corresponding profile owners if any.
@@ -13213,9 +13194,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final int deviceOwnerUserId = mInjector.userManagerIsHeadlessSystemUserMode()
? UserHandle.USER_SYSTEM
: callingUserId;
Slog.i(LOG_TAG,
String.format("Calling user %d, device owner will be set on user %d",
callingUserId, deviceOwnerUserId));
Slog.i(LOG_TAG, "Calling user %d, device owner will be set on user %d",
callingUserId, deviceOwnerUserId);
// hasIncompatibleAccountsOrNonAdb doesn't matter since the caller is not adb.
return checkDeviceOwnerProvisioningPreConditionLocked(/* owner unknown */ null,
deviceOwnerUserId, callingUserId, /* isAdb= */ false,
@@ -13245,9 +13225,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
UserManager.DISALLOW_ADD_MANAGED_PROFILE, callingUserHandle);
if (mUserManager.getUserInfo(callingUserId).isProfile()) {
Slog.i(LOG_TAG,
String.format("Calling user %d is a profile, cannot add another.",
callingUserId));
Slog.i(LOG_TAG, "Calling user %d is a profile, cannot add another.", callingUserId);
// The check is called from inside a managed profile. A managed profile cannot
// be provisioned from within another managed profile.
return CODE_CANNOT_ADD_MANAGED_PROFILE;
@@ -13260,16 +13238,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
// Do not allow adding a managed profile if there's a restriction.
if (addingProfileRestricted) {
Slog.i(LOG_TAG, String.format(
"Adding a profile is restricted: User %s Has device owner? %b",
callingUserHandle, hasDeviceOwner));
Slog.i(LOG_TAG, "Adding a profile is restricted: User %s Has device owner? %b",
callingUserHandle, hasDeviceOwner);
return CODE_CANNOT_ADD_MANAGED_PROFILE;
}
// Bail out if we are trying to provision a work profile but one already exists.
if (!mUserManager.canAddMoreManagedProfiles(
callingUserId, /* allowedToRemoveOne= */ false)) {
Slog.i(LOG_TAG, String.format("A work profile already exists."));
Slog.i(LOG_TAG, "A work profile already exists.");
return CODE_CANNOT_ADD_MANAGED_PROFILE;
}
} finally {
@@ -13757,9 +13734,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
who.flattenToString(), userId));
}
Slog.i(LOG_TAG, String.format(
"Marking %s as profile owner on organization-owned device for user %d",
who.flattenToString(), userId));
Slog.i(LOG_TAG, "Marking %s as profile owner on organization-owned device for user %d",
who.flattenToString(), userId);
// First, set restriction on removing the profile.
mInjector.binderWithCleanCallingIdentity(() -> {
@@ -14172,7 +14148,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
try { // force stop the package before uninstalling
mInjector.getIActivityManager().forceStopPackage(packageName, userId);
} catch (RemoteException re) {
Log.e(LOG_TAG, "Failure talking to ActivityManager while force stopping package");
Slog.e(LOG_TAG, "Failure talking to ActivityManager while force stopping package");
}
final Uri packageURI = Uri.parse("package:" + packageName);
final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
@@ -14428,7 +14404,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
synchronized (getLockObject()) {
if (owner == null || !isAdminTestOnlyLocked(owner, userId)) {
Log.w(LOG_TAG,
Slog.w(LOG_TAG,
"Non test-only owner can't be installed with existing accounts.");
return true;
}
@@ -14442,20 +14418,20 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
boolean compatible = true;
for (Account account : accounts) {
if (hasAccountFeatures(am, account, feature_disallow)) {
Log.e(LOG_TAG, account + " has " + feature_disallow[0]);
Slog.e(LOG_TAG, "%s has %s", account, feature_disallow[0]);
compatible = false;
break;
}
if (!hasAccountFeatures(am, account, feature_allow)) {
Log.e(LOG_TAG, account + " doesn't have " + feature_allow[0]);
Slog.e(LOG_TAG, "%s doesn't have %s", account, feature_allow[0]);
compatible = false;
break;
}
}
if (compatible) {
Log.w(LOG_TAG, "All accounts are compatible");
Slog.w(LOG_TAG, "All accounts are compatible");
} else {
Log.e(LOG_TAG, "Found incompatible accounts");
Slog.e(LOG_TAG, "Found incompatible accounts");
}
return !compatible;
});
@@ -14465,7 +14441,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
try {
return am.hasFeatures(account, features, null, null).getResult();
} catch (Exception e) {
Log.w(LOG_TAG, "Failed to get account feature", e);
Slog.w(LOG_TAG, "Failed to get account feature", e);
return false;
}
}
@@ -14765,8 +14741,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
0, // flags
targetUserId);
if (info == null || info.serviceInfo == null) {
Log.e(LOG_TAG, "Fail to look up the service: " + rawIntent
+ " or user " + targetUserId + " is not running");
Slog.e(LOG_TAG, "Fail to look up the service: %s or user %d is not running", rawIntent,
targetUserId);
return null;
}
if (!expectedPackageName.equals(info.serviceInfo.packageName)) {
@@ -15260,7 +15236,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return mInjector.binderWithCleanCallingIdentity(
() -> tm.addDevicePolicyOverrideApn(mContext, apnSetting));
} else {
Log.w(LOG_TAG, "TelephonyManager is null when trying to add override apn");
Slog.w(LOG_TAG, "TelephonyManager is null when trying to add override apn");
return Telephony.Carriers.INVALID_APN_ID;
}
}
@@ -15284,7 +15260,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return mInjector.binderWithCleanCallingIdentity(
() -> tm.modifyDevicePolicyOverrideApn(mContext, apnId, apnSetting));
} else {
Log.w(LOG_TAG, "TelephonyManager is null when trying to modify override apn");
Slog.w(LOG_TAG, "TelephonyManager is null when trying to modify override apn");
return false;
}
}
@@ -15327,7 +15303,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return mInjector.binderWithCleanCallingIdentity(
() -> tm.getDevicePolicyOverrideApns(mContext));
}
Log.w(LOG_TAG, "TelephonyManager is null when trying to get override apns");
Slog.w(LOG_TAG, "TelephonyManager is null when trying to get override apns");
return Collections.emptyList();
}
@@ -15828,8 +15804,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return false;
}
if (!isPackageAllowedToAccessCalendarForUser(packageName, workProfileUserId)) {
Log.d(LOG_TAG, String.format("Package %s is not allowed to access cross-profile"
+ "calendar APIs", packageName));
Slog.d(LOG_TAG, "Package %s is not allowed to access cross-profile calendar APIs",
packageName);
return false;
}
final Intent intent = new Intent(
@@ -15843,7 +15819,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
try {
mContext.startActivityAsUser(intent, UserHandle.of(workProfileUserId));
} catch (ActivityNotFoundException e) {
Log.e(LOG_TAG, "View event activity not found", e);
Slog.e(LOG_TAG, "View event activity not found", e);
return false;
}
return true;
@@ -15857,7 +15833,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
packageName, UserHandle.getUserId(callingUid));
return packageUid == callingUid;
} catch (NameNotFoundException e) {
Log.d(LOG_TAG, "Calling package not found", e);
Slog.d(LOG_TAG, "Calling package not found", e);
return false;
}
});
@@ -15967,8 +15943,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final long deadline = admin.mProfileOffDeadline;
final int result = makeSuspensionReasons(admin.mSuspendPersonalApps,
deadline != 0 && mInjector.systemCurrentTimeMillis() > deadline);
Slog.d(LOG_TAG, String.format("getPersonalAppsSuspendedReasons user: %d; result: %d",
mInjector.userHandleGetCallingUserId(), result));
Slog.d(LOG_TAG, "getPersonalAppsSuspendedReasons user: %d; result: %d",
mInjector.userHandleGetCallingUserId(), result);
return result;
}
}
@@ -16052,9 +16028,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
updateProfileOffDeadlineLocked(profileUserId, profileOwner, unlocked);
suspendedExplicitly = profileOwner.mSuspendPersonalApps;
suspendedByTimeout = deadlineState == PROFILE_OFF_DEADLINE_REACHED;
Slog.d(LOG_TAG, String.format(
"Personal apps suspended explicitly: %b, deadline state: %d",
suspendedExplicitly, deadlineState));
Slog.d(LOG_TAG, "Personal apps suspended explicitly: %b, deadline state: %d",
suspendedExplicitly, deadlineState);
final int notificationState =
unlocked ? PROFILE_OFF_DEADLINE_DEFAULT : deadlineState;
updateProfileOffDeadlineNotificationLocked(
@@ -16155,8 +16130,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
if (getUserData(userId).mAppsSuspended == suspended) {
return;
}
Slog.i(LOG_TAG, String.format("%s personal apps for user %d",
suspended ? "Suspending" : "Unsuspending", userId));
Slog.i(LOG_TAG, "%s personal apps for user %d", suspended ? "Suspending" : "Unsuspending",
userId);
if (suspended) {
suspendPersonalAppsInPackageManager(userId);
@@ -16376,8 +16351,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
Preconditions.checkArgument(!TextUtils.isEmpty(organizationId),
"Enterprise ID may not be empty.");
Log.i(LOG_TAG,
String.format("Setting Enterprise ID to %s for user %d", organizationId, userId));
Slog.i(LOG_TAG, "Setting Enterprise ID to %s for user %d", organizationId, userId);
final String ownerPackage;
synchronized (getLockObject()) {

2
services/devicepolicy/java/com/android/server/devicepolicy/RemoteBugreportManager.java
View File

@@ -207,7 +207,7 @@ public class RemoteBugreportManager {
return true;
} catch (RemoteException re) {
// should never happen
Slog.e(LOG_TAG, re, "Failed to make remote calls to start bugreportremote service");
Slog.e(LOG_TAG, "Failed to make remote calls to start bugreportremote service", re);
return false;
} finally {
mInjector.binderRestoreCallingIdentity(callingIdentity);