diff options
author | Makoto Onuki <omakoto@google.com> | 2012-11-30 10:05:20 -0800 |
---|---|---|
committer | Makoto Onuki <omakoto@google.com> | 2012-11-30 10:05:20 -0800 |
commit | aeb3751559dc6a8ed71a9463700941303cf44ba0 (patch) | |
tree | 23b68899cfdf803e673339edf166775223df250f /telephony/java/com | |
parent | 38ddedc8adfc4d58f4bebe4a51149e4768d42f70 (diff) | |
parent | 9cd8c711a7ed0690e268fc930e6f8d0d594c17e5 (diff) | |
download | frameworks_base-aeb3751559dc6a8ed71a9463700941303cf44ba0.zip frameworks_base-aeb3751559dc6a8ed71a9463700941303cf44ba0.tar.gz frameworks_base-aeb3751559dc6a8ed71a9463700941303cf44ba0.tar.bz2 |
resolved conflicts for merge of 9cd8c711 to master
Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828
Diffstat (limited to 'telephony/java/com')
-rw-r--r-- | telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl b/telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl deleted file mode 100644 index facdc49..0000000 --- a/telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl +++ /dev/null @@ -1,31 +0,0 @@ -package com.android.internal.telephony; - -/** - * Interface used to interact with extended MMI/USSD network service. - */ -interface IExtendedNetworkService { - /** - * Set a MMI/USSD command to ExtendedNetworkService for further process. - * This should be called when a MMI command is placed from panel. - * @param number the dialed MMI/USSD number. - */ - void setMmiString(String number); - - /** - * return the specific string which is used to prompt MMI/USSD is running - */ - CharSequence getMmiRunningText(); - - /** - * Get specific message which should be displayed on pop-up dialog. - * @param text original MMI/USSD message response from framework - * @return specific user message correspond to text. null stands for no pop-up dialog need to show. - */ - CharSequence getUserMessage(CharSequence text); - - /** - * Clear pre-set MMI/USSD command. - * This should be called when user cancel a pre-dialed MMI command. - */ - void clearMmiString(); -} |