From cfd7c4e70e8b70a2decc303f1f6b291606211c17 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 7 Jul 2016 18:50:14 +0200
Subject: [PATCH] Add FusedLocationProvider stuff required for newer Google
 client libs

---
 .../internal/FusedLocationProviderResult.aidl |  3 ++
 .../IFusedLocationProviderCallback.aidl       |  7 ++++
 .../internal/FusedLocationProviderResult.java | 40 +++++++++++++++++++
 .../internal/LocationRequestUpdateData.java   |  5 +++
 4 files changed, 55 insertions(+)
 create mode 100644 play-services-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl
 create mode 100644 play-services-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl
 create mode 100644 play-services-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java

diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl
new file mode 100644
index 00000000..37a17787
--- /dev/null
+++ b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.location.internal;
+
+parcelable FusedLocationProviderResult;
diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl
new file mode 100644
index 00000000..c0560fe5
--- /dev/null
+++ b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl
@@ -0,0 +1,7 @@
+package com.google.android.gms.location.internal;
+
+import com.google.android.gms.location.internal.FusedLocationProviderResult;
+
+interface IFusedLocationProviderCallback {
+    void onFusedLocationProviderResult(in FusedLocationProviderResult result) = 0;
+}
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java b/play-services-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java
new file mode 100644
index 00000000..2e085fbe
--- /dev/null
+++ b/play-services-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.gms.location.internal;
+
+import com.google.android.gms.common.api.Status;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class FusedLocationProviderResult extends AutoSafeParcelable {
+    public static final FusedLocationProviderResult SUCCESS = FusedLocationProviderResult.create(Status.SUCCESS);
+
+    @SafeParceled(1000)
+    private int versionCode = 1;
+
+    @SafeParceled(1)
+    public Status status;
+
+    public static FusedLocationProviderResult create(Status status) {
+        FusedLocationProviderResult result = new FusedLocationProviderResult();
+        result.status = status;
+        return result;
+    }
+
+    public static final Creator<FusedLocationProviderResult> CREATOR = new AutoCreator<FusedLocationProviderResult>(FusedLocationProviderResult.class);
+}
diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java b/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java
index 748f2f13..9960db4c 100644
--- a/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java
+++ b/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java
@@ -20,6 +20,7 @@ import android.app.PendingIntent;
 
 import com.google.android.gms.location.ILocationCallback;
 import com.google.android.gms.location.ILocationListener;
+import com.google.android.gms.location.internal.IFusedLocationProviderCallback;
 
 import org.microg.safeparcel.AutoSafeParcelable;
 import org.microg.safeparcel.SafeParceled;
@@ -47,6 +48,9 @@ public class LocationRequestUpdateData extends AutoSafeParcelable {
     @SafeParceled(5)
     public ILocationCallback callback;
 
+    @SafeParceled(6)
+    public IFusedLocationProviderCallback fusedLocationProviderCallback;
+
     @Override
     public String toString() {
         return "LocationRequestUpdateData{" +
@@ -55,6 +59,7 @@ public class LocationRequestUpdateData extends AutoSafeParcelable {
                 ", listener=" + listener +
                 ", pendingIntent=" + pendingIntent +
                 ", callback=" + callback +
+                ", fusedLocationProviderCallback=" + fusedLocationProviderCallback +
                 '}';
     }