diff options
author | Svetoslav <svetoslavganov@google.com> | 2014-08-08 12:48:06 -0700 |
---|---|---|
committer | Svetoslav Ganov <svetoslavganov@google.com> | 2014-08-08 20:35:59 +0000 |
commit | 8e1d299da27da534b508b1da51ebe351a689cefa (patch) | |
tree | 9e83a2646024f422190d0e9ddfee54aa913b9f66 /services/appwidget/java | |
parent | 5c8ea2c369deab75719fe7c7301846a8ef955702 (diff) | |
download | frameworks_base-8e1d299da27da534b508b1da51ebe351a689cefa.zip frameworks_base-8e1d299da27da534b508b1da51ebe351a689cefa.tar.gz frameworks_base-8e1d299da27da534b508b1da51ebe351a689cefa.tar.bz2 |
Polish the new cross-profile app widget APIs
bug:14991269
Change-Id: I5996f8c69a3d151ff1ecd8f19403dd606f588150
Diffstat (limited to 'services/appwidget/java')
-rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 136 |
1 files changed, 23 insertions, 113 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 4315e0d..609ffda 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -121,8 +121,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku private static final int LOADED_PROFILE_ID = -1; - private static final int DISABLED_PROFILE = -1; - private static final int UNKNOWN_USER_ID = -10; // Bump if the stored widgets need to be upgraded. @@ -660,7 +658,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } @Override - public IntentSender createAppWidgetConfigIntentSender(String callingPackage, Intent intent) { + public IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId, + int intentFlags) { final int userId = UserHandle.getCallingUserId(); if (DEBUG) { @@ -670,57 +669,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku // Make sure the package runs under the caller uid. mSecurityPolicy.enforceCallFromPackage(callingPackage); - // The only allowed action is the one to start the configure activity. - if (!AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(intent.getAction())) { - throw new IllegalArgumentException("Only allowed action is " - + AppWidgetManager.ACTION_APPWIDGET_CONFIGURE); - } - - // Verify that widget id is provided. - final int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, - AppWidgetManager.INVALID_APPWIDGET_ID); - if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) { - throw new IllegalArgumentException("Widget id required"); - } - - // Make sure a component name is provided. - ComponentName component = intent.getComponent(); - if (component == null) { - throw new IllegalArgumentException("Component name required"); - } - - // Verify the user handle. - UserHandle userHandle = intent.getParcelableExtra( - AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE); - if (userHandle != null) { - // Remove the profile extra as the receiver already runs under this - // user and this information is of no use to this receiver. - intent.removeExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE); - - // If the user handle is not the caller, check if it is an enabled - // profile for which the package is white-listed. - final int profileId = userHandle.getIdentifier(); - if (profileId != userId) { - // Make sure the passed user handle is a profile in the group. - final int[] profileIds = mSecurityPolicy.resolveCallerEnabledGroupProfiles( - new int[]{profileId}); - if (profileIds.length <= 0) { - // The profile is not in the group or not enabled, done. - return null; - } - - // Make sure the provider is white-listed. - if (!mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed( - component.getPackageName(), profileId)) { - throw new IllegalArgumentException("Cannot access provider " - + component + " in user " + profileIds); - } - } - } else { - // If a profile is not specified use the caller user id. - userHandle = new UserHandle(userId); - } - synchronized (mLock) { ensureGroupStateLoadedLocked(userId); @@ -738,19 +686,18 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku throw new IllegalArgumentException("Widget not bound " + appWidgetId); } - // Make sure the component refers to the provider config activity. - if (!component.equals(provider.info.configure) - || !provider.info.getProfile().equals(userHandle)) { - throw new IllegalArgumentException("No component" + component - + " for user " + userHandle.getIdentifier()); - } + Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE); + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); + intent.setComponent(provider.info.configure); + intent.setFlags(intentFlags); // All right, create the sender. final long identity = Binder.clearCallingIdentity(); try { return PendingIntent.getActivityAsUser( mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT - | PendingIntent.FLAG_CANCEL_CURRENT, null, userHandle) + | PendingIntent.FLAG_CANCEL_CURRENT, null, + new UserHandle(provider.getUserId())) .getIntentSender(); } finally { Binder.restoreCallingIdentity(identity); @@ -771,9 +718,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku mSecurityPolicy.enforceCallFromPackage(callingPackage); // Check that if a cross-profile binding is attempted, it is allowed. - final int[] profileIds = mSecurityPolicy.resolveCallerEnabledGroupProfiles( - new int[] {providerProfileId}); - if (profileIds.length <= 0) { + if (!mSecurityPolicy.isEnabledGroupProfile(providerProfileId)) { return false; } @@ -1309,28 +1254,23 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } @Override - public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter, int[] profileIds) { + public List<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter, + int profileId) { final int userId = UserHandle.getCallingUserId(); if (DEBUG) { Slog.i(TAG, "getInstalledProvidersForProfiles() " + userId); } - if (profileIds != null && profileIds.length > 0) { - // Make sure the profile ids are children of the calling user. - profileIds = mSecurityPolicy.resolveCallerEnabledGroupProfiles(profileIds); - } else { - profileIds = new int[] {userId}; - } - - if (profileIds.length == 0) { + // Ensure the profile is in the group and enabled. + if (!mSecurityPolicy.isEnabledGroupProfile(profileId)) { return null; } synchronized (mLock) { ensureGroupStateLoadedLocked(userId); - ArrayList<AppWidgetProviderInfo> result = new ArrayList<>(); + ArrayList<AppWidgetProviderInfo> result = null; final int providerCount = mProviders.size(); for (int i = 0; i < providerCount; i++) { @@ -1342,19 +1282,15 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku continue; } - // Add providers only for the requested profiles ... + // Add providers only for the requested profile that are white-listed. final int providerProfileId = info.getProfile().getIdentifier(); - final int profileCount = profileIds.length; - for (int j = 0; j < profileCount; j++) { - final int profileId = profileIds[j]; - if (providerProfileId == profileId) { - // ... that are white-listed by the profile manager. - if (mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed( - provider.id.componentName.getPackageName(), providerProfileId)) { - result.add(cloneIfLocalBinder(info)); - } - break; + if (providerProfileId == profileId + && mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed( + provider.id.componentName.getPackageName(), providerProfileId)) { + if (result == null) { + result = new ArrayList<>(); } + result.add(cloneIfLocalBinder(info)); } } @@ -2967,35 +2903,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku private final class SecurityPolicy { - public int[] resolveCallerEnabledGroupProfiles(int[] profileIds) { + public boolean isEnabledGroupProfile(int profileId) { final int parentId = UserHandle.getCallingUserId(); - - int enabledProfileCount = 0; - final int profileCount = profileIds.length; - for (int i = 0; i < profileCount; i++) { - final int profileId = profileIds[i]; - if (!isParentOrProfile(parentId, profileId)) { - throw new SecurityException("Not the current user or" - + " a child profile: " + profileId); - } - if (!isProfileEnabled(profileId)) { - profileIds[i] = DISABLED_PROFILE; - } else { - enabledProfileCount++; - } - } - - int resolvedProfileIndex = 0; - final int[] resolvedProfiles = new int[enabledProfileCount]; - for (int i = 0; i < profileCount; i++) { - final int profileId = profileIds[i]; - if (profileId != DISABLED_PROFILE) { - resolvedProfiles[resolvedProfileIndex] = profileId; - resolvedProfileIndex++; - } - } - - return resolvedProfiles; + return isParentOrProfile(parentId, profileId) && isProfileEnabled(profileId); } public int[] getEnabledGroupProfileIds(int userId) { |