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

Commit 4c7b8f8f authored by Edwin Tung's avatar Edwin Tung
Browse files

Combining GnssVisibilityControl to gnss aidl_interface 

Bug: 208728105
Test: atest VtsHalGnssTargetTest
Change-Id: I7295a59a93778a186727e2a22c9669770f021d1a
parent 946e355f

gnss/aidl/Android.bp

+4 −19
Original line number Diff line number Diff line
@@ -23,28 +23,13 @@ package { 
    default_applicable_licenses: ["hardware_interfaces_license"],

}



aidl_interface {

    name: "android.hardware.gnss.visibility_control",

    vendor_available: true,

    srcs: ["android/hardware/gnss/visibility_control/*.aidl"],

    stability: "vintf",

    backend: {

        java: {

            platform_apis: true,

        },

        ndk: {

            vndk: {

                enabled: true,

            },

        },

    },

}



aidl_interface {

    name: "android.hardware.gnss",

    vendor_available: true,

    srcs: ["android/hardware/gnss/*.aidl"],

    imports: ["android.hardware.gnss.visibility_control"],

    srcs: [

        "android/hardware/gnss/*.aidl",

        "android/hardware/gnss/visibility_control/*.aidl",

    ],

    stability: "vintf",

    backend: {

        java: {

gnss/aidl/aidl_api/android.hardware.gnss.visibility_control/current/android/hardware/gnss/visibility_control/IGnssVisibilityControl.aidl→gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/visibility_control/IGnssVisibilityControl.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
package android.hardware.gnss.visibility_control;

@VintfStability

interface IGnssVisibilityControl {

  void enableNfwLocationAccess(in String[] proxyApps);

  void enableNfwLocationAccess(in @utf8InCpp String[] proxyApps);

  void setCallback(in android.hardware.gnss.visibility_control.IGnssVisibilityControlCallback callback);

}

gnss/aidl/aidl_api/android.hardware.gnss.visibility_control/current/android/hardware/gnss/visibility_control/IGnssVisibilityControlCallback.aidl→gnss/aidl/aidl_api/android.hardware.gnss/current/android/hardware/gnss/visibility_control/IGnssVisibilityControlCallback.aidl

+0 −0

File moved.

View file

gnss/aidl/android/hardware/gnss/visibility_control/IGnssVisibilityControl.aidl

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ interface IGnssVisibilityControl { 
     * The package name of the proxy Android application follows the standard Java language

     * package naming format. For example, com.example.myapp.

     */

    void enableNfwLocationAccess(in String[] proxyApps);

    void enableNfwLocationAccess(in @utf8InCpp String[] proxyApps);



    /**

     * Registers the callback for HAL implementation to use.

gnss/aidl/default/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ cc_binary { 
        "android.hardware.gnss.measurement_corrections@1.1",

        "android.hardware.gnss.measurement_corrections@1.0",

        "android.hardware.gnss.visibility_control@1.0",

        "android.hardware.gnss.visibility_control-V1-ndk",

        "android.hardware.gnss-V2-ndk",

    ],

    srcs: [