summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-06-12 16:16:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-12 16:16:45 -0700
commitac6c862196a62855e5c48d78b2a509943ec300b5 (patch)
tree02f90ea726b2d9850fa0c230af626c394da68260 /telephony/java
parent414fec25225acc5b6fc40c1ce92a84ae95b3fce2 (diff)
parent30af45f47fd71feee0f9e5f8e049ba0380bc7793 (diff)
downloadframeworks_base-ac6c862196a62855e5c48d78b2a509943ec300b5.zip
frameworks_base-ac6c862196a62855e5c48d78b2a509943ec300b5.tar.gz
frameworks_base-ac6c862196a62855e5c48d78b2a509943ec300b5.tar.bz2
am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
* commit '30af45f47fd71feee0f9e5f8e049ba0380bc7793': Allow carrier provisioning to turn toggle radio power.
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl5
1 files changed, 5 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index b78f589..584411b 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -174,6 +174,11 @@ interface ITelephony {
boolean setRadio(boolean turnOn);
/**
+ * Set the radio to on or off unconditionally
+ */
+ boolean setRadioPower(boolean turnOn);
+
+ /**
* Request to update location information in service state
*/
void updateServiceLocation();