diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-04-23 22:19:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 22:19:04 +0000 |
| commit | 2fd6dda03ef8b63b33bd36f7cfcf1f6ee365d571 (patch) | |
| tree | e7a6a6dd785459505f035c35a832cd5b68f731b4 /core/java | |
| parent | 5dafb34bca889abb8776a320b1ed9544cff9f9b3 (diff) | |
| parent | f33489c6bda49cf930cb06601625ddf792d41fe7 (diff) | |
am f33489c6: am d24cc193: am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'f33489c6bda49cf930cb06601625ddf792d41fe7':
DO NOT MERGE Don't take flags when creating app widget config activity.
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 8e86824761e2..7eb4b2f2a364 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( - mContextOpPackageName, appWidgetId, intentFlags); + mContextOpPackageName, 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 008d38b4893a..faac3926dbd1 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 |