summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-05-11 15:52:08 -0400
committerJulia Reynolds <juliacr@google.com>2015-05-11 16:41:20 -0400
commit731051e36bb2d420a29cd889a38e02c88c930aad (patch)
tree543dbfdb3fffa537c9c7219c9bc4b4e8077dd16d /services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
parentfaf55219877416c1bdfbdfe5b7d24e35e9971a03 (diff)
downloadframeworks_base-731051e36bb2d420a29cd889a38e02c88c930aad.zip
frameworks_base-731051e36bb2d420a29cd889a38e02c88c930aad.tar.gz
frameworks_base-731051e36bb2d420a29cd889a38e02c88c930aad.tar.bz2
Remove initiator name param.
This won't be shown in the UI; it's not needed. Bug: 20820224 Change-Id: I51ecd0a9151a49e26faf52e792a0b316a8facc8e
Diffstat (limited to 'services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java')
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java7
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 67c198f..a64f54a 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -4121,8 +4121,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;
}
@@ -4141,10 +4140,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);