Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix logic error in CarrierService." into mnc-dev

Browse Source
This commit is contained in:
Jonathan Basseri
2015-06-03 18:16:04 +00:00
committed by Android (Google) Code Review
parent 27a2ce2e42 c0e7a0416d
commit 13abe77f53
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/service/carrier/CarrierService.java
View File

@@ -86,11 +86,13 @@ public abstract class CarrierService extends Service {
/** @hide */ /** @hide */
@Override @Override
public final IBinder onBind(Intent intent) { public final IBinder onBind(Intent intent) {
if (!CONFIG_SERVICE_INTERFACE.equals(intent.getAction()) switch (intent.getAction()) {
|| !BIND_SERVICE_INTERFACE.equals(intent.getAction())) { case CONFIG_SERVICE_INTERFACE:
return null; case BIND_SERVICE_INTERFACE:
return mStubWrapper;
default:
null;
} }
return mStubWrapper;
} }
/** /**