diff --git a/api/system-current.txt b/api/system-current.txt index 7ff02569508ab..e5647f9fc2671 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2002,11 +2002,10 @@ package android.content.pm { } public class DataLoaderParams { - method @NonNull public static final android.content.pm.DataLoaderParams forIncremental(@NonNull android.content.ComponentName, @NonNull String, @Nullable java.util.Map); + 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 final String getArguments(); method @NonNull public final android.content.ComponentName getComponentName(); - method @NonNull public final java.util.Map getDynamicArgs(); method @NonNull public final int getType(); } diff --git a/core/java/android/content/pm/DataLoaderParams.java b/core/java/android/content/pm/DataLoaderParams.java index 60d7bb3c5918c..99c0907f1844d 100644 --- a/core/java/android/content/pm/DataLoaderParams.java +++ b/core/java/android/content/pm/DataLoaderParams.java @@ -22,9 +22,7 @@ import android.annotation.SystemApi; import android.content.ComponentName; import android.os.ParcelFileDescriptor; -import java.util.Arrays; import java.util.Map; -import java.util.stream.Collectors; /** * 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 arguments free form installation arguments - * @param namedFds TODO(b/146080380) remove */ public static final @NonNull DataLoaderParams forIncremental( - @NonNull ComponentName componentName, @NonNull String arguments, - @Nullable Map namedFds) { - return new DataLoaderParams(DataLoaderType.INCREMENTAL, componentName, arguments, namedFds); + @NonNull ComponentName componentName, @NonNull String arguments) { + return new DataLoaderParams(DataLoaderType.INCREMENTAL, componentName, arguments, null); } /** @hide */ @@ -115,12 +111,4 @@ public class DataLoaderParams { public final @NonNull String getArguments() { return mData.arguments; } - - /** - * @return data loader's dynamic arguments such as file descriptors TODO: remove - */ - public final @NonNull Map getDynamicArgs() { - return Arrays.stream(mData.dynamicArgs).collect( - Collectors.toMap(p -> p.name, p -> p.fd)); - } } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java b/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java index 8f30e7da32048..6d83d70f1cb18 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java @@ -91,7 +91,7 @@ public class PackageManagerShellCommandDataLoader extends DataLoaderService { static DataLoaderParams getIncrementalDataLoaderParams(ShellCommand shellCommand) { return DataLoaderParams.forIncremental(new ComponentName(PACKAGE, CLASS), - getDataLoaderParamsArgs(shellCommand), null); + getDataLoaderParamsArgs(shellCommand)); } private static int extractShellCommandId(String args) {