Commit e88da7c0 authored Dec 04, 2024 by Nan Wu

Do not throw exception in refreshIntentCreatorToken

In case the intent does not contain a creator token, which could
be null where ResolverActivity calls it, simply return it without
refresh it.

Bug: 381934057
Test: FrameworkOptCarServicesTest:com.android.car.rotary.ActivityResolverTest#testClickListItem_threeItems
Flag: EXEMPT bugfix
Change-Id: I5959d1af89cfafebee0f7b364f9988cdf2b6c8e3

parent beed0e80

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -19405,7 +19405,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		return createOrGetIntentCreatorToken(intent, key);

		} else {
		throw new IllegalArgumentException("intent does not contain a creator token.");
		return null;
		}
		}