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

Commit 91580c08 authored by Samer Naoura's avatar Samer Naoura Committed by Yash
Browse files

Fix ANR in Process com.android.shell after BR is finished 

Linked to http://pa/2964369

Bug: 360800881
Fix: 360800881
Test: Watch: https://screenshot.googleplex.com/4hYd3RTfdUXU5mG https://screenshot.googleplex.com/6L4YkmCYey8sHL5, Phone: https://screenshot.googleplex.com/3GWMVACFivfukc7

Flag: EXEMPT minor bugfix

Change-Id: I99443f172cf43bde9c3637e91a3af51859eb6f35
parent f7ff135d

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

+21 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.accounts.AccountManager; 
import android.annotation.MainThread;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.app.ActivityThread;

import android.app.AlertDialog;

import android.app.Notification;

import android.app.Notification.Action;
@@ -117,7 +116,9 @@ import java.util.Enumeration; 
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.Executor;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.ThreadFactory;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicLong;
@@ -174,6 +175,18 @@ public class BugreportProgressService extends Service { 
    static final String EXTRA_EXTRA_ATTACHMENT_URI =

            "android.intent.extra.EXTRA_ATTACHMENT_URI";



    private static final ThreadFactory sBugreportManagerCallbackThreadFactory =

            new ThreadFactory() {

                private static final ThreadFactory mFactory = Executors.defaultThreadFactory();



                @Override

                public Thread newThread(Runnable r) {

                    Thread thread = mFactory.newThread(r);

                    thread.setName("BRMgrCallbackThread");

                    return thread;

                }

            };



    private static final int MSG_SERVICE_COMMAND = 1;

    private static final int MSG_DELAYED_SCREENSHOT = 2;

    private static final int MSG_SCREENSHOT_REQUEST = 3;
@@ -277,6 +290,7 @@ public class BugreportProgressService extends Service { 


    private boolean mIsWatch;

    private boolean mIsTv;

    private ExecutorService mBugreportSingleThreadExecutor;



    @Override

    public void onCreate() {
@@ -307,6 +321,8 @@ public class BugreportProgressService extends Service { 
                        isTv(this) ? NotificationManager.IMPORTANCE_DEFAULT

                                : NotificationManager.IMPORTANCE_LOW));

        mBugreportManager = mContext.getSystemService(BugreportManager.class);

        mBugreportSingleThreadExecutor = Executors.newSingleThreadExecutor(

                sBugreportManagerCallbackThreadFactory);

    }



    @Override
@@ -337,6 +353,7 @@ public class BugreportProgressService extends Service { 
    public void onDestroy() {

        mServiceHandler.getLooper().quit();

        mScreenshotHandler.getLooper().quit();

        mBugreportSingleThreadExecutor.close();

        super.onDestroy();

    }
@@ -713,8 +730,6 @@ public class BugreportProgressService extends Service { 
            }

        }



        final Executor executor = ActivityThread.currentActivityThread().getExecutor();



        Log.i(TAG, "bugreport type = " + bugreportType

                + " bugreport file fd: " + bugreportFd

                + " screenshot file fd: " + screenshotFd);
@@ -723,7 +738,8 @@ public class BugreportProgressService extends Service { 
        try {

            synchronized (mLock) {

                mBugreportManager.startBugreport(bugreportFd, screenshotFd,

                        new BugreportParams(bugreportType), executor, bugreportCallback);

                        new BugreportParams(bugreportType), mBugreportSingleThreadExecutor,

                        bugreportCallback);

                bugreportCallback.trackInfoWithIdLocked();

            }

        } catch (RuntimeException e) {