From bf0652eeea280bb1d687fe2fc3e869e0f6e9a541 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Mon, 1 Jun 2015 12:55:35 -0700
Subject: DO NOT MERGE Don't take flags when creating app widget config
 activity.

bug:19618745

Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
---
 core/java/android/appwidget/AppWidgetHost.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/java/android/appwidget/AppWidgetHost.java')

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();
             }
-- 
cgit v1.1