Merge "Guard mThread in ProcessRecord" into main (9b91c773) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ProcessRecord.java

+18 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1443,17 +1443,32 @@ class ProcessRecord implements WindowProcessListener {

	void onProcessFrozen() {		void onProcessFrozen() {
	mProfile.onProcessFrozen();		mProfile.onProcessFrozen();
	if (mThread != null) mThread.onProcessPaused();		final ApplicationThreadDeferred t;
			synchronized (mService) {
			t = mThread;
			}
			// Release the lock before calling the notifier, in case that calls back into AM.
			if (t != null) t.onProcessPaused();
	}		}

	void onProcessUnfrozen() {		void onProcessUnfrozen() {
	if (mThread != null) mThread.onProcessUnpaused();		final ApplicationThreadDeferred t;
			synchronized (mService) {
			t = mThread;
			}
			// Release the lock before calling the notifier, in case that calls back into AM.
			if (t != null) t.onProcessUnpaused();
	mProfile.onProcessUnfrozen();		mProfile.onProcessUnfrozen();
	mServices.onProcessUnfrozen();		mServices.onProcessUnfrozen();
	}		}

	void onProcessFrozenCancelled() {		void onProcessFrozenCancelled() {
	if (mThread != null) mThread.onProcessPausedCancelled();		final ApplicationThreadDeferred t;
			synchronized (mService) {
			t = mThread;
			}
			// Release the lock before calling the notifier, in case that calls back into AM.
			if (t != null) t.onProcessPausedCancelled();
	mServices.onProcessFrozenCancelled();		mServices.onProcessFrozenCancelled();
	}		}