Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b3f123b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15151696, 15151717, 15151893, 15151895, 15151897,... 

Merge cherrypicks of [15151696, 15151717, 15151893, 15151895, 15151897, 15151898, 15150909, 15151854, 15151855, 15151385, 15151702, 15151705, 15151707] into security-aosp-pi-release

Change-Id: I2f5b641adf729ac9cad118161ba3caea4d7b1e60
parents 73859d05 df99c442

src/com/android/launcher3/model/FirstScreenBroadcast.java

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
 */

package com.android.launcher3.model;



import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.app.PendingIntent.FLAG_ONE_SHOT;



import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;
@@ -140,7 +143,7 @@ public class FirstScreenBroadcast { 
                .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))

                .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))

                .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,

                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));

                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));

    }



    private static String getPackageName(ItemInfo info) {