Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "AIDL: use typed Map"" am: 01da4566ee am: 16c2faf6e1

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

Change-Id: If93a01cbff96ab90c54bc35fdeb2ac298914df33
This commit is contained in:
Jooyung Han
2021-09-01 00:50:56 +00:00
committed by Automerger Merge Worker
parent 176f90d7c2 16c2faf6e1
commit 161105be0a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/ActivityThread.java
View File

@@ -1094,17 +1094,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) {

2
core/java/android/app/IApplicationThread.aidl
View File

@@ -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);