Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a9d5765 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Revert "AIDL: use typed Map"" am: 01da4566 am: 16c2faf6 am:... 

Merge "Revert "AIDL: use typed Map"" am: 01da4566 am: 16c2faf6 am: 161105be am: 2063fecc am: b2fc9a7e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1806796

Change-Id: I179be8842d9db2f76ac735b7f884600afddf711a
parents 48b78837 b2fc9a7e

core/java/android/app/ActivityThread.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -1101,17 +1101,18 @@ public final class ActivityThread extends ClientTransactionHandler 
                IUiAutomationConnection instrumentationUiConnection, int debugMode,

                IUiAutomationConnection instrumentationUiConnection, int debugMode,

                boolean enableBinderTracking, boolean trackAllocation,

                boolean enableBinderTracking, boolean trackAllocation,

                boolean isRestrictedBackupMode, boolean persistent, Configuration config,

                boolean isRestrictedBackupMode, boolean persistent, Configuration config,

                CompatibilityInfo compatInfo, Map<String, IBinder> services, Bundle coreSettings,

                CompatibilityInfo compatInfo, Map services, Bundle coreSettings,

                String buildSerial, AutofillOptions autofillOptions,

                String buildSerial, AutofillOptions autofillOptions,

                ContentCaptureOptions contentCaptureOptions, long[] disabledCompatChanges,

                ContentCaptureOptions contentCaptureOptions, long[] disabledCompatChanges,

                SharedMemory serializedSystemFontMap) {

                SharedMemory serializedSystemFontMap) {

            if (services != null) {

            if (services != null) {

                if (false) {

                if (false) {

                    // Test code to make sure the app could see the passed-in services.

                    // Test code to make sure the app could see the passed-in services.

                    for (String name : services.keySet()) {

                    for (Object oname : services.keySet()) {

                        if (services.get(name) == null) {

                        if (services.get(oname) == null) {

                            continue; // AM just passed in a null service.

                            continue; // AM just passed in a null service.

                        }

                        }

                        String name = (String) oname;





                        // See b/79378449 about the following exemption.

                        // See b/79378449 about the following exemption.

                        switch (name) {

                        switch (name) {

core/java/android/app/IApplicationThread.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ oneway interface IApplicationThread { 
            IInstrumentationWatcher testWatcher, IUiAutomationConnection uiAutomationConnection,

            IInstrumentationWatcher testWatcher, IUiAutomationConnection uiAutomationConnection,

            int debugMode, boolean enableBinderTracking, boolean trackAllocation,

            int debugMode, boolean enableBinderTracking, boolean trackAllocation,

            boolean restrictedBackupMode, boolean persistent, in Configuration config,

            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 Bundle coreSettings, in String buildSerial, in AutofillOptions autofillOptions,

            in ContentCaptureOptions contentCaptureOptions, in long[] disabledCompatChanges,

            in ContentCaptureOptions contentCaptureOptions, in long[] disabledCompatChanges,

            in SharedMemory serializedSystemFontMap);

            in SharedMemory serializedSystemFontMap);