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 am: 66a320d368

Browse Source 
am: ac197eff78

* commit 'ac197eff785359a8d3a9ead3a2d23d4ea06e72e4':
  Check for null on app restrictions managing app APIs
This commit is contained in:
Esteban Talavera
2016-02-10 16:52:38 +00:00
committed by android-build-merger
parent 0973d5b166 ac197eff78
commit 9fb25b169b
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

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