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

Merge "AIDL: use typed Map" am: 72d5595e0e am: aa0551424c

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

Change-Id: I269ec562d6e1441cdbd9ce48e8f9737d6ab3fd21
This commit is contained in:
Jooyung Han
2021-08-12 23:39:19 +00:00
committed by Automerger Merge Worker
parent c31e052182 aa0551424c
commit cde3534eb1
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1098,18 +1098,17 @@ 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 services, Bundle coreSettings, CompatibilityInfo compatInfo, Map<String, IBinder> 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 (Object oname : services.keySet()) { for (String name : services.keySet()) {
if (services.get(oname) == null) { if (services.get(name) == 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 services, in CompatibilityInfo compatInfo, in Map<String, IBinder> 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);