am cc00587c: am 13abe77f: Merge "Fix logic error in CarrierService." into mnc-dev

* commit 'cc00587c04f853d7c85c78893462c0f43781f17d': Fix logic error in CarrierService.
2015-06-03 19:18:06 +00:00
parent fbb539b3ff cc00587c04
commit 4b97a3fe01
1 changed files with 6 additions and 4 deletions
--- a/core/java/android/service/carrier/CarrierService.java
+++ b/core/java/android/service/carrier/CarrierService.java
@@ -86,11 +86,13 @@ public abstract class CarrierService extends Service {
    /** @hide */
    @Override
    public final IBinder onBind(Intent intent) {
-        if (!CONFIG_SERVICE_INTERFACE.equals(intent.getAction())
-            || !BIND_SERVICE_INTERFACE.equals(intent.getAction())) {
-            return null;
+        switch (intent.getAction()) {
+            case CONFIG_SERVICE_INTERFACE:
+            case BIND_SERVICE_INTERFACE:
+                return mStubWrapper;
+            default:
+                null;
        }
-        return mStubWrapper;
    }

    /**