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

Commit 09f0e2c1 authored Aug 28, 2014 by Esteban Talavera Committed by Android Git Automerger Aug 28, 2014

am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked

* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked

parents 98a1942f 20b41f85

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5456,7 +5456,6 @@ package android.app.admin {
	method public boolean getScreenCaptureDisabled(android.content.ComponentName);		method public boolean getScreenCaptureDisabled(android.content.ComponentName);
	method public boolean getStorageEncryption(android.content.ComponentName);		method public boolean getStorageEncryption(android.content.ComponentName);
	method public int getStorageEncryptionStatus();		method public int getStorageEncryptionStatus();
	method public boolean getUninstallBlocked(android.content.ComponentName, java.lang.String);
	method public boolean hasCaCertInstalled(byte[]);		method public boolean hasCaCertInstalled(byte[]);
	method public boolean hasGrantedPolicy(android.content.ComponentName, int);		method public boolean hasGrantedPolicy(android.content.ComponentName, int);
	method public boolean installCaCert(android.content.ComponentName, byte[]);		method public boolean installCaCert(android.content.ComponentName, byte[]);
	@@ -5468,6 +5467,7 @@ package android.app.admin {
	method public boolean isLockTaskPermitted(java.lang.String);		method public boolean isLockTaskPermitted(java.lang.String);
	method public boolean isMasterVolumeMuted(android.content.ComponentName);		method public boolean isMasterVolumeMuted(android.content.ComponentName);
	method public boolean isProfileOwnerApp(java.lang.String);		method public boolean isProfileOwnerApp(java.lang.String);
			method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String);
	method public void lockNow();		method public void lockNow();
	method public void registerPrivateKeyAccessListener(android.content.ComponentName, android.content.ComponentName);		method public void registerPrivateKeyAccessListener(android.content.ComponentName, android.content.ComponentName);
	method public void removeActiveAdmin(android.content.ComponentName);		method public void removeActiveAdmin(android.content.ComponentName);

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3376,10 +3376,10 @@ public class DevicePolicyManager {
	* @param packageName package to check.		* @param packageName package to check.
	* @return true if the user shouldn't be able to uninstall the package.		* @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) {		if (mService != null) {
	try {		try {
	return mService.getUninstallBlocked(admin, packageName);		return mService.isUninstallBlocked(admin, packageName);
	} catch (RemoteException re) {		} catch (RemoteException re) {
	Log.w(TAG, "Failed to call block uninstall on device policy service");		Log.w(TAG, "Failed to call block uninstall on device policy service");
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -181,7 +181,7 @@ interface IDevicePolicyManager {
	void notifyLockTaskModeChanged(boolean isEnabled, String pkg, int userId);		void notifyLockTaskModeChanged(boolean isEnabled, String pkg, int userId);

	void setUninstallBlocked(in ComponentName admin, in String packageName, boolean uninstallBlocked);		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);		void setCrossProfileCallerIdDisabled(in ComponentName who, boolean disabled);
	boolean getCrossProfileCallerIdDisabled(in ComponentName who);		boolean getCrossProfileCallerIdDisabled(in ComponentName who);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5024,7 +5024,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
	}		}

	@Override		@Override
	public boolean getUninstallBlocked(ComponentName who, String packageName) {		public boolean isUninstallBlocked(ComponentName who, String packageName) {
	final int userId = UserHandle.getCallingUserId();		final int userId = UserHandle.getCallingUserId();

	synchronized (this) {		synchronized (this) {