diff options
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | api/current.txt | 14 | ||||
-rw-r--r-- | api/system-current.txt | 14 | ||||
-rw-r--r-- | core/java/android/service/carrier/CarrierService.java (renamed from core/java/android/service/carrier/CarrierConfigService.java) | 24 | ||||
-rw-r--r-- | core/java/android/service/carrier/ICarrierService.aidl (renamed from core/java/android/service/carrier/ICarrierConfigService.aidl) | 8 | ||||
-rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 2 |
6 files changed, 32 insertions, 32 deletions
@@ -214,7 +214,7 @@ LOCAL_SRC_FILES += \ core/java/android/os/IUserManager.aidl \ core/java/android/os/IVibratorService.aidl \ core/java/android/security/IKeystoreService.aidl \ - core/java/android/service/carrier/ICarrierConfigService.aidl \ + core/java/android/service/carrier/ICarrierService.aidl \ core/java/android/service/carrier/ICarrierMessagingCallback.aidl \ core/java/android/service/carrier/ICarrierMessagingService.aidl \ core/java/android/service/gatekeeper/IGateKeeperService.aidl \ diff --git a/api/current.txt b/api/current.txt index 0209fa4..ebc70e1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28559,13 +28559,6 @@ package android.security.keystore { package android.service.carrier { - public abstract class CarrierConfigService extends android.app.Service { - ctor public CarrierConfigService(); - method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); - field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService"; - } - public class CarrierIdentifier implements android.os.Parcelable { ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public int describeContents(); @@ -28623,6 +28616,13 @@ package android.service.carrier { method public int getSendStatus(); } + public abstract class CarrierService extends android.app.Service { + ctor public CarrierService(); + method public final android.os.IBinder onBind(android.content.Intent); + method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); + field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierService"; + } + public final class MessagePdu implements android.os.Parcelable { ctor public MessagePdu(java.util.List<byte[]>); method public int describeContents(); diff --git a/api/system-current.txt b/api/system-current.txt index baab9a3..5d68d16 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30585,13 +30585,6 @@ package android.security.keystore { package android.service.carrier { - public abstract class CarrierConfigService extends android.app.Service { - ctor public CarrierConfigService(); - method public final android.os.IBinder onBind(android.content.Intent); - method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); - field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService"; - } - public class CarrierIdentifier implements android.os.Parcelable { ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public int describeContents(); @@ -30649,6 +30642,13 @@ package android.service.carrier { method public int getSendStatus(); } + public abstract class CarrierService extends android.app.Service { + ctor public CarrierService(); + method public final android.os.IBinder onBind(android.content.Intent); + method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier); + field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierService"; + } + public final class MessagePdu implements android.os.Parcelable { ctor public MessagePdu(java.util.List<byte[]>); method public int describeContents(); diff --git a/core/java/android/service/carrier/CarrierConfigService.java b/core/java/android/service/carrier/CarrierService.java index bf33ad5..20865d4 100644 --- a/core/java/android/service/carrier/CarrierConfigService.java +++ b/core/java/android/service/carrier/CarrierService.java @@ -20,7 +20,7 @@ import android.os.IBinder; import android.os.PersistableBundle; /** - * A service that sets carrier configuration for telephony services. + * A service that exposes carrier-specific functionality to the system. * <p> * 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 @@ -28,23 +28,23 @@ import android.os.PersistableBundle; * </p> * * <pre>{@code - * <service android:name=".MyCarrierConfigService" + * <service android:name=".MyCarrierService" * android:label="@string/service_name" * android:permission="android.permission.BIND_CARRIER_SERVICES"> * <intent-filter> - * <action android:name="android.service.carrier.CarrierConfigService" /> + * <action android:name="android.service.carrier.CarrierService" /> * </intent-filter> * </service> * }</pre> */ -public abstract class CarrierConfigService extends Service { +public abstract class CarrierService extends Service { - public static final String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService"; + public static final String SERVICE_INTERFACE = "android.service.carrier.CarrierService"; - private final ICarrierConfigService.Stub mStubWrapper; + private final ICarrierService.Stub mStubWrapper; - public CarrierConfigService() { - mStubWrapper = new ICarrierConfigServiceWrapper(); + public CarrierService() { + mStubWrapper = new ICarrierServiceWrapper(); } /** @@ -89,16 +89,16 @@ public abstract class CarrierConfigService extends Service { } /** - * A wrapper around ICarrierConfigService that forwards calls to implementations of - * {@link CarrierConfigService}. + * A wrapper around ICarrierService that forwards calls to implementations of + * {@link CarrierService}. * * @hide */ - private class ICarrierConfigServiceWrapper extends ICarrierConfigService.Stub { + private class ICarrierServiceWrapper extends ICarrierService.Stub { @Override public PersistableBundle getCarrierConfig(CarrierIdentifier id) { - return CarrierConfigService.this.onLoadConfig(id); + return CarrierService.this.onLoadConfig(id); } } } diff --git a/core/java/android/service/carrier/ICarrierConfigService.aidl b/core/java/android/service/carrier/ICarrierService.aidl index abbc000..4c87585 100644 --- a/core/java/android/service/carrier/ICarrierConfigService.aidl +++ b/core/java/android/service/carrier/ICarrierService.aidl @@ -20,13 +20,13 @@ import android.os.PersistableBundle; import android.service.carrier.CarrierIdentifier; /** - * Service used to get carrier config from carrier apps. + * Service used to expose carrier-specific functionality to the system. * - * @see android.service.carrier.CarrierConfigService + * @see android.service.carrier.CarrierService * @hide */ -interface ICarrierConfigService { +interface ICarrierService { - /** @see android.service.carrier.CarrierConfigService#onLoadConfig */ + /** @see android.service.carrier.CarrierService#onLoadConfig */ PersistableBundle getCarrierConfig(in CarrierIdentifier id); } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7d39efc..9232040 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -304,7 +304,7 @@ public class CarrierConfigManager { * </p> * <p> * This method returns before the reload has completed, and - * {@link android.service.carrier.CarrierConfigService#onLoadConfig} will be called from an + * {@link android.service.carrier.CarrierService#onLoadConfig} will be called from an * arbitrary thread. * </p> */ |