Add API to cancel an active weather request

Add new API cancelRequest to CMWeatherManager. This will allow
clients to cancel a request that was previuosly submitted to
the weather service.

As part of this change, requestWeatherUpdate(weatherLocation),
requestWeatherUpdate(Location) and lookupCity(cityName) will
now return the RequestInfo object created if the request
was successfully submitted to the weather manager service

TICKET: CYNGNOS-2383
TICKET: CYNGNOS-2385

Change-Id: Ic122f91e0ea8a24d81dbed48741ef1e33567b56c

1 files changed, 15 insertions, 0 deletions

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMWeatherManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMWeatherManagerService.java
index faab108..d34454e 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMWeatherManagerService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMWeatherManagerService.java
@@ -220,6 +220,12 @@ public class CMWeatherManagerService extends SystemService{
             }
             return null;
         }
+
+        @Override
+        public void cancelRequest(RequestInfo info) {
+            enforcePermission();
+            processCancelRequest(info);
+        }
     };
 
     private String getComponentLabel(ComponentName componentName) {
@@ -334,6 +340,15 @@ public class CMWeatherManagerService extends SystemService{
         }
     }
 
+    private void processCancelRequest(RequestInfo info) {
+        if (mIsWeatherProviderServiceBound) {
+            try {
+                mWeatherProviderService.cancelRequest(info);
+            } catch (RemoteException e) {
+            }
+        }
+    }
+
     private ServiceConnection mWeatherServiceProviderConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {