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

Commit 2c6b17de authored by Hridya Valsaraju's avatar Hridya Valsaraju Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'binderized_gnss_hal' 

* changes:
  Default implementation Gnss HAL
  Add IGnssConfiguration Interface
  Gnss Hal Minor Cleanup
parents 7bdce325 29dc1e0c

gnss/1.0/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ genrule { 
        "IAGnssRilCallback.hal",

        "IGnss.hal",

        "IGnssCallback.hal",

        "IGnssConfiguration.hal",

        "IGnssDebug.hal",

        "IGnssGeofenceCallback.hal",

        "IGnssGeofencing.hal",
@@ -32,6 +33,7 @@ genrule { 
        "android/hardware/gnss/1.0/AGnssRilCallbackAll.cpp",

        "android/hardware/gnss/1.0/GnssAll.cpp",

        "android/hardware/gnss/1.0/GnssCallbackAll.cpp",

        "android/hardware/gnss/1.0/GnssConfigurationAll.cpp",

        "android/hardware/gnss/1.0/GnssDebugAll.cpp",

        "android/hardware/gnss/1.0/GnssGeofenceCallbackAll.cpp",

        "android/hardware/gnss/1.0/GnssGeofencingAll.cpp",
@@ -58,6 +60,7 @@ genrule { 
        "IAGnssRilCallback.hal",

        "IGnss.hal",

        "IGnssCallback.hal",

        "IGnssConfiguration.hal",

        "IGnssDebug.hal",

        "IGnssGeofenceCallback.hal",

        "IGnssGeofencing.hal",
@@ -102,6 +105,11 @@ genrule { 
        "android/hardware/gnss/1.0/BnGnssCallback.h",

        "android/hardware/gnss/1.0/BpGnssCallback.h",

        "android/hardware/gnss/1.0/BsGnssCallback.h",

        "android/hardware/gnss/1.0/IGnssConfiguration.h",

        "android/hardware/gnss/1.0/IHwGnssConfiguration.h",

        "android/hardware/gnss/1.0/BnGnssConfiguration.h",

        "android/hardware/gnss/1.0/BpGnssConfiguration.h",

        "android/hardware/gnss/1.0/BsGnssConfiguration.h",

        "android/hardware/gnss/1.0/IGnssDebug.h",

        "android/hardware/gnss/1.0/IHwGnssDebug.h",

        "android/hardware/gnss/1.0/BnGnssDebug.h",

gnss/1.0/IAGnss.hal

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import IAGnssCallback; 
 * Extended interface for AGNSS support.

 */

interface IAGnss {

    enum ApnIpType : uint16_t {

    enum ApnIpType : uint8_t {

        INVALID  = 0,

        IPV4     = 1,

        IPV6     = 2,
@@ -72,6 +72,6 @@ interface IAGnss { 
     *

     * @return success True if the operation is successful.

     */

    dataConnOpenWithApnIpType(string apn, ApnIpType apnIpType)

    dataConnOpen(string apn, ApnIpType apnIpType)

        generates (bool success);

};

gnss/1.0/IAGnssCallback.hal

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package android.hardware.gnss@1.0; 
/** Callback structure for the AGNSS interface. */

interface IAGnssCallback {

    /** AGNSS type **/

    enum AGnssType : uint16_t {

    enum AGnssType : uint8_t {

        TYPE_SUPL         = 1,

        TYPE_C2K          = 2

    };



    enum AGnssStatusValue : uint16_t {

    enum AGnssStatusValue : uint8_t {

        /** GNSS requests data connection for AGNSS. */

        REQUEST_AGNSS_DATA_CONN  = 1,

        /** GNSS releases the AGNSS data connection. */

gnss/1.0/IAGnssRil.hal

+5 −15
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ import IAGnssRilCallback; 
 * location, unique subscriber ID, phone number string and network availability changes.

 */

interface IAGnssRil {

    enum SetIDType : uint16_t {

    enum SetIDType : uint8_t {

        NONE    = 0,

        IMSI    = 1,

        MSISDM  = 2

    };



    enum NetworkType : int32_t {

    enum NetworkType : uint8_t {

        MOBILE  = 0,

        WIFI    = 1,

        MMS     = 2,
@@ -41,10 +41,9 @@ interface IAGnssRil { 
        WIMAX   = 6,

    };



    enum AGnssRefLocationType : int32_t {

    enum AGnssRefLocationType : uint8_t {

        GSM_CELLID   = 1,

        UMTS_CELLID  = 2,

        MAC          = 3,

        LTE_CELLID   = 4,

    };
@@ -75,20 +74,11 @@ interface IAGnssRil { 
        uint16_t pcid;

    };



    struct AGnssRefLocationMac {

        uint8_t[6] mac;

    };



    /* Represents ref locations */

    struct AGnssRefLocation {

        AGnssRefLocationType type;



        union RefLoc {

        AGnssRefLocationCellID cellID;

            AGnssRefLocationMac mac;

        };



        RefLoc refLocVal;

    };



    /*
@@ -102,7 +92,7 @@ interface IAGnssRil { 
    /*

     * Sets the reference location.

     *

     * @param agnssReflocation AGNSS reference location CellID/MAC.

     * @param agnssReflocation AGNSS reference location CellID.

     */

    setRefLocation(AGnssRefLocation agnssReflocation);

gnss/1.0/IAGnssRilCallback.hal

+1 −9
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ interface IAGnssRilCallback { 
        MSISDN  = 1 << 1L,

    };



    /* Kinds of reference location that can be requested. */

    enum RefLoc : uint32_t {

        CELLID = 1 << 0L,

        MAC    = 1 << 1L

    };



    /*

     * The Hal uses this API to request a SET ID.

     *
@@ -43,9 +37,7 @@ interface IAGnssRilCallback { 
    /*

     * The Hal uses this API to request a reference location.

     *

     * @param refLocflag Specifies the kind of reference location that is required

     * by the HAL.

     */

    requestRefLocCb(RefLoc refLocflag);

    requestRefLocCb();



};