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

Commit 05e3ca27 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15151697, 15151718, 15151899, 15151900, 15151901,... 

Merge cherrypicks of [15151697, 15151718, 15151899, 15151900, 15151901, 15151902, 15151904, 15151906, 15151930, 15151932, 15151933, 15151856, 15151858, 15151388, 15151971, 15151972, 15151973] into security-aosp-qt-release

Change-Id: Ide266064e6737c9f9ff690bfca66a550dea2b77d
parents c87bbeea 8d0d38b6

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) {