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

Commit ee72fa19 authored by Felipe Leme's avatar Felipe Leme
Browse files

Synchronize access to sNotificationBundle. 

Otherwise Shell can crash due to ConcurrentModificationException

Test: atest BugreportReceiverTest
Test: manual verification

Fixes:116280360

Change-Id: I138acd43b313d2a7a9d945fb44a9d63e1ad798eb
parent a60b0e2a

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

+8 −4
Original line number Diff line number Diff line
@@ -44,6 +44,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;
@@ -234,6 +235,7 @@ public class BugreportProgressService extends Service { 
     */

    private boolean mTakingScreenshot;



    @GuardedBy("sNotificationBundle")

    private static final Bundle sNotificationBundle = new Bundle();



    private boolean mIsWatch;
@@ -1059,11 +1061,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(