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

Commit b0e05cca authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6357740 from 4c6e6b9c to mainline-release 

Change-Id: I8e3b3b8da0b0dac54ffc8c632d75ea2261968136
parents 2c53388f 4c6e6b9c

Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ filegroup { 
// into wifi-service

java_library {

    name: "framework-wifi-util-lib",

    sdk_version: "core_current",

    sdk_version: "module_current",

    srcs: [

        "core/java/android/content/pm/BaseParceledListSlice.java",

        "core/java/android/content/pm/ParceledListSlice.java",
@@ -1175,7 +1175,6 @@ java_library { 
    libs: [

        "framework-annotations-lib",

        "unsupportedappusage",

        "android_system_stubs_current",

    ],

    visibility: ["//frameworks/base/wifi"],

}
@@ -1279,8 +1278,7 @@ java_library { 
    aidl: {

        export_include_dirs: ["telephony/java"],

    },

    sdk_version: "core_current",

    libs: ["android_system_stubs_current"],

    sdk_version: "module_current",

}



java_library {

StubLibraries.bp

+2 −38
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ droidstubs { 
    api_filename: "public_api.txt",

    private_api_filename: "private.txt",

    removed_api_filename: "removed.txt",

    removed_dex_api_filename: "removed-dex.txt",

    arg_files: [

        "core/res/AndroidManifest.xml",

    ],
@@ -141,6 +142,7 @@ droidstubs { 
    private_api_filename: "system-private.txt",

    private_dex_api_filename: "system-private-dex.txt",

    removed_api_filename: "system-removed.txt",

    removed_dex_api_filename: "system-removed-dex.txt",

    arg_files: [

        "core/res/AndroidManifest.xml",

    ],
@@ -339,44 +341,6 @@ java_library_static { 
    ],

}



/////////////////////////////////////////////////////////////////////

// Stubs for hiddenapi processing.

/////////////////////////////////////////////////////////////////////



droidstubs {

    name: "hiddenapi-lists-docs",

    defaults: ["metalava-full-api-stubs-default"],

    arg_files: [

        "core/res/AndroidManifest.xml",

    ],

    dex_api_filename: "public-dex.txt",

    private_dex_api_filename: "private-dex.txt",

    removed_dex_api_filename: "removed-dex.txt",

    args: metalava_framework_docs_args +

        " --show-unannotated " +

        priv_apps +

        " --show-annotation android.annotation.TestApi ",

}



droidstubs {

    name: "hiddenapi-mappings",

    defaults: ["metalava-full-api-stubs-default"],

    srcs: [

        ":opt-telephony-common-srcs",

    ],



    arg_files: [

        "core/res/AndroidManifest.xml",

    ],

    dex_mapping_filename: "dex-mapping.txt",

    args: metalava_framework_docs_args +

        " --hide ReferencesHidden " +

        " --hide UnhiddenSystemApi " +

        " --show-unannotated " +

        priv_apps +

        " --show-annotation android.annotation.TestApi ",

}



/////////////////////////////////////////////////////////////////////

// api/*-current.txt files for use by modules in other directories

// like the CTS test

aidl_api/libincremental_aidl/current/android/os/incremental/IncrementalFileSystemControlParcel.aidl

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.os.incremental;

/* @hide */

parcelable IncrementalFileSystemControlParcel {

  ParcelFileDescriptor cmd;

  ParcelFileDescriptor pendingReads;

  ParcelFileDescriptor log;

}

aidl_api/libincremental_manager_aidl/current/android/os/incremental/IIncrementalService.aidl

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.os.incremental;

/* @hide */

interface IIncrementalService {

  int openStorage(in @utf8InCpp String path);

  int createStorage(in @utf8InCpp String path, in android.content.pm.DataLoaderParamsParcel params, in android.content.pm.IDataLoaderStatusListener listener, int createMode);

  int createLinkedStorage(in @utf8InCpp String path, int otherStorageId, int createMode);

  int makeBindMount(int storageId, in @utf8InCpp String sourcePath, in @utf8InCpp String targetFullPath, int bindType);

  int deleteBindMount(int storageId, in @utf8InCpp String targetFullPath);

  int makeDirectory(int storageId, in @utf8InCpp String path);

  int makeDirectories(int storageId, in @utf8InCpp String path);

  int makeFile(int storageId, in @utf8InCpp String path, in android.os.incremental.IncrementalNewFileParams params);

  int makeFileFromRange(int storageId, in @utf8InCpp String targetPath, in @utf8InCpp String sourcePath, long start, long end);

  int makeLink(int sourceStorageId, in @utf8InCpp String sourcePath, int destStorageId, in @utf8InCpp String destPath);

  int unlink(int storageId, in @utf8InCpp String path);

  boolean isFileRangeLoaded(int storageId, in @utf8InCpp String path, long start, long end);

  byte[] getMetadataByPath(int storageId, in @utf8InCpp String path);

  byte[] getMetadataById(int storageId, in byte[] fileId);

  boolean startLoading(int storageId);

  void deleteStorage(int storageId);

  boolean configureNativeBinaries(int storageId, in @utf8InCpp String apkFullPath, in @utf8InCpp String libDirRelativePath, in @utf8InCpp String abi);

  const int CREATE_MODE_TEMPORARY_BIND = 1;

  const int CREATE_MODE_PERMANENT_BIND = 2;

  const int CREATE_MODE_CREATE = 4;

  const int CREATE_MODE_OPEN_EXISTING = 8;

  const int BIND_TEMPORARY = 0;

  const int BIND_PERMANENT = 1;

}

aidl_api/libincremental_manager_aidl/current/android/os/incremental/IncrementalNewFileParams.aidl

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.os.incremental;

/* @hide */

parcelable IncrementalNewFileParams {

  long size;

  byte[] fileId;

  byte[] metadata;

  @nullable byte[] signature;

}