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

Commit dd94e2d5 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Add 'metered' in ResolverParamsParcel am: a3abee95 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2799814



Change-Id: Id438e68ebff986925b927dd443b000e0cdf3b884
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47ca2171 a3abee95

Android.bp

+52 −15
Original line number Original line Diff line number Diff line
@@ -96,22 +96,59 @@ aidl_interface { 
            min_sdk_version: "30",

            min_sdk_version: "30",

        },

        },

    },

    },

    versions: [



        "1",

        "2",

        "3",

        "4",

        "5",

        "6",

        "7",

        "8",

        "9",

        "10",

        "11",

    ],

    dumpapi: {

    dumpapi: {

        no_license: true,

        no_license: true,

    },

    },

    versions_with_info: [

        {

            version: "1",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "2",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "3",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "4",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "5",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "6",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "7",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "8",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "9",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "10",

            imports: ["netd_event_listener_interface-V1"],

        },

        {

            version: "11",

            imports: ["netd_event_listener_interface-V1"],

        },



    ],

    frozen: false,



}

}





cc_defaults {

cc_defaults {
@@ -154,7 +191,7 @@ cc_defaults { 
    // after the build process.

    // after the build process.

    host_required: [

    host_required: [

        "net-tests-utils-host-common",

        "net-tests-utils-host-common",

    ]

    ],

}

}





cc_defaults {

cc_defaults {
@@ -176,7 +213,7 @@ cc_defaults { 
    // after the build process.

    // after the build process.

    host_required: [

    host_required: [

        "net-tests-utils-host-common",

        "net-tests-utils-host-common",

    ]

    ],

}

}





cc_library {

cc_library {

aidl_api/dnsresolver_aidl_interface/current/android/net/IDnsResolver.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ interface IDnsResolver { 
  const int DNS_RESOLVER_LOG_ERROR = 4;

  const int DNS_RESOLVER_LOG_ERROR = 4;

  const int TC_MODE_DEFAULT = 0;

  const int TC_MODE_DEFAULT = 0;

  const int TC_MODE_UDP_TCP = 1;

  const int TC_MODE_UDP_TCP = 1;

  const int TRANSPORT_UNKNOWN = -1;

  const int TRANSPORT_UNKNOWN = (-1) /* -1 */;

  const int TRANSPORT_CELLULAR = 0;

  const int TRANSPORT_CELLULAR = 0;

  const int TRANSPORT_WIFI = 1;

  const int TRANSPORT_WIFI = 1;

  const int TRANSPORT_BLUETOOTH = 2;

  const int TRANSPORT_BLUETOOTH = 2;

aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,4 +35,5 @@ parcelable ResolverParamsParcel { 
  int tlsConnectTimeoutMs = 0;

  int tlsConnectTimeoutMs = 0;

  @nullable android.net.ResolverOptionsParcel resolverOptions;

  @nullable android.net.ResolverOptionsParcel resolverOptions;

  int[] transportTypes = {};

  int[] transportTypes = {};

  boolean meteredNetwork = false;

}
 
}

binder/android/net/ResolverParamsParcel.aidl

+5 −0
Original line number Original line Diff line number Diff line
@@ -113,4 +113,9 @@ parcelable ResolverParamsParcel { 
     * reasonable network type by DnsResolver, it would be considered as unknown.

     * reasonable network type by DnsResolver, it would be considered as unknown.

     */

     */

    int[] transportTypes = {};

    int[] transportTypes = {};



    /**

     * Whether the network is metered or not.

     */

    boolean meteredNetwork = false;

}
 
}