summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-06-10 10:10:42 -0700
committerThe Android Automerger <android-build@android.com>2013-06-12 16:24:42 -0700
commita8489beed54264caf54676e93e77b62b4ced712b (patch)
tree66773ed21592c86b8d1b107a1363eb8736fee011
parent27979946cbcdbbe1748231de12b5a40ce3e95117 (diff)
downloadbase-a8489beed54264caf54676e93e77b62b4ced712b.tar.gz
Allow carrier provisioning to turn toggle radio power.
Previously CarrierProvisioning toggle airplane mode, but now that's available only by the system. Bug: 9356811 Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
-rw-r--r--CleanSpec.mk1
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl5
2 files changed, 6 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4debdc23ce8d..0c3ccecf6a09 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -160,6 +160,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/view/IInputMethodSession.*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/view/IInputMethodCallback.*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index b78f589b76ff..584411b83db7 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();