From 729b2a6c2f330c10674bb3fc0c4f2eb57e3d0a43 Mon Sep 17 00:00:00 2001 From: Esteban Talavera Date: Wed, 27 Aug 2014 18:01:58 +0100 Subject: Renamed getUninstallBlocked to isUninstallBlocked As per API review. Bug: 17297103 Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b --- api/current.txt | 2 +- core/java/android/app/admin/DevicePolicyManager.java | 4 ++-- core/java/android/app/admin/IDevicePolicyManager.aidl | 2 +- .../com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index 2c7a484a74cb..6fbb5ce2ab55 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5453,7 +5453,6 @@ package android.app.admin { method public boolean getScreenCaptureDisabled(android.content.ComponentName); method public boolean getStorageEncryption(android.content.ComponentName); method public int getStorageEncryptionStatus(); - method public boolean getUninstallBlocked(android.content.ComponentName, java.lang.String); method public boolean hasCaCertInstalled(byte[]); method public boolean hasGrantedPolicy(android.content.ComponentName, int); method public boolean installCaCert(android.content.ComponentName, byte[]); @@ -5464,6 +5463,7 @@ package android.app.admin { method public boolean isLockTaskPermitted(java.lang.String); method public boolean isMasterVolumeMuted(android.content.ComponentName); method public boolean isProfileOwnerApp(java.lang.String); + method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String); method public void lockNow(); method public void removeActiveAdmin(android.content.ComponentName); method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 3f8215740792..3f3da7df2764 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3327,10 +3327,10 @@ public class DevicePolicyManager { * @param packageName package to check. * @return true if the user shouldn't be able to uninstall the package. */ - public boolean getUninstallBlocked(ComponentName admin, String packageName) { + public boolean isUninstallBlocked(ComponentName admin, String packageName) { if (mService != null) { try { - return mService.getUninstallBlocked(admin, packageName); + return mService.isUninstallBlocked(admin, packageName); } catch (RemoteException re) { Log.w(TAG, "Failed to call block uninstall on device policy service"); } diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 23f36fb31e5d..c984cf9e908c 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -174,7 +174,7 @@ interface IDevicePolicyManager { void notifyLockTaskModeChanged(boolean isEnabled, String pkg, int userId); void setUninstallBlocked(in ComponentName admin, in String packageName, boolean uninstallBlocked); - boolean getUninstallBlocked(in ComponentName admin, in String packageName); + boolean isUninstallBlocked(in ComponentName admin, in String packageName); void setCrossProfileCallerIdDisabled(in ComponentName who, boolean disabled); boolean getCrossProfileCallerIdDisabled(in ComponentName who); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 3bc226a59df9..ffadcf20d6b1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -4890,7 +4890,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public boolean getUninstallBlocked(ComponentName who, String packageName) { + public boolean isUninstallBlocked(ComponentName who, String packageName) { final int userId = UserHandle.getCallingUserId(); synchronized (this) { -- cgit v1.2.3-59-g8ed1b