Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aeb37515 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

resolved conflicts for merge of 9cd8c711 to master 

Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828
parents 38ddedc8 9cd8c711

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ LOCAL_SRC_FILES += \ 
	telephony/java/com/android/internal/telephony/ITelephony.aidl \

	telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \

	telephony/java/com/android/internal/telephony/IWapPushManager.aidl \

	telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \

	wifi/java/android/net/wifi/IWifiManager.aidl \

	wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \

	voip/java/android/net/sip/ISipSession.aidl \

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_ 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing2_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ui/*.ogg)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.P)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
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();

}