Merge "Ignore null action in SliceManagerService." into main (06c052d9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/slice/SliceManagerService.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -604,6 +604,11 @@ public class SliceManagerService extends ISliceManager.Stub {
	private final BroadcastReceiver mReceiver = new BroadcastReceiver() {		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
	@Override		@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
			final String action = intent.getAction();
			if (action == null) {
			Slog.w(TAG, "Intent broadcast does not contain action: " + intent);
			return;
			}
	final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);		final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
	if (userId == UserHandle.USER_NULL) {		if (userId == UserHandle.USER_NULL) {
	Slog.w(TAG, "Intent broadcast does not contain user handle: " + intent);		Slog.w(TAG, "Intent broadcast does not contain user handle: " + intent);
	@@ -615,7 +620,7 @@ public class SliceManagerService extends ISliceManager.Stub {
	Slog.w(TAG, "Intent broadcast does not contain package name: " + intent);		Slog.w(TAG, "Intent broadcast does not contain package name: " + intent);
	return;		return;
	}		}
	switch (intent.getAction()) {		switch (action) {
	case Intent.ACTION_PACKAGE_REMOVED:		case Intent.ACTION_PACKAGE_REMOVED:
	final boolean replacing =		final boolean replacing =
	intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);		intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);