Merge "Fix TAPL tests crash due NPE in UserController" into main (308915fe) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -760,7 +760,7 @@ class UserController implements Handler.Callback {
	public void performReceive(Intent intent, int resultCode, String data,		public void performReceive(Intent intent, int resultCode, String data,
	Bundle extras, boolean ordered, boolean sticky, int sendingUser)		Bundle extras, boolean ordered, boolean sticky, int sendingUser)
	throws RemoteException {		throws RemoteException {
	if (remainingPackages.decrementAndGet() == 0) {		if (remainingPackages.decrementAndGet() == 0 && !Objects.isNull(receiver)) {
	receiver.performReceive(intent, resultCode, data, extras, ordered, sticky,		receiver.performReceive(intent, resultCode, data, extras, ordered, sticky,
	sendingUser);		sendingUser);
	}		}