From 115cd65d2a3417b506563e6b2d60c269d69efaef Mon Sep 17 00:00:00 2001 From: Esteban Talavera Date: Thu, 21 Aug 2014 10:25:08 +0100 Subject: [PATCH] Remove setApplicationsHidden As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests. Bug: 17005622 Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4 --- api/current.txt | 1 - .../app/admin/DevicePolicyManager.java | 22 ---------- .../app/admin/IDevicePolicyManager.aidl | 1 - .../DevicePolicyManagerService.java | 40 ------------------- 4 files changed, 64 deletions(-) diff --git a/api/current.txt b/api/current.txt index 6f07cd4ff4f8d..a9ee558504f31 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5455,7 +5455,6 @@ package android.app.admin { method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean); method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean); method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle); - method public int setApplicationsHidden(android.content.ComponentName, android.content.Intent, boolean); method public void setBlockUninstall(android.content.ComponentName, java.lang.String, boolean); method public void setCameraDisabled(android.content.ComponentName, boolean); method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index bc4d2c1dbacd7..78b9529b28079 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2822,28 +2822,6 @@ public class DevicePolicyManager { return false; } - /** - * Called by profile or device owner to hide or unhide currently installed packages. This - * should only be called by a profile or device owner running within a managed profile. - * - * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param intent An intent matching the app(s) to be updated. All apps that resolve for this - * intent will be updated in the current profile. - * @param hidden {@code true} if the packages should be hidden, {@code false} if they should - * be unhidden. - * @return int The number of activities that matched the intent and were updated. - */ - public int setApplicationsHidden(ComponentName admin, Intent intent, boolean hidden) { - if (mService != null) { - try { - return mService.setApplicationsHidden(admin, intent, hidden); - } catch (RemoteException e) { - Log.w(TAG, "Failed talking with device policy service", e); - } - } - return 0; - } - /** * Called by device or profile owner to determine if a package is hidden. * diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 324b9635bef20..107be60b008b0 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -138,7 +138,6 @@ interface IDevicePolicyManager { void clearCrossProfileIntentFilters(in ComponentName admin); boolean setApplicationHidden(in ComponentName admin, in String packageName, boolean hidden); - int setApplicationsHidden(in ComponentName admin, in Intent intent, boolean hidden); boolean isApplicationHidden(in ComponentName admin, in String packageName); UserHandle createUser(in ComponentName who, in String name); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 21ba31e2fb0ff..b47a5e4d92258 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -4180,46 +4180,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - @Override - public int setApplicationsHidden(ComponentName who, Intent intent, boolean hidden) { - int callingUserId = UserHandle.getCallingUserId(); - synchronized (this) { - if (who == null) { - throw new NullPointerException("ComponentName is null"); - } - getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); - - long id = Binder.clearCallingIdentity(); - try { - IPackageManager pm = AppGlobals.getPackageManager(); - List activitiesToEnable = pm.queryIntentActivities(intent, - intent.resolveTypeIfNeeded(mContext.getContentResolver()), - PackageManager.GET_DISABLED_COMPONENTS - | PackageManager.GET_UNINSTALLED_PACKAGES, - callingUserId); - - if (DBG) Slog.d(LOG_TAG, "Enabling activities: " + activitiesToEnable); - int numberOfAppsUnhidden = 0; - if (activitiesToEnable != null) { - for (ResolveInfo info : activitiesToEnable) { - if (info.activityInfo != null) { - numberOfAppsUnhidden++; - pm.setApplicationHiddenSettingAsUser(info.activityInfo.packageName, - hidden, callingUserId); - } - } - } - return numberOfAppsUnhidden; - } catch (RemoteException re) { - // shouldn't happen - Slog.e(LOG_TAG, "Failed to setApplicationsHiddenSettingsWithIntent", re); - } finally { - restoreCallingIdentity(id); - } - return 0; - } - } - @Override public boolean isApplicationHidden(ComponentName who, String packageName) { int callingUserId = UserHandle.getCallingUserId();