diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-06-01 12:55:35 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-06-01 12:55:38 -0700 |
| commit | bf0652eeea280bb1d687fe2fc3e869e0f6e9a541 (patch) | |
| tree | ba00ec4594747bb65da1e248228de42f1606864d /core/java | |
| parent | c7a558fe73631e438061c31a54861594f0eb024f (diff) | |
| download | frameworks_base-bf0652eeea280bb1d687fe2fc3e869e0f6e9a541.zip frameworks_base-bf0652eeea280bb1d687fe2fc3e869e0f6e9a541.tar.gz frameworks_base-bf0652eeea280bb1d687fe2fc3e869e0f6e9a541.tar.bz2 | |
DO NOT MERGE Don't take flags when creating app widget config activity.
bug:19618745
Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/appwidget/AppWidgetHost.java | 6 | ||||
| -rw-r--r-- | core/java/com/android/internal/appwidget/IAppWidgetService.aidl | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/appwidget/AppWidgetHost.java b/core/java/android/appwidget/AppWidgetHost.java index 24c6793..b2ae488 100644 --- a/core/java/android/appwidget/AppWidgetHost.java +++ b/core/java/android/appwidget/AppWidgetHost.java @@ -221,10 +221,10 @@ public class AppWidgetHost { int appWidgetId, int intentFlags, int requestCode, @Nullable Bundle options) { try { IntentSender intentSender = sService.createAppWidgetConfigIntentSender( - mContext.getOpPackageName(), appWidgetId, intentFlags); + mContext.getOpPackageName(), appWidgetId); if (intentSender != null) { - activity.startIntentSenderForResult(intentSender, requestCode, null, 0, 0, 0, - options); + activity.startIntentSenderForResult(intentSender, requestCode, null, 0, + intentFlags, intentFlags, options); } else { throw new ActivityNotFoundException(); } diff --git a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl index 008d38b..faac392 100644 --- a/core/java/com/android/internal/appwidget/IAppWidgetService.aidl +++ b/core/java/com/android/internal/appwidget/IAppWidgetService.aidl @@ -41,8 +41,7 @@ interface IAppWidgetService { void deleteAllHosts(); RemoteViews getAppWidgetViews(String callingPackage, int appWidgetId); int[] getAppWidgetIdsForHost(String callingPackage, int hostId); - IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId, - int intentFlags); + IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId); // // for AppWidgetManager |