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

Commit fb40dd4d authored by Wink Saville's avatar Wink Saville
Browse files

Merge kwd to master 

Add initial IMS and MSIM support from klp-wireless-dev-mirror

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
parent 6dfa6e2a

Android.mk

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

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

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

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

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

	wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \

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

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,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-base_intermediates/src/core/java/android/app)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/android/app/wearable)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/tv/ITv*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)



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

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

core/java/android/provider/Settings.java

+47 −0
Original line number Diff line number Diff line
@@ -6547,6 +6547,53 @@ public final class Settings { 
        public static boolean putFloat(ContentResolver cr, String name, float value) {

            return putString(cr, name, Float.toString(value));

        }





        /**

          * Subscription to be used for voice call on a multi sim device. The supported values

          * are 0 = SUB1, 1 = SUB2 and etc.

          * @hide

          */

        public static final String MULTI_SIM_VOICE_CALL_SUBSCRIPTION = "multi_sim_voice_call";



        /**

          * Used to provide option to user to select subscription during dial.

          * The supported values are 0 = disable or 1 = enable prompt.

          * @hide

          */

        public static final String MULTI_SIM_VOICE_PROMPT = "multi_sim_voice_prompt";



        /**

          * Subscription to be used for data call on a multi sim device. The supported values

          * are 0 = SUB1, 1 = SUB2 and etc.

          * @hide

          */

        public static final String MULTI_SIM_DATA_CALL_SUBSCRIPTION = "multi_sim_data_call";



        /**

          * Subscription to be used for SMS on a multi sim device. The supported values

          * are 0 = SUB1, 1 = SUB2 and etc.

          * @hide

          */

        public static final String MULTI_SIM_SMS_SUBSCRIPTION = "multi_sim_sms";



       /**

          * Used to provide option to user to select subscription during send SMS.

          * The value 1 - enable, 0 - disable

          * @hide

          */

        public static final String MULTI_SIM_SMS_PROMPT = "multi_sim_sms_prompt";







        /** User preferred subscriptions setting.

          * This holds the details of the user selected subscription from the card and

          * the activation status. Each settings string have the coma separated values

          * iccId,appType,appId,activationStatus,3gppIndex,3gpp2Index

          * @hide

         */

        public static final String[] MULTI_SIM_USER_PREFERRED_SUBS = {"user_preferred_sub1",

                "user_preferred_sub2","user_preferred_sub3"};

    }



    /**

core/res/res/drawable-hdpi/sim_dark_blue.9.png

0 → 100755
+167 B
Loading image diff...

core/res/res/drawable-hdpi/sim_dark_green.9.png

0 → 100755
+168 B
Loading image diff...