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

Merge "Fix NPE in DevicePolicyManagerService"

Browse Source
This commit is contained in:
Jason Monk
2014-05-16 18:59:57 +00:00
committed by Android (Google) Code Review
parent e517ce4563 9fcff5aadd
commit 20f98b0561
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1214,18 +1214,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
mAppOpsService = IAppOpsService.Stub.asInterface(
ServiceManager.getService(Context.APP_OPS_SERVICE));
if (mDeviceOwner.hasDeviceOwner()) {
try {
mAppOpsService.setDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());
} catch (RemoteException e) {
Log.w(LOG_TAG, "Unable to notify AppOpsService of DeviceOwner", e);
if (mDeviceOwner != null) {
if (mDeviceOwner.hasDeviceOwner()) {
try {
mAppOpsService.setDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());
} catch (RemoteException e) {
Log.w(LOG_TAG, "Unable to notify AppOpsService of DeviceOwner", e);
}
}
}
for (Integer i : mDeviceOwner.getProfileOwnerKeys()) {
try {
mAppOpsService.setProfileOwner(mDeviceOwner.getProfileOwnerName(i), i);
} catch (RemoteException e) {
Log.w(LOG_TAG, "Unable to notify AppOpsService of ProfileOwner", e);
for (Integer i : mDeviceOwner.getProfileOwnerKeys()) {
try {
mAppOpsService.setProfileOwner(mDeviceOwner.getProfileOwnerName(i), i);
} catch (RemoteException e) {
Log.w(LOG_TAG, "Unable to notify AppOpsService of ProfileOwner", e);
}
}
}
}