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

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

Snap for 5401728 from 2c7f2b55 to qt-release 

Change-Id: I5e000c5af8c080d0d1474e6316290292e16a1aea
parents 2098f676 2c7f2b55

Android.bp

+2 −61
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ java_defaults { 
        "core/java/android/os/ICancellationSignal.aidl",

        "core/java/android/os/IDeviceIdentifiersPolicyService.aidl",

        "core/java/android/os/IDeviceIdleController.aidl",

        "core/java/android/os/IDynamicAndroidService.aidl",

        "core/java/android/os/IHardwarePropertiesManager.aidl",

        ":libincident_aidl",

        "core/java/android/os/IMaintenanceActivityListener.aidl",
@@ -272,6 +271,7 @@ java_defaults { 
        "core/java/android/os/IUserManager.aidl",

        ":libvibrator_aidl",

        "core/java/android/os/IVibratorService.aidl",

        "core/java/android/os/image/IDynamicSystemService.aidl",

        "core/java/android/os/storage/IStorageManager.aidl",

        "core/java/android/os/storage/IStorageEventListener.aidl",

        "core/java/android/os/storage/IStorageShutdownObserver.aidl",
@@ -886,66 +886,6 @@ gensrcs { 
    output_extension: "srcjar",

}



// AIDL interfaces between the core system and the networking mainline module.

aidl_interface {

    name: "networkstack-aidl-interfaces",

    local_include_dir: "core/java",

    srcs: [

        "core/java/android/net/ApfCapabilitiesParcelable.aidl",

        "core/java/android/net/DhcpResultsParcelable.aidl",

        "core/java/android/net/INetworkMonitor.aidl",

        "core/java/android/net/INetworkMonitorCallbacks.aidl",

        "core/java/android/net/INetworkStackConnector.aidl",

        "core/java/android/net/INetworkStackStatusCallback.aidl",

        "core/java/android/net/InitialConfigurationParcelable.aidl",

        "core/java/android/net/PrivateDnsConfigParcel.aidl",

        "core/java/android/net/ProvisioningConfigurationParcelable.aidl",

        "core/java/android/net/StaticIpConfigurationParcelable.aidl",

        "core/java/android/net/TcpKeepalivePacketDataParcelable.aidl",

        "core/java/android/net/dhcp/DhcpServingParamsParcel.aidl",

        "core/java/android/net/dhcp/IDhcpServer.aidl",

        "core/java/android/net/dhcp/IDhcpServerCallbacks.aidl",

        "core/java/android/net/ip/IIpClient.aidl",

        "core/java/android/net/ip/IIpClientCallbacks.aidl",

        "core/java/android/net/IIpMemoryStore.aidl",

        "core/java/android/net/IIpMemoryStoreCallbacks.aidl",

        "core/java/android/net/ipmemorystore/**/*.aidl",

    ],

    backend: {

        ndk: {

            enabled: false,

        },

        cpp: {

            enabled: false,

        },

    },

    api_dir: "aidl/networkstack",

}



aidl_interface {

    name: "ipmemorystore-aidl-interfaces",

    local_include_dir: "core/java",

    srcs: [

        "core/java/android/net/IIpMemoryStore.aidl",

        "core/java/android/net/IIpMemoryStoreCallbacks.aidl",

        "core/java/android/net/ipmemorystore/**/*.aidl",

    ],

}



aidl_interface {

    name: "networkstack-aidl-framework",

    local_include_dir: "core/java",

    srcs: [

        "core/java/android/net/TcpKeepalivePacketDataParcelable.aidl",

    ],

    api_dir: "aidl/networkstack",

    backend: {

        java: {

            sdk_version: "28",

        },

    },

}



filegroup {

    name: "framework-annotations",

    srcs: [
@@ -1685,6 +1625,7 @@ droidstubs { 
    srcs: [

        ":openjdk_java_files",

        ":non_openjdk_java_files",

        ":opt-telephony-common-srcs",

    ],

    arg_files: [

        "core/res/AndroidManifest.xml",

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/overlay/ExperimentNav 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/ExperimentNavigationBarSlim)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

api/current.txt

+166 −153

File changed.

Preview size limit exceeded, changes collapsed.

api/removed.txt

+2 −0
Original line number Diff line number Diff line
@@ -524,6 +524,8 @@ package android.provider { 
  public static interface MediaStore.MediaColumns extends android.provider.BaseColumns {

    field @Deprecated public static final String HASH = "_hash";

    field @Deprecated public static final String IS_TRASHED = "is_trashed";

    field @Deprecated public static final String PRIMARY_DIRECTORY = "primary_directory";

    field @Deprecated public static final String SECONDARY_DIRECTORY = "secondary_directory";

  }



  @Deprecated public static class MediaStore.PendingParams {

api/system-current.txt

+277 −249

File changed.

Preview size limit exceeded, changes collapsed.