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

Merge "Check for null on app restrictions managing app APIs" into nyc-dev

Browse Source 
am: 66a320d368

* commit '66a320d368e93a03d5aee33eac85807a227c0a3c':
  Check for null on app restrictions managing app APIs
This commit is contained in:
Esteban Talavera
2016-02-10 16:47:09 +00:00
committed by android-build-merger
parent c21e6894e0 66a320d368
commit ac197eff78
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6104,6 +6104,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
@Override @Override
public void setApplicationRestrictionsManagingPackage(ComponentName admin, String packageName) { public void setApplicationRestrictionsManagingPackage(ComponentName admin, String packageName) {
Preconditions.checkNotNull(admin, "ComponentName is null");
final int userHandle = mInjector.userHandleGetCallingUserId(); final int userHandle = mInjector.userHandleGetCallingUserId();
synchronized (this) { synchronized (this) {
getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
@@ -6119,6 +6121,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
@Override @Override
public String getApplicationRestrictionsManagingPackage(ComponentName admin) { public String getApplicationRestrictionsManagingPackage(ComponentName admin) {
Preconditions.checkNotNull(admin, "ComponentName is null");
final int userHandle = mInjector.userHandleGetCallingUserId(); final int userHandle = mInjector.userHandleGetCallingUserId();
synchronized (this) { synchronized (this) {
getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);