diff options
author | Craig Lafayette <craiglafa@google.com> | 2015-06-11 17:45:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 17:45:03 +0000 |
commit | 77b2d49abb38fafb91fb99ce603a92f189553cd7 (patch) | |
tree | 9ab9113e7816b4200edcef860cb74e805a669d4b /services/devicepolicy | |
parent | 96d7058aaaf58a0c6a2bfb296c5950b2e7e37d37 (diff) | |
parent | 240e64828f68064b2a1074a1dda1fc41fe19d711 (diff) | |
download | frameworks_base-77b2d49abb38fafb91fb99ce603a92f189553cd7.zip frameworks_base-77b2d49abb38fafb91fb99ce603a92f189553cd7.tar.gz frameworks_base-77b2d49abb38fafb91fb99ce603a92f189553cd7.tar.bz2 |
Merge "Remove device initializer status messages" into mnc-dev
Diffstat (limited to 'services/devicepolicy')
-rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ab1206b..2753700 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5975,40 +5975,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public void sendDeviceInitializerStatus(int statusCode, String description) { - synchronized (this) { - String packageName = getDeviceInitializer(); - if (packageName == null) { - throw new SecurityException("No device initializers"); - } - UserHandle callingUser = Binder.getCallingUserHandle(); - int deviceInitializerUid = -1; - try { - deviceInitializerUid = mContext.getPackageManager().getPackageUid( - packageName, callingUser.getIdentifier()); - } catch (NameNotFoundException e) { - throw new SecurityException(e); - } - if (Binder.getCallingUid() != deviceInitializerUid) { - throw new SecurityException("Caller must be a device initializer"); - } - long id = Binder.clearCallingIdentity(); - try { - Intent intent = new Intent( - DevicePolicyManager.ACTION_SEND_DEVICE_INITIALIZER_STATUS); - intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_INITIALIZER_STATUS_CODE, - statusCode); - intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_INITIALIZER_STATUS_DESCRIPTION, - description); - mContext.sendBroadcastAsUser(intent, callingUser, - android.Manifest.permission.RECEIVE_DEVICE_INITIALIZER_STATUS); - } finally { - restoreCallingIdentity(id); - } - } - } - - @Override public boolean setKeyguardDisabled(ComponentName who, boolean disabled) { Preconditions.checkNotNull(who, "ComponentName is null"); synchronized (this) { |