From f270a8f3d653be4a6b8f665e8211db4f39507bb3 Mon Sep 17 00:00:00 2001
From: Jonathan Basseri <misterikkit@google.com>
Date: Wed, 3 Jun 2015 10:11:47 -0700
Subject: [PATCH] Fix logic error in CarrierService.

CarrierService is supposed to filter intents in onBind and only accept
valid actions. The logic was off so that it rejected all bind attempts.

This was tricky to track down because clients get no clear signal that
onBind is returning null.

Bug: 21571360
Change-Id: Id82fce8dfa73a75fae1ce69f73b922addc7daa3e
---
 core/java/android/service/carrier/CarrierService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/service/carrier/CarrierService.java b/core/java/android/service/carrier/CarrierService.java
index aa9705ca0126a..4a4a37544a553 100644
--- a/core/java/android/service/carrier/CarrierService.java
+++ b/core/java/android/service/carrier/CarrierService.java
@@ -91,7 +91,7 @@ public abstract class CarrierService extends Service {
             case BIND_SERVICE_INTERFACE:
                 return mStubWrapper;
             default:
-                null;
+                return null;
         }
     }