Merge "Revert "AIDL: use typed Map"" (01da4566) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -1041,16 +1041,17 @@ public final class ActivityThread extends ClientTransactionHandler {
		IUiAutomationConnection instrumentationUiConnection, int debugMode,
		boolean enableBinderTracking, boolean trackAllocation,
		boolean isRestrictedBackupMode, boolean persistent, Configuration config,
		CompatibilityInfo compatInfo, Map<String, IBinder> services, Bundle coreSettings,
		CompatibilityInfo compatInfo, Map services, Bundle coreSettings,
		String buildSerial, AutofillOptions autofillOptions,
		ContentCaptureOptions contentCaptureOptions, long[] disabledCompatChanges) {
		if (services != null) {
		if (false) {
		// Test code to make sure the app could see the passed-in services.
		for (String name : services.keySet()) {
		if (services.get(name) == null) {
		for (Object oname : services.keySet()) {
		if (services.get(oname) == null) {
		continue; // AM just passed in a null service.
		}
		String name = (String) oname;

		// See b/79378449 about the following exemption.
		switch (name) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ oneway interface IApplicationThread {
		IInstrumentationWatcher testWatcher, IUiAutomationConnection uiAutomationConnection,
		int debugMode, boolean enableBinderTracking, boolean trackAllocation,
		boolean restrictedBackupMode, boolean persistent, in Configuration config,
		in CompatibilityInfo compatInfo, in Map<String, IBinder> services,
		in CompatibilityInfo compatInfo, in Map services,
		in Bundle coreSettings, in String buildSerial, in AutofillOptions autofillOptions,
		in ContentCaptureOptions contentCaptureOptions, in long[] disabledCompatChanges);
		void runIsolatedEntryPoint(in String entryPoint, in String[] entryPointArgs);