Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 729b2a6c authored by Esteban Talavera's avatar Esteban Talavera
Browse files

Renamed getUninstallBlocked to isUninstallBlocked 

As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
parent 11cfe2c0

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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");

            }

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {