diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-04-23 15:30:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 15:30:43 +0000 |
| commit | d24cc19343073294b3376f825bdc0d54a8d692f1 (patch) | |
| tree | fa59453d9fe7d70de4bbfa7e7c0eef0360da88c9 /services/appwidget/java | |
| parent | d80f4fc80a132b40ace7ba2b51eb784d73443004 (diff) | |
| parent | db672b6cde256e27c1188c7e99f23e5a65252ba4 (diff) | |
| download | frameworks_base-d24cc19343073294b3376f825bdc0d54a8d692f1.zip frameworks_base-d24cc19343073294b3376f825bdc0d54a8d692f1.tar.gz frameworks_base-d24cc19343073294b3376f825bdc0d54a8d692f1.tar.bz2 | |
am db672b6c: am 00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit 'db672b6cde256e27c1188c7e99f23e5a65252ba4':
DO NOT MERGE Don't take flags when creating app widget config activity.
Diffstat (limited to 'services/appwidget/java')
| -rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 7623514..1545557 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -673,8 +673,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } @Override - public IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId, - int intentFlags) { + public IntentSender createAppWidgetConfigIntentSender(String callingPackage, int appWidgetId) { final int userId = UserHandle.getCallingUserId(); if (DEBUG) { @@ -704,7 +703,6 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 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(); |