Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d90fadcc: am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev

Browse Source 
* commit 'd90fadcc0bbbe729b03b913ee96c6e43c1d9c662':
  AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
This commit is contained in:
Hyunyoung Song
2015-06-18 06:19:15 +00:00
committed by Android Git Automerger
parent caba82c269 d90fadcc0b
commit 02cf3fc008
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/appwidget/AppWidgetManager.java
View File

@@ -20,6 +20,7 @@ import android.annotation.Nullable;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ParceledListSlice;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.Process; import android.os.Process;
@@ -753,16 +754,16 @@ public class AppWidgetManager {
} }
try { try {
List<AppWidgetProviderInfo> providers = mService.getInstalledProvidersForProfile( ParceledListSlice<AppWidgetProviderInfo> providers = mService.getInstalledProvidersForProfile(
categoryFilter, profile.getIdentifier()); categoryFilter, profile.getIdentifier());
if (providers == null) { if (providers == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
for (AppWidgetProviderInfo info : providers) { for (AppWidgetProviderInfo info : providers.getList()) {
// Converting complex to dp. // Converting complex to dp.
convertSizesToPixels(info); convertSizesToPixels(info);
} }
return providers; return providers.getList();
} }
catch (RemoteException e) { catch (RemoteException e) {
throw new RuntimeException("system server dead?", e); throw new RuntimeException("system server dead?", e);

3
core/java/com/android/internal/appwidget/IAppWidgetService.aidl
View File

@@ -20,6 +20,7 @@ import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.IntentSender; import android.content.IntentSender;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.ParceledListSlice;
import android.appwidget.AppWidgetProviderInfo; import android.appwidget.AppWidgetProviderInfo;
import com.android.internal.appwidget.IAppWidgetHost; import com.android.internal.appwidget.IAppWidgetHost;
import android.os.Bundle; import android.os.Bundle;
@@ -54,7 +55,7 @@ interface IAppWidgetService {
in RemoteViews views); in RemoteViews views);
void updateAppWidgetProvider(in ComponentName provider, in RemoteViews views); void updateAppWidgetProvider(in ComponentName provider, in RemoteViews views);
void notifyAppWidgetViewDataChanged(String packageName, in int[] appWidgetIds, int viewId); void notifyAppWidgetViewDataChanged(String packageName, in int[] appWidgetIds, int viewId);
List<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter, ParceledListSlice getInstalledProvidersForProfile(int categoryFilter,
int profileId); int profileId);
AppWidgetProviderInfo getAppWidgetInfo(String callingPackage, int appWidgetId); AppWidgetProviderInfo getAppWidgetInfo(String callingPackage, int appWidgetId);
boolean hasBindAppWidgetPermission(in String packageName, int userId); boolean hasBindAppWidgetPermission(in String packageName, int userId);

5
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -37,6 +37,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
@@ -1281,7 +1282,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
} }
@Override @Override
public List<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter, public ParceledListSlice<AppWidgetProviderInfo> getInstalledProvidersForProfile(int categoryFilter,
int profileId) { int profileId) {
final int userId = UserHandle.getCallingUserId(); final int userId = UserHandle.getCallingUserId();
@@ -1321,7 +1322,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
} }
} }
return result; return new ParceledListSlice<AppWidgetProviderInfo>(result);
} }
} }