diff options
| author | Andrew Flynn <flynn@google.com> | 2015-06-10 11:41:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 11:41:32 +0000 |
| commit | da9bbf725592c6482d6fbce18ef8c258b18e4fc8 (patch) | |
| tree | ebc2c400d373af539fa4eb721c65a93ba74822e0 /api | |
| parent | 1c96a9418447df1eee1d7323269b28bf9b3ccd66 (diff) | |
| parent | ceaed68b074bd341ed9b5f13ff9cc69e3f533999 (diff) | |
| download | frameworks_base-da9bbf725592c6482d6fbce18ef8c258b18e4fc8.zip frameworks_base-da9bbf725592c6482d6fbce18ef8c258b18e4fc8.tar.gz frameworks_base-da9bbf725592c6482d6fbce18ef8c258b18e4fc8.tar.bz2 | |
Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index fdcda1f..049d790 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28678,7 +28678,8 @@ package android.service.carrier { public abstract class CarrierService extends android.app.Service { ctor public CarrierService(); - method public final android.os.IBinder onBind(android.content.Intent); + method public final void notifyCarrierNetworkChange(boolean); + method public 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 BIND_SERVICE_INTERFACE = "android.service.carrier.BindService"; field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService"; @@ -31247,7 +31248,6 @@ package android.telephony { method public boolean isVoiceCapable(); method public boolean isWorldPhone(); method public void listen(android.telephony.PhoneStateListener, int); - method public void notifyCarrierNetworkChange(boolean); method public java.lang.String sendEnvelopeWithStatus(java.lang.String); method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String); method public boolean setOperatorBrandOverride(java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index 094e272..8b3c181 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30711,7 +30711,8 @@ package android.service.carrier { public abstract class CarrierService extends android.app.Service { ctor public CarrierService(); - method public final android.os.IBinder onBind(android.content.Intent); + method public final void notifyCarrierNetworkChange(boolean); + method public 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 BIND_SERVICE_INTERFACE = "android.service.carrier.BindService"; field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService"; @@ -33492,7 +33493,6 @@ package android.telephony { method public boolean isWorldPhone(); method public void listen(android.telephony.PhoneStateListener, int); method public boolean needsOtaServiceProvisioning(); - method public void notifyCarrierNetworkChange(boolean); method public java.lang.String sendEnvelopeWithStatus(java.lang.String); method public void setDataEnabled(boolean); method public void setDataEnabled(int, boolean); |