Merge "getDeviceOwnerDeletedPackageMsg() should call clearCallingIdentity()"

This commit is contained in:
Chun-Wei Wang
2022-09-19 01:44:20 +00:00
committed by Android (Google) Code Review

View File

@@ -1344,9 +1344,14 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
}
private String getDeviceOwnerDeletedPackageMsg() {
DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
return dpm.getResources().getString(PACKAGE_DELETED_BY_DO,
() -> mContext.getString(R.string.package_deleted_device_owner));
final long ident = Binder.clearCallingIdentity();
try {
DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
return dpm.getResources().getString(PACKAGE_DELETED_BY_DO,
() -> mContext.getString(R.string.package_deleted_device_owner));
} finally {
Binder.restoreCallingIdentity(ident);
}
}
@Override