diff options
| author | Wink Saville <wink@google.com> | 2013-06-12 16:19:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-12 16:19:50 -0700 |
| commit | 9ddd70b92caf12d14f7bc81c660c19ebf950746f (patch) | |
| tree | fa60604aa2d3f0b6289bced8f21aeff13ccf3e59 | |
| parent | ac5396a3a8cac5a87b4710c458157701c94ce752 (diff) | |
| parent | ac6c862196a62855e5c48d78b2a509943ec300b5 (diff) | |
am ac6c8621: am 30af45f4: Merge "Allow carrier provisioning to turn toggle radio power." into jb-mr2-dev
* commit 'ac6c862196a62855e5c48d78b2a509943ec300b5':
Allow carrier provisioning to turn toggle radio power.
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 5 |
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(); |