From 707b9de6cd6629c3fa2d697628a6d84b99345dc3 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 31 Jul 2016 08:51:05 +0200 Subject: [PATCH] Add initial support for LocationAvailability --- .../IGoogleLocationManagerService.aidl | 2 +- .../gms/location/LocationAvailability.java | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl index 40937c80..123a0952 100644 --- a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl +++ b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl @@ -61,7 +61,7 @@ interface IGoogleLocationManagerService { Location getLastLocationWithPackage(String packageName) = 20; void iglms26(in Location var1, int var2) = 25; - LocationAvailability iglms34(String var1) = 33; + LocationAvailability getLocationAvailabilityWithPackage(String packageName) = 33; IBinder iglms51() = 50; void requestLocationSettingsDialog(in LocationSettingsRequest settingsRequest, ISettingsCallbacks callback, String packageName) = 62; diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationAvailability.java b/play-services-api/src/main/java/com/google/android/gms/location/LocationAvailability.java index 2cba0cf6..3ee22ef9 100644 --- a/play-services-api/src/main/java/com/google/android/gms/location/LocationAvailability.java +++ b/play-services-api/src/main/java/com/google/android/gms/location/LocationAvailability.java @@ -17,8 +17,35 @@ package com.google.android.gms.location; import org.microg.safeparcel.AutoSafeParcelable; +import org.microg.safeparcel.SafeParceled; public class LocationAvailability extends AutoSafeParcelable { + @SafeParceled(1000) + private int versionCode = 1; + + @SafeParceled(1) + private int cellStatus; + + @SafeParceled(2) + private int wifiStatus; + + @SafeParceled(3) + private long elapsedRealtimeNs; + + @SafeParceled(4) + private int locationStatus; + + private LocationAvailability(int cellStatus, int wifiStatus, int elapsedRealtimeNs, int locationStatus) { + this.cellStatus = cellStatus; + this.wifiStatus = wifiStatus; + this.elapsedRealtimeNs = elapsedRealtimeNs; + this.locationStatus = this.locationStatus; + } + + public static LocationAvailability create() { // TODO + return new LocationAvailability(0, 0, 0, 0); + } + public static final Creator CREATOR = new AutoCreator(LocationAvailability.class); }