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

am b8b242de: am 841e7eb9: Merge "Update intents for CarrierService" into mnc-dev

Browse Source 
* commit 'b8b242de613dcd8f254274a142e719d24e7bc7cc':
  Update intents for CarrierService
This commit is contained in:
Zach Johnson
2015-05-28 00:26:18 +00:00
committed by Android Git Automerger
parent e3d88fc251 b8b242de61
commit 05dee112a1
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -28620,7 +28620,8 @@ package android.service.carrier {
ctor public CarrierService(); ctor public CarrierService();
method public final android.os.IBinder onBind(android.content.Intent); method public final android.os.IBinder onBind(android.content.Intent);
method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierService"; field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
} }
public final class MessagePdu implements android.os.Parcelable { public final class MessagePdu implements android.os.Parcelable {

3
api/system-current.txt
View File

@@ -30646,7 +30646,8 @@ package android.service.carrier {
ctor public CarrierService(); ctor public CarrierService();
method public final android.os.IBinder onBind(android.content.Intent); method public final android.os.IBinder onBind(android.content.Intent);
method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierService"; field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
} }
public final class MessagePdu implements android.os.Parcelable { public final class MessagePdu implements android.os.Parcelable {

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

@@ -24,7 +24,9 @@ import android.os.PersistableBundle;
* <p> * <p>
* To extend this class, you must declare the service in your manifest file to require the * To extend this class, you must declare the service in your manifest file to require the
* {@link android.Manifest.permission#BIND_CARRIER_SERVICES} permission and include an intent * {@link android.Manifest.permission#BIND_CARRIER_SERVICES} permission and include an intent
* filter with the {@link #SERVICE_INTERFACE} action. For example: * filter with the {@link #CONFIG_SERVICE_INTERFACE} action if the service exposes carrier config
* and the {@link #BIND_SERVICE_INTERFACE} action if the service should have a long-lived binding.
* For example:
* </p> * </p>
* *
* <pre>{@code * <pre>{@code
@@ -32,14 +34,16 @@ import android.os.PersistableBundle;
* android:label="@string/service_name" * android:label="@string/service_name"
* android:permission="android.permission.BIND_CARRIER_SERVICES"> * android:permission="android.permission.BIND_CARRIER_SERVICES">
* <intent-filter> * <intent-filter>
* <action android:name="android.service.carrier.CarrierService" /> * <action android:name="android.service.carrier.ConfigService" />
* <action android:name="android.service.carrier.BindService" />
* </intent-filter> * </intent-filter>
* </service> * </service>
* }</pre> * }</pre>
*/ */
public abstract class CarrierService extends Service { public abstract class CarrierService extends Service {
public static final String SERVICE_INTERFACE = "android.service.carrier.CarrierService"; public static final String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
public static final String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
private final ICarrierService.Stub mStubWrapper; private final ICarrierService.Stub mStubWrapper;
@@ -82,7 +86,8 @@ public abstract class CarrierService extends Service {
/** @hide */ /** @hide */
@Override @Override
public final IBinder onBind(Intent intent) { public final IBinder onBind(Intent intent) {
if (!SERVICE_INTERFACE.equals(intent.getAction())) { if (!CONFIG_SERVICE_INTERFACE.equals(intent.getAction())
|| !BIND_SERVICE_INTERFACE.equals(intent.getAction())) {
return null; return null;
} }
return mStubWrapper; return mStubWrapper;