diff options
| author | Andrew Flynn <flynn@google.com> | 2015-06-09 12:36:58 +0000 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2015-06-09 16:28:54 -0400 |
| commit | ceaed68b074bd341ed9b5f13ff9cc69e3f533999 (patch) | |
| tree | a2923bc630013717a854b0ff95cea6208d9b9be1 /api | |
| parent | e50b091df9586c5c41d219ffb0c41fa3f893c329 (diff) | |
| download | frameworks_base-ceaed68b074bd341ed9b5f13ff9cc69e3f533999.zip frameworks_base-ceaed68b074bd341ed9b5f13ff9cc69e3f533999.tar.gz frameworks_base-ceaed68b074bd341ed9b5f13ff9cc69e3f533999.tar.bz2 | |
notifyCarrierNetworkChange:TelephonyManager->CarrierService
Re-checkin of 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.
ORIGINAL CHANGES:
Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.
Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
new internal callers that want to bind to it.
ADDITIONAL CHANGES:
- Fixes stack so that a SecurityException is thrown when caller
does not have MODIFY_PHONE_STATE or carrier privileges.
Bug: 21572049
Bug: 21630803
Bug: 21721768
Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
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 c9a8efb..ee1f14f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28651,7 +28651,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"; @@ -31215,7 +31216,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 2f26891..aebc187 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30684,7 +30684,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"; @@ -33459,7 +33460,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); |