diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-10 18:38:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 18:38:15 +0000 |
| commit | d30a3d6693da16cf2daef05847ddaa4ae7453e83 (patch) | |
| tree | 463b7b286deb2766ade9e0d5b0ce7b3c5ced9739 /telephony/java/com | |
| parent | ead0cea0f57565aeb6ddc3a78ec1da3314d264a8 (diff) | |
| parent | 1ebcb6f8b2f989c84311555f4961506dba959d37 (diff) | |
| download | frameworks_base-d30a3d6693da16cf2daef05847ddaa4ae7453e83.zip frameworks_base-d30a3d6693da16cf2daef05847ddaa4ae7453e83.tar.gz frameworks_base-d30a3d6693da16cf2daef05847ddaa4ae7453e83.tar.bz2 | |
am 1ebcb6f8: Merge "Fix permissions." into mnc-dev
* commit '1ebcb6f8b2f989c84311555f4961506dba959d37':
Fix permissions.
Diffstat (limited to 'telephony/java/com')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 53011e6..661f12d 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -455,9 +455,9 @@ interface ITelephony { /** * Returns the network type for data transmission - * @param callingPackage package making the call. + * Legacy call, permission-free */ - int getNetworkType(String callingPackage); + int getNetworkType(); /** * Returns the network type of a subId. @@ -480,16 +480,12 @@ interface ITelephony { int getDataNetworkTypeForSubscriber(int subId, String callingPackage); /** - * Returns the network type for voice - */ - int getVoiceNetworkType(); - - /** * Returns the voice network type of a subId * @param subId user preferred subId. + * @param callingPackage package making the call. * Returns the network type */ - int getVoiceNetworkTypeForSubscriber(int subId); + int getVoiceNetworkTypeForSubscriber(int subId, String callingPackage); /** * Return true if an ICC card is present |