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.
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 4debdc2..0c3ccec 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -160,6 +160,7 @@
$(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 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 @@
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();