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

Commit 09087a83 authored by Nandana Dutt's avatar Nandana Dutt Committed by android-build-merger
Browse files

Merge "Synchronize access to sNotificationBundle." 

am: 729ae07a

Change-Id: I07b54a6252348d998ea0b695f3817059c63e0364
parents 7ebecf2a 729ae07a

packages/Shell/src/com/android/shell/BugreportProgressService.java

+8 −4
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import java.util.zip.ZipOutputStream; 


import libcore.io.Streams;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.ChooserActivity;

import com.android.internal.logging.MetricsLogger;
@@ -232,6 +233,7 @@ public class BugreportProgressService extends Service { 
     */

    private boolean mTakingScreenshot;



    @GuardedBy("sNotificationBundle")

    private static final Bundle sNotificationBundle = new Bundle();



    private boolean mIsWatch;
@@ -1053,11 +1055,13 @@ public class BugreportProgressService extends Service { 
    }



    private static Notification.Builder newBaseNotification(Context context) {

        synchronized (sNotificationBundle) {

            if (sNotificationBundle.isEmpty()) {

                // Rename notifcations from "Shell" to "Android System"

                sNotificationBundle.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,

                        context.getString(com.android.internal.R.string.android_system_label));

            }

        }

        return new Notification.Builder(context, NOTIFICATION_CHANNEL_ID)

                .addExtras(sNotificationBundle)

                .setSmallIcon(