summaryrefslogtreecommitdiffstats
path: root/telephony/java/com
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-07-10 18:21:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-10 18:21:48 +0000
commit1ebcb6f8b2f989c84311555f4961506dba959d37 (patch)
treef225769ed35548c4f38e2fb2089b028aa0ad06c6 /telephony/java/com
parent77cae7869dba770f9ec8054b312a29dea8f317f4 (diff)
parent9bc8299ca0b2e8396b9f2f027c440cda164ba75e (diff)
downloadframeworks_base-1ebcb6f8b2f989c84311555f4961506dba959d37.zip
frameworks_base-1ebcb6f8b2f989c84311555f4961506dba959d37.tar.gz
frameworks_base-1ebcb6f8b2f989c84311555f4961506dba959d37.tar.bz2
Merge "Fix permissions." into mnc-dev
Diffstat (limited to 'telephony/java/com')
-rw-r--r--telephony/java/com/android/internal/telephony/ITelephony.aidl12
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 6db88a7..a93e465 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