summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorAndrew Flynn <flynn@google.com>2015-06-10 11:41:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-10 11:41:32 +0000
commitda9bbf725592c6482d6fbce18ef8c258b18e4fc8 (patch)
treeebc2c400d373af539fa4eb721c65a93ba74822e0 /telephony
parent1c96a9418447df1eee1d7323269b28bf9b3ccd66 (diff)
parentceaed68b074bd341ed9b5f13ff9cc69e3f533999 (diff)
downloadframeworks_base-da9bbf725592c6482d6fbce18ef8c258b18e4fc8.zip
frameworks_base-da9bbf725592c6482d6fbce18ef8c258b18e4fc8.tar.gz
frameworks_base-da9bbf725592c6482d6fbce18ef8c258b18e4fc8.tar.bz2
Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java29
1 files changed, 0 insertions, 29 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 1fe0f0b..12f1644 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2082,35 +2082,6 @@ public class TelephonyManager {
}
/**
- * Informs the system of an intentional upcoming carrier network change by
- * a carrier app. This call is optional and is only used to allow the
- * system to provide alternative UI while telephony is performing an action
- * that may result in intentional, temporary network lack of connectivity.
- * <p>
- * Based on the active parameter passed in, this method will either show or
- * hide the alternative UI. There is no timeout associated with showing
- * this UX, so a carrier app must be sure to call with active set to false
- * sometime after calling with it set to true.
- * <p>
- * Requires Permission:
- * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
- * Or the calling app has carrier privileges.
- * @see #hasCarrierPrivileges
- *
- * @param active Whether the carrier network change is or shortly will be
- * active. Set this value to true to begin showing
- * alternative UI and false to stop.
- */
- public void notifyCarrierNetworkChange(boolean active) {
- try {
- if (sRegistry != null)
- sRegistry.notifyCarrierNetworkChange(active);
- } catch (RemoteException ex) {
- } catch (NullPointerException ex) {
- }
- }
-
- /**
* Returns the alphabetic identifier associated with the line 1 number.
* Return null if it is unavailable.
* <p>