diff options
author | Julia Reynolds <juliacr@google.com> | 2015-05-13 20:14:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 20:14:44 +0000 |
commit | 396d944001f0b897b1689baa0bd7d3e04046b3ca (patch) | |
tree | 9af76b38f2c9c9a0c3032afb544f8aa379eec0fe /services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | |
parent | f5d758c006c278d166f22587f3deb9a63bdf4e4b (diff) | |
parent | 731051e36bb2d420a29cd889a38e02c88c930aad (diff) | |
download | frameworks_base-396d944001f0b897b1689baa0bd7d3e04046b3ca.zip frameworks_base-396d944001f0b897b1689baa0bd7d3e04046b3ca.tar.gz frameworks_base-396d944001f0b897b1689baa0bd7d3e04046b3ca.tar.bz2 |
Merge "Remove initiator name param." into mnc-dev
Diffstat (limited to 'services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java')
-rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ba5d666..675be0e 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -4122,8 +4122,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public boolean setDeviceInitializer(ComponentName who, ComponentName initializer, - String ownerName) { + public boolean setDeviceInitializer(ComponentName who, ComponentName initializer) { if (!mHasFeature) { return false; } @@ -4142,10 +4141,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (mDeviceOwner == null) { // Device owner state does not exist, create it. - mDeviceOwner = DeviceOwner.createWithDeviceInitializer(initializer, ownerName); + mDeviceOwner = DeviceOwner.createWithDeviceInitializer(initializer); } else { // Device owner already exists, update it. - mDeviceOwner.setDeviceInitializer(initializer, ownerName); + mDeviceOwner.setDeviceInitializer(initializer); } addDeviceInitializerToLockTaskPackagesLocked(UserHandle.USER_OWNER); |