commit db54e3c6c8943c55f352c123b527d990b2570a5d
author David Christie <dnchrist@google.com> Wed Aug 06 00:31:58 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 05 00:29:22 2014 +0000
tree ad8c489b7190961a7527698420c74c0d66528694
parent 39ddf8ddc4e32e640e3e3df490312878554d6d1d
parent daf35c31363fd9cf43aa9e556d1257bd3c3b7a22

Merge "Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink." into lmp-dev

services/core/java/com/android/server/location/FlpHardwareProvider.java

diff --git a/services/core/java/com/android/server/location/FlpHardwareProvider.java b/services/core/java/com/android/server/location/FlpHardwareProvider.java
index 495d3a9..530ad4b 100644
--- a/services/core/java/com/android/server/location/FlpHardwareProvider.java
+++ b/services/core/java/com/android/server/location/FlpHardwareProvider.java
@@ -272,8 +272,7 @@
             synchronized (mLocationSinkLock) {
                 // only one sink is allowed at the moment
                 if (mLocationSink != null) {
-                    throw new RuntimeException(
-                            "IFusedLocationHardware does not support multiple sinks");
+                    Log.e(TAG, "Replacing an existing IFusedLocationHardware sink");
                 }
 
                 mLocationSink = eventSink;