Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82fddef5 authored by Songchun Fan's avatar Songchun Fan
Browse files

remove dynamicArgs from public methods 

It is for internal use only.

Test: builds
BUG: 150795871
Change-Id: I45d1b0b4e983e26c7175d80816f84296afdd18a6
parent 6a84d7be

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -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<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 final String getArguments();















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















  }















































core/java/android/content/pm/DataLoaderParams.java



+2
−14




























Original line number
Diff line number
Diff line








@@ -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<String, ParcelFileDescriptor> 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<String, ParcelFileDescriptor> getDynamicArgs() {













        return Arrays.stream(mData.dynamicArgs).collect(













                Collectors.toMap(p -> p.name, p -> p.fd));













    }















}
























services/core/java/com/android/server/pm/PackageManagerShellCommandDataLoader.java



+1
−1




























Original line number
Diff line number
Diff line








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