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

Merge "AIDL: use typed Map"

Browse Source
This commit is contained in:
Jooyung Han
2021-08-12 23:14:53 +00:00
committed by Gerrit Code Review
parent a1431a8227 553c027bbf
commit 72d5595e0e
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

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

@@ -72,7 +72,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);
void runIsolatedEntryPoint(in String entryPoint, in String[] entryPointArgs); void runIsolatedEntryPoint(in String entryPoint, in String[] entryPointArgs);