From e5c53750f06e9d9739b45ec108260ead7ff80941 Mon Sep 17 00:00:00 2001
From: Isaac Chen <isaacchen@isaacchen.cn>
Date: Mon, 31 Dec 2018 10:55:08 +0100
Subject: wayne-common: Synchorize gps to P

 * QC Tag: LA.UM.7.2.r1-04900-sdm660.0

Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn>
Change-Id: I34383e8fbf394b774f83f8d662873e8786ff1bbf
---
 gps/android/AGnss.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'gps/android/AGnss.h')

diff --git a/gps/android/AGnss.h b/gps/android/AGnss.h
index a3f4a87..4b599b9 100644
--- a/gps/android/AGnss.h
+++ b/gps/android/AGnss.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
  * Not a Contribution
  */
 /*
@@ -28,7 +28,7 @@
 namespace android {
 namespace hardware {
 namespace gnss {
-namespace V1_0 {
+namespace V1_1 {
 namespace implementation {
 
 using ::android::hardware::gnss::V1_0::IAGnss;
@@ -43,7 +43,7 @@ struct Gnss;
 struct AGnss : public IAGnss {
 
     AGnss(Gnss* gnss);
-    ~AGnss() = default;
+    ~AGnss();
     /*
      * Methods from ::android::hardware::gnss::V1_0::IAGnss interface follow.
      * These declarations were generated from IAGnss.hal.
@@ -60,16 +60,18 @@ struct AGnss : public IAGnss {
     Return<bool> setServer(IAGnssCallback::AGnssType type,
                          const hidl_string& hostname, int32_t port) override;
 
+    void statusIpV4Cb(AGnssExtStatusIpV4 status);
+
     /* Data call setup callback passed down to GNSS HAL implementation */
     static void agnssStatusIpV4Cb(AGnssExtStatusIpV4 status);
 
  private:
     Gnss* mGnss = nullptr;
-    static sp<IAGnssCallback> sAGnssCbIface;
+    sp<IAGnssCallback> mAGnssCbIface = nullptr;
 };
 
 }  // namespace implementation
-}  // namespace V1_0
+}  // namespace V1_1
 }  // namespace gnss
 }  // namespace hardware
 }  // namespace android
-- 
cgit v1.2.3