Merge "Working around bugreport crash issues" into oc-dev (44cb1486) · Commits · e / os / android_frameworks_base

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

+24 −9

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,7 @@ import com.google.android.collect.Lists;

	import android.accounts.Account;		import android.accounts.Account;
	import android.accounts.AccountManager;		import android.accounts.AccountManager;
			import android.annotation.MainThread;
	import android.annotation.SuppressLint;		import android.annotation.SuppressLint;
	import android.app.AlertDialog;		import android.app.AlertDialog;
	import android.app.Notification;		import android.app.Notification;
	@@ -126,6 +127,8 @@ import android.widget.Toast;
	* <li>Stops itself if it doesn't have any process left to monitor.		* <li>Stops itself if it doesn't have any process left to monitor.
	* </ol>		* </ol>
	* </ol>		* </ol>
			*
			* TODO: There are multiple threads involved. Add synchronization accordingly.
	*/		*/
	public class BugreportProgressService extends Service {		public class BugreportProgressService extends Service {
	private static final String TAG = "BugreportProgressService";		private static final String TAG = "BugreportProgressService";
	@@ -201,11 +204,15 @@ public class BugreportProgressService extends Service {

	private static final String NOTIFICATION_CHANNEL_ID = "bugreports";		private static final String NOTIFICATION_CHANNEL_ID = "bugreports";

			private final Object mLock = new Object();

	/** Managed dumpstate processes (keyed by id) */		/** Managed dumpstate processes (keyed by id) */
	private final SparseArray<DumpstateListener> mProcesses = new SparseArray<>();		private final SparseArray<DumpstateListener> mProcesses = new SparseArray<>();

	private Context mContext;		private Context mContext;
	private ServiceHandler mMainHandler;
			private Handler mMainThreadHandler;
			private ServiceHandler mServiceHandler;
	private ScreenshotHandler mScreenshotHandler;		private ScreenshotHandler mScreenshotHandler;

	private final BugreportInfoDialog mInfoDialog = new BugreportInfoDialog();		private final BugreportInfoDialog mInfoDialog = new BugreportInfoDialog();
	@@ -234,7 +241,8 @@ public class BugreportProgressService extends Service {
	@Override		@Override
	public void onCreate() {		public void onCreate() {
	mContext = getApplicationContext();		mContext = getApplicationContext();
	mMainHandler = new ServiceHandler("BugreportProgressServiceMainThread");		mMainThreadHandler = new Handler(Looper.getMainLooper());
			mServiceHandler = new ServiceHandler("BugreportProgressServiceMainThread");
	mScreenshotHandler = new ScreenshotHandler("BugreportProgressServiceScreenshotThread");		mScreenshotHandler = new ScreenshotHandler("BugreportProgressServiceScreenshotThread");

	mScreenshotsDir = new File(getFilesDir(), SCREENSHOT_DIR);		mScreenshotsDir = new File(getFilesDir(), SCREENSHOT_DIR);
	@@ -260,10 +268,10 @@ public class BugreportProgressService extends Service {
	Log.v(TAG, "onStartCommand(): " + dumpIntent(intent));		Log.v(TAG, "onStartCommand(): " + dumpIntent(intent));
	if (intent != null) {		if (intent != null) {
	// Handle it in a separate thread.		// Handle it in a separate thread.
	final Message msg = mMainHandler.obtainMessage();		final Message msg = mServiceHandler.obtainMessage();
	msg.what = MSG_SERVICE_COMMAND;		msg.what = MSG_SERVICE_COMMAND;
	msg.obj = intent;		msg.obj = intent;
	mMainHandler.sendMessage(msg);		mServiceHandler.sendMessage(msg);
	}		}

	// If service is killed it cannot be recreated because it would not know which		// If service is killed it cannot be recreated because it would not know which
	@@ -278,7 +286,7 @@ public class BugreportProgressService extends Service {

	@Override		@Override
	public void onDestroy() {		public void onDestroy() {
	mMainHandler.getLooper().quit();		mServiceHandler.getLooper().quit();
	mScreenshotHandler.getLooper().quit();		mScreenshotHandler.getLooper().quit();
	super.onDestroy();		super.onDestroy();
	}		}
	@@ -613,7 +621,7 @@ public class BugreportProgressService extends Service {
	// ignore it		// ignore it
	}		}

	mInfoDialog.initialize(mContext, info);		mMainThreadHandler.post(() -> mInfoDialog.initialize(mContext, info));
	}		}

	/**		/**
	@@ -652,11 +660,11 @@ public class BugreportProgressService extends Service {
	private void takeScreenshot(int id, int delay) {		private void takeScreenshot(int id, int delay) {
	if (delay > 0) {		if (delay > 0) {
	Log.d(TAG, "Taking screenshot for " + id + " in " + delay + " seconds");		Log.d(TAG, "Taking screenshot for " + id + " in " + delay + " seconds");
	final Message msg = mMainHandler.obtainMessage();		final Message msg = mServiceHandler.obtainMessage();
	msg.what = MSG_DELAYED_SCREENSHOT;		msg.what = MSG_DELAYED_SCREENSHOT;
	msg.arg1 = id;		msg.arg1 = id;
	msg.arg2 = delay - 1;		msg.arg2 = delay - 1;
	mMainHandler.sendMessageDelayed(msg, DateUtils.SECOND_IN_MILLIS);		mServiceHandler.sendMessageDelayed(msg, DateUtils.SECOND_IN_MILLIS);
	return;		return;
	}		}

	@@ -696,7 +704,7 @@ public class BugreportProgressService extends Service {
	boolean taken = takeScreenshot(mContext, screenshotFile);		boolean taken = takeScreenshot(mContext, screenshotFile);
	setTakingScreenshot(false);		setTakingScreenshot(false);

	Message.obtain(mMainHandler, MSG_SCREENSHOT_RESPONSE, requestMsg.arg1, taken ? 1 : 0,		Message.obtain(mServiceHandler, MSG_SCREENSHOT_RESPONSE, requestMsg.arg1, taken ? 1 : 0,
	screenshotFile).sendToTarget();		screenshotFile).sendToTarget();
	}		}

	@@ -1111,6 +1119,12 @@ public class BugreportProgressService extends Service {
	* description will be saved on {@code description.txt}.		* description will be saved on {@code description.txt}.
	*/		*/
	private void addDetailsToZipFile(BugreportInfo info) {		private void addDetailsToZipFile(BugreportInfo info) {
			synchronized (mLock) {
			addDetailsToZipFileLocked(info);
			}
			}

			private void addDetailsToZipFileLocked(BugreportInfo info) {
	if (info.bugreportFile == null) {		if (info.bugreportFile == null) {
	// One possible reason is a bug in the Parcelization code.		// One possible reason is a bug in the Parcelization code.
	Log.wtf(TAG, "addDetailsToZipFile(): no bugreportFile on " + info);		Log.wtf(TAG, "addDetailsToZipFile(): no bugreportFile on " + info);
	@@ -1432,6 +1446,7 @@ public class BugreportProgressService extends Service {
	/**		/**
	* Sets its internal state and displays the dialog.		* Sets its internal state and displays the dialog.
	*/		*/
			@MainThread
	void initialize(final Context context, BugreportInfo info) {		void initialize(final Context context, BugreportInfo info) {
	final String dialogTitle =		final String dialogTitle =
	context.getString(R.string.bugreport_info_dialog_title, info.id);		context.getString(R.string.bugreport_info_dialog_title, info.id);