diff options
author | Adam Powell <adamp@google.com> | 2012-09-30 18:27:31 -0700 |
---|---|---|
committer | Adam Powell <adamp@google.com> | 2012-09-30 18:30:42 -0700 |
commit | d56b4d1db34bd6928f599e7e9a7321c2a81cb995 (patch) | |
tree | 187f721ddb224b3a01178c62ca8cab943a46007f | |
parent | 2032a12036cf684f8ac6c24406685a7f97d52649 (diff) | |
download | frameworks_base-d56b4d1db34bd6928f599e7e9a7321c2a81cb995.zip frameworks_base-d56b4d1db34bd6928f599e7e9a7321c2a81cb995.tar.gz frameworks_base-d56b4d1db34bd6928f599e7e9a7321c2a81cb995.tar.bz2 |
Construct a task stack for picking a wifi network from notification
Bug 7001327
Change-Id: I5a79e6933cd33386cd0aa4df626f15902deedd67
-rw-r--r-- | core/java/android/app/PendingIntent.java | 25 | ||||
-rw-r--r-- | core/java/android/app/TaskStackBuilder.java | 14 | ||||
-rw-r--r-- | services/java/com/android/server/WifiService.java | 8 |
3 files changed, 44 insertions, 3 deletions
diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index 9d57467..d36d99d 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -395,6 +395,31 @@ public final class PendingIntent implements Parcelable { } /** + * @hide + * Note that UserHandle.CURRENT will be interpreted at the time the + * activity is started, not when the pending intent is created. + */ + public static PendingIntent getActivitiesAsUser(Context context, int requestCode, + Intent[] intents, int flags, Bundle options, UserHandle user) { + String packageName = context.getPackageName(); + String[] resolvedTypes = new String[intents.length]; + for (int i=0; i<intents.length; i++) { + intents[i].setAllowFds(false); + resolvedTypes[i] = intents[i].resolveTypeIfNeeded(context.getContentResolver()); + } + try { + IIntentSender target = + ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.INTENT_SENDER_ACTIVITY, packageName, + null, null, requestCode, intents, resolvedTypes, + flags, options, user.getIdentifier()); + return target != null ? new PendingIntent(target) : null; + } catch (RemoteException e) { + } + return null; + } + + /** * Retrieve a PendingIntent that will perform a broadcast, like calling * {@link Context#sendBroadcast(Intent) Context.sendBroadcast()}. * diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java index 9d5bcc6..3e0ac7e 100644 --- a/core/java/android/app/TaskStackBuilder.java +++ b/core/java/android/app/TaskStackBuilder.java @@ -274,6 +274,20 @@ public class TaskStackBuilder { } /** + * @hide + */ + public PendingIntent getPendingIntent(int requestCode, int flags, Bundle options, + UserHandle user) { + if (mIntents.isEmpty()) { + throw new IllegalStateException( + "No intents added to TaskStackBuilder; cannot getPendingIntent"); + } + + return PendingIntent.getActivitiesAsUser(mSourceContext, requestCode, getIntents(), flags, + options, user); + } + + /** * Return an array containing the intents added to this builder. The intent at the * root of the task stack will appear as the first item in the array and the * intent at the top of the stack will appear as the last item. diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index adb63f9..98794c9 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -21,6 +21,7 @@ import android.app.AlarmManager; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; +import android.app.TaskStackBuilder; import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -1766,9 +1767,10 @@ public class WifiService extends IWifiManager.Stub { mNotification.when = 0; mNotification.icon = ICON_NETWORKS_AVAILABLE; mNotification.flags = Notification.FLAG_AUTO_CANCEL; - mNotification.contentIntent = PendingIntent.getActivityAsUser(mContext, 0, - new Intent(WifiManager.ACTION_PICK_WIFI_NETWORK), 0, - null, UserHandle.CURRENT); + mNotification.contentIntent = TaskStackBuilder.create(mContext) + .addNextIntentWithParentStack( + new Intent(WifiManager.ACTION_PICK_WIFI_NETWORK)) + .getPendingIntent(0, 0, null, UserHandle.CURRENT); } CharSequence title = mContext.getResources().getQuantityText( |