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

Merge "remove dynamicArgs from public methods" into rvc-dev am: 2f83e15e18 am: 5ee5fed39d am: a6ee7372bb

Browse Source 
Change-Id: I0112e6990843c69261e3a9ced474b98d7b4c5403
This commit is contained in:
Songchun Fan
2020-03-19 20:16:10 +00:00
committed by Automerger Merge Worker
parent 84f555fd1a a6ee7372bb
commit a2218170b5
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -2002,11 +2002,10 @@ package android.content.pm {
} }
public class DataLoaderParams { public class DataLoaderParams {
method @NonNull public static final android.content.pm.DataLoaderParams forIncremental(@NonNull android.content.ComponentName, @NonNull String, @Nullable java.util.Map<java.lang.String,android.os.ParcelFileDescriptor>); method @NonNull public static final android.content.pm.DataLoaderParams forIncremental(@NonNull android.content.ComponentName, @NonNull String);
method @NonNull public static final android.content.pm.DataLoaderParams forStreaming(@NonNull android.content.ComponentName, @NonNull String); method @NonNull public static final android.content.pm.DataLoaderParams forStreaming(@NonNull android.content.ComponentName, @NonNull String);
method @NonNull public final String getArguments(); method @NonNull public final String getArguments();
method @NonNull public final android.content.ComponentName getComponentName(); method @NonNull public final android.content.ComponentName getComponentName();
method @NonNull public final java.util.Map<java.lang.String,android.os.ParcelFileDescriptor> getDynamicArgs();
method @NonNull public final int getType(); method @NonNull public final int getType();
} }

16
core/java/android/content/pm/DataLoaderParams.java
View File

@@ -22,9 +22,7 @@ import android.annotation.SystemApi;
import android.content.ComponentName; import android.content.ComponentName;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* This class represents the parameters used to configure a Data Loader. * This class represents the parameters used to configure a Data Loader.
@@ -54,12 +52,10 @@ public class DataLoaderParams {
* *
* @param componentName Data Loader component supporting Incremental installation. * @param componentName Data Loader component supporting Incremental installation.
* @param arguments free form installation arguments * @param arguments free form installation arguments
* @param namedFds TODO(b/146080380) remove
*/ */
public static final @NonNull DataLoaderParams forIncremental( public static final @NonNull DataLoaderParams forIncremental(
@NonNull ComponentName componentName, @NonNull String arguments, @NonNull ComponentName componentName, @NonNull String arguments) {
@Nullable Map<String, ParcelFileDescriptor> namedFds) { return new DataLoaderParams(DataLoaderType.INCREMENTAL, componentName, arguments, null);
return new DataLoaderParams(DataLoaderType.INCREMENTAL, componentName, arguments, namedFds);
} }
/** @hide */ /** @hide */
@@ -115,12 +111,4 @@ public class DataLoaderParams {
public final @NonNull String getArguments() { public final @NonNull String getArguments() {
return mData.arguments; return mData.arguments;
} }
/**
* @return data loader's dynamic arguments such as file descriptors TODO: remove
*/
public final @NonNull Map<String, ParcelFileDescriptor> getDynamicArgs() {
return Arrays.stream(mData.dynamicArgs).collect(
Collectors.toMap(p -> p.name, p -> p.fd));
}
} }

2
services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java
View File

@@ -91,7 +91,7 @@ public class PackageManagerShellCommandDataLoader extends DataLoaderService {
static DataLoaderParams getIncrementalDataLoaderParams(ShellCommand shellCommand) { static DataLoaderParams getIncrementalDataLoaderParams(ShellCommand shellCommand) {
return DataLoaderParams.forIncremental(new ComponentName(PACKAGE, CLASS), return DataLoaderParams.forIncremental(new ComponentName(PACKAGE, CLASS),
getDataLoaderParamsArgs(shellCommand), null); getDataLoaderParamsArgs(shellCommand));
} }
private static int extractShellCommandId(String args) { private static int extractShellCommandId(String args) {