Commit: e7a578e95ca12834659bda07a0109c4de132b6ec - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revisão: e7a578e95ca12834659bda07a0109c4de132b6ec (tree)
• Hora: 2016-09-29 21:37:59
• Autor: Steve Kondik <steve@cyng...>
• Commiter: Steve Kondik

Mensagem de Log

Merge branch 'android_ui.lnx.2.1.r5-rel' of git://codeaurora.org/platform/packages/apps/Settings into cm-14.0

Change-Id: I26bb722ee150b0f5e9e20df736acb4f4cc794efd

Mudança Sumário

• modified: AndroidManifest.xml
• add: res/layout/wfc_checkbox.xml
• modified: res/values-zh-rCN/arrays.xml
• modified: res/values-zh-rCN/strings.xml
• modified: res/values-zh-rHK/arrays.xml
• modified: res/values-zh-rTW/arrays.xml
• modified: res/values/arrays.xml
• modified: res/values/bools.xml
• modified: res/values/config.xml
• modified: res/values/customize.xml
• modified: res/values/strings.xml
• modified: res/xml/device_info_settings.xml
• modified: res/xml/location_settings.xml
• modified: res/xml/power_usage_summary.xml
• modified: res/xml/wireless_settings.xml
• modified: src/com/android/settings/ApnEditor.java
• modified: src/com/android/settings/ApnSettings.java
• modified: src/com/android/settings/AppListPreference.java
• modified: src/com/android/settings/ConfirmLockPattern.java
• modified: src/com/android/settings/DeviceInfoSettings.java
• modified: src/com/android/settings/TetherSettings.java
• add: src/com/android/settings/WFCPreference.java
• modified: src/com/android/settings/WifiCallingSettings.java
• modified: src/com/android/settings/WirelessSettings.java
• modified: src/com/android/settings/bluetooth/DeviceProfilesSettings.java
• modified: src/com/android/settings/datausage/AppDataUsage.java
• modified: src/com/android/settings/datausage/DataUsageSummary.java
• modified: src/com/android/settings/datausage/UnrestrictedDataAccess.java
• modified: src/com/android/settings/deviceinfo/SimStatus.java
• modified: src/com/android/settings/fuelgauge/PowerUsageSummary.java
• modified: src/com/android/settings/location/LocationSettings.java
• modified: src/com/android/settings/wifi/AdvancedWifiSettings.java
• modified: src/org/codeaurora/wfcservice/IWFCService.aidl

Diff

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -492,7 +492,6 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
-                <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.action.SETTINGS" />

--- /dev/null
+++ b/res/layout/wfc_checkbox.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:gravity="center_vertical"
+    android:minHeight="48dp"
+    android:paddingEnd="?android:attr/scrollbarSize" >
+
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+id/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:text="@string/wifi_calling_settings_title"
+            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+id/subsummary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/subtitle"
+            android:layout_alignStart="@+id/subtitle"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </RelativeLayout>
+
+    <Switch
+        android:id="@+id/switchWidget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="false"
+        android:padding="8dip" />
+
+</LinearLayout>
\ No newline at end of file

--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -224,6 +224,7 @@
     <item msgid="6062567900587138000">"SPN"</item>
     <item msgid="2454085083342423481">"IMSI"</item>
     <item msgid="2681427309183221543">"GID"</item>
+    <item>"ICCID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"内部存储设备"</item>

--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3143,4 +3143,6 @@
     <string name="profiles_settings_title">情景模式</string>
 
     <string name="mbn_version">MBN 版本</string>
+    <string name="show_battery_percentage">显示电池电量百分比</string>
+    <string name="show_battery_percentage_summary">在状态栏中显示电池电量百分比</string>
 </resources>

--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -224,6 +224,7 @@
     <item msgid="6062567900587138000">"SPN"</item>
     <item msgid="2454085083342423481">"IMSI"</item>
     <item msgid="2681427309183221543">"GID"</item>
+    <item>"ICCID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"內部裝置儲存空間"</item>

--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -224,6 +224,7 @@
     <item msgid="6062567900587138000">"SPN"</item>
     <item msgid="2454085083342423481">"IMSI"</item>
     <item msgid="2681427309183221543">"GID"</item>
+    <item>"ICCID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"內部裝置儲存空間"</item>

--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1061,5 +1061,25 @@
         <item>com.qualcomm.qti.RIDL</item>
         <item>com.android.localphone</item>
         <item>com.android.sim</item>
+        <item>com.android.alice</item>
+        <item>com.android.yahoo</item>
+        <item>com.android.outlook</item>
+        <item>com.android.gmail</item>
+        <item>com.android.aol</item>
+        <item>com.android.free</item>
+        <item>com.android.laposte</item>
+        <item>com.android.sfr</item>
+        <item>com.android.orange</item>
+        <item>com.android.noos</item>
+    </string-array>
+
+    <string-array name="plmn_list_for_apn_disable">
+        <item>20404</item>
+        <item>45403</item>
+        <item>45404</item>
+        <item>45502</item>
+        <item>45507</item>
+        <item>46003</item>
+        <item>46011</item>
     </string-array>
 </resources>

--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -39,6 +39,9 @@
     <!-- Whether to show a preference item for mobile plan -->
     <bool name="config_show_mobile_plan">true</bool>
 
+    <!-- Whether to add AGPS parameter settings -->
+    <bool name="config_agps_enabled">false</bool>
+
     <!-- Whether none security option is hide or not  (country specific). -->
     <bool name="config_hide_none_security_option">false</bool>
 
@@ -98,4 +101,6 @@
     <bool name="config_hidesupl_enable">false</bool>
     <!-- Whether to hide mms apn-->
     <bool name="config_hide_mms_enable">false</bool>
+    <!-- show pop up notification for turn off wifi begin -->
+    <bool name="hotspot_show_turn_off_wifi_dialog">false</bool>
 </resources>

--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -56,6 +56,10 @@
     <!-- show tethering help begin -->
     <bool name="tethering_show_help_for_first_using">false</bool>
     <bool name="tethering_show_help_menu">false</bool>
+
+    <!-- Config to enable/disable the USB line-->
+    <bool name="config_usb_line_enable">false</bool>
+
     <!-- show tethering help end -->
     <!-- Config voice over lte in wireless settings begin -->
     <bool name="config_voice_over_lte_enabled">false</bool>

--- a/res/values/customize.xml
+++ b/res/values/customize.xml
@@ -33,4 +33,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <!-- Whether to show_kernel version name -->
     <bool name="def_hide_kernel_version_name">false</bool>
+    <!-- Whether to show a preference item for battery percentage
+        in ("Battery") for India RJIL -->
+    <bool name="config_show_battery_percentage">false</bool>
 </resources>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2286,6 +2286,8 @@
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="build_number">Build number</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+    <string name="qgp_version">QGP Version</string>
+    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
     <string name="selinux_status">SELinux status</string>
 
     <!-- About phone screen, show when a value of some status item is unavailable. -->
@@ -7588,4 +7590,11 @@
     <string name="protected_apps">Protected apps</string>
     <string name="saving_protected_components">Saving component state</string>
 
+    <string name="lte_data_and_voice_calling_enabled">LTE data and Voice Calling (IMS/VoLTE) service enabled </string>
+    <string name="lte_data_service_enabled">LTE data service enabled </string>
+    <string name="turn_off_wifi_dialog_title">Turn off Wi-Fi</string>
+    <string name="turn_off_wifi_dialog_text">Wi-Fi is turned off when Mobile HotSpot is active. To turn on Wi-Fi, please turn off Mobile HotSpot.</string>
+    <string name="show_battery_percentage">Show battery percentage</string>
+    <string name="show_battery_percentage_summary">Show battery level percentage inside the status bar</string>
+
 </resources>

--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -158,6 +158,12 @@
                 android:title="@string/build_number"
                 android:summary="@string/device_info_default"/>
 
+        <!-- Device QGP version -->
+        <Preference android:key="qgp_version"
+                style="?android:preferenceInformationStyle"
+                android:title="@string/qgp_version"
+		android:summary="@string/device_info_default"/>
+
         <!-- SELinux status information -->
         <Preference android:key="selinux_status"
                 android:enabled="false"

--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -38,6 +38,12 @@
             android:key="location_services"
             android:title="@string/location_category_location_services" />
 
+        <CheckBoxPreference
+            android:key="assisted_gps"
+            android:title="@string/assisted_gps"
+            android:summaryOn="@string/assisted_gps_enabled"
+            android:summaryOff="@string/assisted_gps_disabled"/>
+
         <com.android.settings.DividedCategory
             android:key="recent_location_requests"
             android:title="@string/location_category_recent_location_requests" />

--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -23,6 +23,12 @@
             android:title="@string/battery_saver"
             android:fragment="com.android.settings.fuelgauge.BatterySaverSettings" />
 
+        <SwitchPreference
+            android:key="battery_pct"
+            android:title="@string/show_battery_percentage"
+            android:summary="@string/show_battery_percentage_summary"
+            android:persistent="false" />
+
         <com.android.settings.fuelgauge.BatteryHistoryPreference
             android:key="battery_history" />
 

--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved.-->
+
 <!-- Copyright (C) 2008 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,17 +36,12 @@
         settings:keywords="@string/keywords_wifi_calling"
         android:fragment="com.android.settings.WifiCallingSettings" />
 
-    <PreferenceScreen
+    <com.android.settings.WFCPreference
         android:key="wifi_calling_enhanced_settings"
-        android:title="@string/wifi_calling_settings_title"
         android:summaryOff="@null"
         android:summaryOn="@null"
-        android:persistent="false">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.qualcomm.qti.wfcservice"
-            android:targetClass="com.qualcomm.qti.wfcservice.WifiCallingEnhancedSettings" />
-    </PreferenceScreen>
+        android:persistent="false"
+        android:layout="@layout/wfc_checkbox" />
 
     <com.android.settingslib.RestrictedPreference
         android:fragment="com.android.settings.nfc.AndroidBeam"

--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -100,6 +100,7 @@ public class ApnEditor extends SettingsPreferenceFragment
     private Cursor mCursor;
     private boolean mNewApn;
     private boolean mFirstTime;
+    private boolean mApnDisable = false;
     private int mSubId;
     private Resources mRes;
     private TelephonyManager mTelephonyManager;
@@ -206,10 +207,6 @@ public class ApnEditor extends SettingsPreferenceFragment
         mSubId = intent.getIntExtra(ApnSettings.SUB_ID,
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID);
         mDisableEditor = intent.getBooleanExtra("DISABLE_EDITOR", false);
-        if (mDisableEditor) {
-            getPreferenceScreen().setEnabled(false);
-            Log.d(TAG, "ApnEditor form is disabled.");
-        }
 
         mFirstTime = icicle == null;
 
@@ -404,6 +401,24 @@ public class ApnEditor extends SettingsPreferenceFragment
         } else {
             mCarrierEnabled.setEnabled(false);
         }
+
+        String mccMnc = mMcc.getText() + mMnc.getText();
+        for (String plmn : getResources().getStringArray(R.array.plmn_list_for_apn_disable)) {
+            if (plmn.equals(mccMnc) && !mNewApn) {
+                mApnDisable = true;
+                Log.d(TAG, "APN is China Telecom's.");
+                break;
+            }
+        }
+        if (mDisableEditor) {
+            if (mApnDisable) {
+                mApn.setEnabled(false);
+                Log.d(TAG, "Apn Name can't be edited.");
+            } else {
+                getPreferenceScreen().setEnabled(false);
+                Log.d(TAG, "ApnEditor form is disabled.");
+            }
+        }
     }
 
     /**
@@ -550,12 +565,12 @@ public class ApnEditor extends SettingsPreferenceFragment
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        if (mDisableEditor) {
+        if (mDisableEditor && !mApnDisable) {
             Log.d(TAG, "Form is disabled. Do not create the options menu.");
             return;
         }
         // If it's a new APN, then cancel will delete the new entry in onPause
-        if (!mNewApn) {
+        if (!mNewApn && !mDisableEditor) {
             menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
                 .setIcon(R.drawable.ic_menu_delete);
         }

--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -43,6 +43,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -64,6 +65,8 @@ import com.android.internal.telephony.uicc.UiccController;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
 
 public class ApnSettings extends RestrictedSettingsFragment implements
         Preference.OnPreferenceChangeListener {
@@ -89,6 +92,8 @@ public class ApnSettings extends RestrictedSettingsFragment implements
     private static final int MVNO_TYPE_INDEX = 4;
     private static final int MVNO_MATCH_DATA_INDEX = 5;
     private static final int RO_INDEX = 6;
+    private static final int BEARER_INDEX = 7;
+    private static final int BEARER_BITMASK_INDEX = 8;
 
     private static final int MENU_NEW = Menu.FIRST;
     private static final int MENU_RESTORE = Menu.FIRST + 1;
@@ -126,6 +131,8 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
     }
 
+    private HashSet mIccidSet;
+
     private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -136,8 +143,6 @@ public class ApnSettings extends RestrictedSettingsFragment implements
                 case CONNECTED:
                     if (!mRestoreDefaultApnMode) {
                         fillList();
-                    } else {
-                        showDialog(DIALOG_RESTORE_DEFAULTAPN);
                     }
                     break;
                 }
@@ -165,6 +170,9 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         final Activity activity = getActivity();
         final int subId = activity.getIntent().getIntExtra(SUB_ID,
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        fillOperatorIccidset();
+        Log.d(TAG, "onCreate: subId = " + subId);
+
 
         mMobileStateFilter = new IntentFilter(
                 TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
@@ -251,6 +259,23 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         return null;
     }
 
+    private void fillOperatorIccidset(){
+        mIccidSet = new HashSet<String>();
+        mIccidSet.add("8991840");
+        mIccidSet.add("8991854");
+        mIccidSet.add("8991855");
+        mIccidSet.add("8991856");
+        mIccidSet.add("8991857");
+        mIccidSet.add("8991858");
+        mIccidSet.add("8991859");
+        mIccidSet.add("899186");
+        mIccidSet.add("8991870");
+        mIccidSet.add("8991871");
+        mIccidSet.add("8991872");
+        mIccidSet.add("8991873");
+        mIccidSet.add("8991874");
+    }
+
     private void fillList() {
         final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         final String mccmnc = mSubscriptionInfo == null ? ""
@@ -305,11 +330,15 @@ public class ApnSettings extends RestrictedSettingsFragment implements
             where.append(" AND NOT (type='ims')");
         }
 
+        if (isOperatorIccId()) {
+            where.append(" AND type <>\"" + PhoneConstants.APN_TYPE_EMERGENCY + "\"");
+            where.append(" AND type <>\"" + PhoneConstants.APN_TYPE_IMS + "\"");
+        }
         Log.d(TAG, "where---" + where);
 
         Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
-                "_id", "name", "apn", "type", "mvno_type", "mvno_match_data", "read_only"},
-                where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER);
+                "_id", "name", "apn", "type", "mvno_type", "mvno_match_data", "read_only", "bearer",
+                "bearer_bitmask"}, where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         if (cursor != null) {
             IccRecords r = null;
@@ -339,7 +368,22 @@ public class ApnSettings extends RestrictedSettingsFragment implements
                 if (!TextUtils.isEmpty(localizedName)) {
                     name = localizedName;
                 }
-
+                int bearer = cursor.getInt(BEARER_INDEX);
+                int bearerBitMask = cursor.getInt(BEARER_BITMASK_INDEX);
+                int fullBearer = bearer | bearerBitMask;
+                int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
+                        : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+                int radioTech = networkTypeToRilRidioTechnology(TelephonyManager.getDefault()
+                        .getDataNetworkType(subId));
+                if (!ServiceState.bitmaskHasTech(fullBearer, radioTech)
+                        && (bearer != 0 || bearerBitMask != 0)) {
+                    // In OOS, show APN with bearer as default
+                    if ((radioTech != ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN) || (bearer == 0
+                            && radioTech == ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN)) {
+                        cursor.moveToNext();
+                        continue;
+                    }
+                }
                 ApnPreference pref = new ApnPreference(getPrefContext());
 
                 pref.setApnReadOnly(readOnly);
@@ -379,6 +423,61 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         }
     }
 
+    private boolean isOperatorIccId(){
+        final String iccid = mSubscriptionInfo == null ? ""
+                : mSubscriptionInfo.getIccId();
+        Iterator<String> itr = mIccidSet.iterator();
+        while (itr.hasNext()) {
+            if (iccid.contains(itr.next())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private int networkTypeToRilRidioTechnology(int nt) {
+        switch(nt) {
+            case TelephonyManager.NETWORK_TYPE_GPRS:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_GPRS;
+            case TelephonyManager.NETWORK_TYPE_EDGE:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_EDGE;
+            case TelephonyManager.NETWORK_TYPE_UMTS:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_UMTS;
+            case TelephonyManager.NETWORK_TYPE_HSDPA:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_HSDPA;
+            case TelephonyManager.NETWORK_TYPE_HSUPA:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_HSUPA;
+            case TelephonyManager.NETWORK_TYPE_HSPA:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_HSPA;
+            case TelephonyManager.NETWORK_TYPE_CDMA:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_IS95B;
+            case TelephonyManager.NETWORK_TYPE_1xRTT:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT;
+            case TelephonyManager.NETWORK_TYPE_EVDO_0:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_0;
+            case TelephonyManager.NETWORK_TYPE_EVDO_A:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_A;
+            case TelephonyManager.NETWORK_TYPE_EVDO_B:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_EVDO_B;
+            case TelephonyManager.NETWORK_TYPE_EHRPD:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD;
+            case TelephonyManager.NETWORK_TYPE_LTE:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_LTE;
+            case TelephonyManager.NETWORK_TYPE_HSPAP:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP;
+            case TelephonyManager.NETWORK_TYPE_GSM:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_GSM;
+            case TelephonyManager.NETWORK_TYPE_TD_SCDMA:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA;
+            case TelephonyManager.NETWORK_TYPE_IWLAN:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;
+            case TelephonyManager.NETWORK_TYPE_LTE_CA:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA;
+            default:
+                return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
+        }
+    }
+
     public static String getLocalizedName(Context context, Cursor cursor, int index) {
         // If can find a localized name, replace the APN name with it
         String resName = cursor.getString(index);
@@ -483,13 +582,13 @@ public class ApnSettings extends RestrictedSettingsFragment implements
 
         ContentValues values = new ContentValues();
         values.put(APN_ID, mSelectedKey);
-        resolver.update(PREFERAPN_URI, values, null, null);
+        resolver.update(getUri(PREFERAPN_URI), values, null, null);
     }
 
     private String getSelectedApnKey() {
         String key = null;
 
-        Cursor cursor = getContentResolver().query(PREFERAPN_URI, new String[] {"_id"},
+        Cursor cursor = getContentResolver().query(getUri(PREFERAPN_URI), new String[] {"_id"},
                 null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
         if (cursor.getCount() > 0) {
             cursor.moveToFirst();
@@ -560,7 +659,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
             switch (msg.what) {
                 case EVENT_RESTORE_DEFAULTAPN_START:
                     ContentResolver resolver = getContentResolver();
-                    resolver.delete(DEFAULTAPN_URI, null, null);
+                    resolver.delete(getUri(DEFAULTAPN_URI), null, null);
                     mRestoreApnUiHandler
                         .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
                     break;
@@ -582,4 +681,13 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         }
         return null;
     }
+
+    private Uri getUri(Uri uri) {
+        int subId = SubscriptionManager.getDefaultDataSubscriptionId();
+        if (mSubscriptionInfo != null && SubscriptionManager.isValidSubscriptionId(
+                mSubscriptionInfo.getSubscriptionId())) {
+            subId = mSubscriptionInfo.getSubscriptionId();
+        }
+        return Uri.withAppendedPath(uri, "/subId/" + subId);
+    }
 }

--- a/src/com/android/settings/AppListPreference.java
+++ b/src/com/android/settings/AppListPreference.java
@@ -52,6 +52,8 @@ import java.util.List;
 public class AppListPreference extends CustomListPreference {
 
     public static final String ITEM_NONE_VALUE = "";
+    public static final int TYPE_PACKAGE = 0;
+    public static final int TYPE_COMPONENT = 1;
 
     protected final boolean mForWork;
     protected final int mUserId;
@@ -60,6 +62,7 @@ public class AppListPreference extends CustomListPreference {
     private boolean mShowItemNone = false;
     private CharSequence[] mSummaries;
     private int mSystemAppIndex = -1;
+    private int mType = TYPE_PACKAGE;
 
     public class AppArrayAdapter extends ArrayAdapter<CharSequence> {
         private Drawable[] mImageDrawables = null;
@@ -189,6 +192,8 @@ public class AppListPreference extends CustomListPreference {
     public void setComponentNames(ComponentName[] componentNames, ComponentName defaultCN,
             CharSequence[] summaries) {
         mSummaries = summaries;
+        mType = TYPE_COMPONENT;
+
         // Look up all package names in PackageManager. Skip ones we can't find.
         PackageManager pm = getContext().getPackageManager();
         final int entryCount = componentNames.length + (mShowItemNone ? 1 : 0);
@@ -257,7 +262,18 @@ public class AppListPreference extends CustomListPreference {
         if (state instanceof SavedState) {
             SavedState savedState = (SavedState) state;
             mShowItemNone = savedState.showItemNone;
-            setPackageNames(savedState.entryValues, savedState.value);
+            if (mType == TYPE_PACKAGE) {
+                setPackageNames(savedState.entryValues, savedState.value);
+            } else if (mType == TYPE_COMPONENT) {
+                int len = savedState.entryValues.length;
+                ComponentName[] entryValues = new ComponentName[len];
+                for(int i = 0; i < len; i++) {
+                    entryValues[i] = ComponentName.unflattenFromString(
+                        savedState.entryValues[i]+"");
+                }
+                setComponentNames(entryValues,
+                    ComponentName.unflattenFromString(savedState.value+""));
+            }
             mSummaries = savedState.summaries;
             super.onRestoreInstanceState(savedState.superState);
         } else {

--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -100,6 +100,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
 
         private AppearAnimationUtils mAppearAnimationUtils;
         private DisappearAnimationUtils mDisappearAnimationUtils;
+        private boolean mIsScale = false;
+        private final float mScale = 0.65f;
 
         // required constructor for fragments
         public ConfirmLockPatternFragment() {
@@ -122,6 +124,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
             mLeftSpacerLandscape = view.findViewById(R.id.leftSpacer);
             mRightSpacerLandscape = view.findViewById(R.id.rightSpacer);
 
+            resizePattern();
+
             // make it so unhandled touch events within the unlock screen go to the
             // lock pattern view.
             final LinearLayoutWithDefaultTouchRecepient topLayout
@@ -215,6 +219,27 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
             mCredentialCheckResultTracker.setListener(this);
         }
 
+        private void resizePattern() {
+            if ((getActivity() != null) && getActivity().isInMultiWindowMode()) {
+                mIsScale = true;
+                ViewGroup.LayoutParams lp = mLockPatternView.getLayoutParams();
+                lp.width *=  mScale;
+                lp.height *= mScale;
+                mLockPatternView.setLayoutParams(lp);
+            }
+        }
+
+        @Override
+        public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
+            super.onMultiWindowModeChanged(isInMultiWindowMode);
+            if (!isInMultiWindowMode && mIsScale) {
+                ViewGroup.LayoutParams lp = mLockPatternView.getLayoutParams();
+                lp.width /=  mScale;
+                lp.height /= mScale;
+                mLockPatternView.setLayoutParams(lp);
+            }
+        }
+
         @Override
         protected void onShowError() {
         }

--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -76,6 +76,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
     private static final String KEY_MOD_VERSION = "mod_version";
     private static final String KEY_MOD_BUILD_DATE = "build_date";
     private static final String KEY_MOD_API_LEVEL = "mod_api_level";
+    private static final String KEY_QGP_VERSION = "qgp_version";
+    private static final String PROPERTY_QGP_VERSION = "persist.qgp.version";
 
     static final int TAPS_TO_BE_A_DEVELOPER = 7;
 
@@ -123,6 +125,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
         setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
         findPreference(KEY_BUILD_NUMBER).setEnabled(true);
+        setValueSummary(KEY_QGP_VERSION, PROPERTY_QGP_VERSION);
+        // Remove QGP Version if property is not present
+        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_QGP_VERSION,
+                PROPERTY_QGP_VERSION);
         findPreference(KEY_KERNEL_VERSION).setSummary(DeviceInfoUtils.customizeFormatKernelVersion(
                 getResources().getBoolean(R.bool.def_hide_kernel_version_name)));
         setValueSummary(KEY_MBN_VERSION, PROPERTY_MBN_VERSION);

--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -32,6 +32,7 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiConfiguration.AuthAlgorithm;
@@ -64,6 +65,10 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
 import static android.net.ConnectivityManager.TETHERING_USB;
 import static android.net.ConnectivityManager.TETHERING_WIFI;
 
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+
 /*
  * Displays preferences for Tethering.
  */
@@ -83,6 +88,7 @@ public class TetherSettings extends RestrictedSettingsFragment
     private static final String SHAREPREFERENCE_DEFAULT_WIFI = "def_wifiap_set";
     private static final String SHAREPREFERENCE_FIFE_NAME = "MY_PERFS";
     private static final String KEY_FIRST_LAUNCH_HOTSPOT = "FirstLaunchHotspotTethering";
+    private static final String KEY_TURN_OFF_WIFI_SHOW_AGAIN = "TurnOffWifiShowAgain";
     private static final String ACTION_HOTSPOT_PRE_CONFIGURE = "Hotspot_PreConfigure";
     private static final String ACTION_HOTSPOT_POST_CONFIGURE = "Hotspot_PostConfigure";
     private static final String CONFIGURE_RESULT = "PreConfigure_result";
@@ -144,6 +150,10 @@ public class TetherSettings extends RestrictedSettingsFragment
     private DataSaverBackend mDataSaverBackend;
     private boolean mDataSaverEnabled;
     private Preference mDataSaverFooter;
+    /* Record the wifi status before usb tether is on */
+    private boolean mUsbEnable = false;
+    private WifiManager mWifiStatusManager;
+    private boolean mIsWifiEnabled = false;
 
     @Override
     protected int getMetricsCategory() {
@@ -262,6 +272,9 @@ public class TetherSettings extends RestrictedSettingsFragment
         }
         // Set initial state based on Data Saver mode.
         onDataSaverChanged(mDataSaverBackend.isDataSaverEnabled());
+        mUsbEnable = getResources().getBoolean(R.bool.config_usb_line_enable);
+        mWifiStatusManager= (WifiManager) getActivity().getSystemService(
+                Context.WIFI_SERVICE);
     }
 
     @Override
@@ -358,6 +371,12 @@ public class TetherSettings extends RestrictedSettingsFragment
                 updateState();
             } else if (action.equals(UsbManager.ACTION_USB_STATE)) {
                 mUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);
+                mMassStorageActive = Environment.MEDIA_SHARED.equals(
+                        Environment.getExternalStorageState());
+                boolean usbAvailable = mUsbConnected && !mMassStorageActive;
+                if(!usbAvailable && mIsWifiEnabled && mUsbEnable){
+                    mWifiManager.setWifiEnabled(true);
+                }
                 updateState();
             } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
                 if (mBluetoothEnableForTether) {
@@ -601,6 +620,9 @@ public class TetherSettings extends RestrictedSettingsFragment
                 getPrefContext().startActivity(intent);
                 ((HotspotPreference)preference).setChecked(false);
                 return false;
+            } else if(checkWifiConnectivityState(getActivity())) {
+                showTurnOffWifiDialog(getActivity());
+                startTethering(TETHERING_WIFI);
             } else {
                 startTethering(TETHERING_WIFI);
             }
@@ -610,6 +632,45 @@ public class TetherSettings extends RestrictedSettingsFragment
         return false;
     }
 
+    private boolean checkWifiConnectivityState(Context ctx) {
+        if(mCm == null) {
+            ConnectivityManager mCm = (ConnectivityManager) ctx.
+                    getSystemService(Context.CONNECTIVITY_SERVICE);
+        }
+        NetworkInfo info = mCm == null ? null : mCm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+        return (info != null && info.isConnected());
+    }
+
+    private void showTurnOffWifiDialog(final Context ctx) {
+        LayoutInflater inflater = (LayoutInflater)ctx.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+        View showAgainView = inflater.inflate(R.layout.not_show_again, null);
+        CheckBox notShowAgainCheckbox = (CheckBox)showAgainView.findViewById(R.id.check);
+        final SharedPreferences sharedpreferences = ctx.getSharedPreferences(
+                SHAREPREFERENCE_FIFE_NAME, Context.MODE_PRIVATE);
+        boolean showAgain = sharedpreferences.getBoolean(KEY_TURN_OFF_WIFI_SHOW_AGAIN, true);
+        if (!showAgain) {
+            return;
+        } else {
+            AlertDialog.Builder alert = new AlertDialog.Builder(ctx)
+                    .setTitle(ctx.getResources().getString(R.string.turn_off_wifi_dialog_title))
+                    .setMessage(ctx.getResources().getString(R.string.turn_off_wifi_dialog_text))
+                    .setView(showAgainView)
+                    .setPositiveButton(ctx.getResources().
+                        getString(R.string.okay), new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    Editor editor = sharedpreferences.edit();
+                    editor.putBoolean(KEY_TURN_OFF_WIFI_SHOW_AGAIN,
+                            !notShowAgainCheckbox.isChecked());
+                    editor.commit();
+                }
+            });
+            alert.setCancelable(false);
+            alert.show();
+        }
+    }
+
     public static boolean isProvisioningNeededButUnavailable(Context context) {
         return (TetherUtil.isProvisioningNeeded(context)
                 && !isIntentAvailable(context));
@@ -639,16 +700,29 @@ public class TetherSettings extends RestrictedSettingsFragment
             }
         }
 
+        if (choice == TETHERING_USB) {
+            if(mUsbTether.isChecked()) {
+                mWifiManager.setWifiEnabled(false);
+            }
+        }
         mCm.startTethering(choice, true, mStartTetheringCallback, mHandler);
     }
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference == mUsbTether) {
-            if (mUsbTether.isChecked()) {
+            if (mUsbTether.isChecked() && mUsbEnable) {
+            //get the wifi status
+            mIsWifiEnabled = mWifiStatusManager.isWifiEnabled();
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(UsbManager.ACTION_USB_STATE);
+            getActivity().registerReceiver(mTetherChangeReceiver, filter);
                 startTethering(TETHERING_USB);
             } else {
                 mCm.stopTethering(TETHERING_USB);
+                if (mIsWifiEnabled) {
+                    mWifiManager.setWifiEnabled(true);
+                }
             }
         } else if (preference == mBluetoothTether) {
             if (mBluetoothTether.isChecked()) {

--- /dev/null
+++ b/src/com/android/settings/WFCPreference.java
@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2016, The Linux Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of The Linux Foundation nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.android.settings;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.Switch;
+import android.widget.TextView;
+
+public class WFCPreference extends Preference implements OnCheckedChangeListener {
+
+    private Switch mSwitch;
+    private TextView mSubSummary;
+    private Context mContext;
+    private boolean mSwitchEnabled;
+    private CharSequence remainSummary;
+
+    public WFCPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mContext = context;
+    }
+
+    public WFCPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, com.android.internal.R.attr.switchPreferenceStyle);
+        mContext = context;
+    }
+
+    public WFCPreference(Context context) {
+        this(context, null);
+        mContext = context;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+        mSubSummary = (TextView) view.findViewById(R.id.subsummary);
+        mSubSummary.setText(remainSummary);
+        mSwitch = (Switch) view.findViewById(R.id.switchWidget);
+        mSwitch.setOnCheckedChangeListener(this);
+        setChecked(mSwitchEnabled);
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        callChangeListener(isChecked);
+        mSwitchEnabled = isChecked;
+    }
+
+    public void setSummary(CharSequence summary) {
+        if (mSubSummary == null) {
+            remainSummary = summary;
+            return;
+        }
+        mSubSummary.setText(summary);
+    }
+
+    public void setChecked(boolean state) {
+        if (mSwitch != null) {
+            mSwitch.setOnCheckedChangeListener(null);
+            mSwitch.setChecked(state);
+            mSwitch.setOnCheckedChangeListener(this);
+        }
+        mSwitchEnabled=state;
+    }
+}

--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -29,6 +29,8 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.widget.Switch;
@@ -60,35 +62,50 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
     private ListPreference mButtonWfcMode;
     private TextView mEmptyView;
 
+    private int[] mCallState = null;
+    private PhoneStateListener[] mPhoneStateListener = null;
+    private int mPhoneCount;
     private boolean mValidListener = false;
     private boolean mEditableWfcMode = true;
 
-    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+    private void initPhoneStateListeners(int phoneId) {
+        SubscriptionManager subMgr = SubscriptionManager.from(getActivity());
+        final SubscriptionInfo subInfo = subMgr.getActiveSubscriptionInfoForSimSlotIndex(phoneId);
+
+        if (subInfo == null) {
+            Log.e(TAG, "initPhoneStateListeners subInfo : " + subInfo +
+                    " for phone Id: " + phoneId);
+            return;
+        }
+
+        int subId = subInfo.getSubscriptionId();
+        final int i = phoneId;
         /*
          * Enable/disable controls when in/out of a call and depending on
          * TTY mode and TTY support over VoLTE.
          * @see android.telephony.PhoneStateListener#onCallStateChanged(int,
          * java.lang.String)
          */
-        @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
-            final SettingsActivity activity = (SettingsActivity) getActivity();
-            boolean isNonTtyOrTtyOnVolteEnabled = ImsManager
-                    .isNonTtyOrTtyOnVolteEnabled(activity);
-            final SwitchBar switchBar = activity.getSwitchBar();
-            boolean isWfcEnabled = switchBar.getSwitch().isChecked()
-                    && isNonTtyOrTtyOnVolteEnabled;
-
-            switchBar.setEnabled((state == TelephonyManager.CALL_STATE_IDLE)
-                    && isNonTtyOrTtyOnVolteEnabled);
-
-            Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
-            if (pref != null) {
-                pref.setEnabled(isWfcEnabled
-                        && (state == TelephonyManager.CALL_STATE_IDLE));
+        mPhoneStateListener[phoneId]  = new PhoneStateListener(subId) {
+            @Override
+            public void onCallStateChanged(int state, String incomingNumber) {
+                final SettingsActivity activity = (SettingsActivity) getActivity();
+                boolean isNonTtyOrTtyOnVolteEnabled = ImsManager
+                        .isNonTtyOrTtyOnVolteEnabled(activity);
+                final SwitchBar switchBar = activity.getSwitchBar();
+                boolean isWfcEnabled = switchBar.getSwitch().isChecked()
+                        && isNonTtyOrTtyOnVolteEnabled;
+
+                mCallState[i] = state;
+                switchBar.setEnabled(isCallStateIdle() && isNonTtyOrTtyOnVolteEnabled);
+
+                Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
+                if (pref != null) {
+                    pref.setEnabled(isWfcEnabled && isCallStateIdle());
+                }
             }
-        }
-    };
+        };
+    }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -182,6 +199,10 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
             mButtonWfcMode.setEntries(R.array.wifi_calling_mode_choices_without_wifi_only);
             mButtonWfcMode.setEntryValues(R.array.wifi_calling_mode_values_without_wifi_only);
         }
+
+        mPhoneCount = TelephonyManager.getDefault().getPhoneCount();
+        mPhoneStateListener = new PhoneStateListener[mPhoneCount];
+        mCallState = new int[mPhoneCount];
     }
 
     @Override
@@ -191,8 +212,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         final Context context = getActivity();
 
         if (ImsManager.isWfcEnabledByPlatform(context)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+            registerPhoneStateListeners(context);
 
             mSwitchBar.addOnSwitchChangeListener(this);
 
@@ -224,8 +244,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         if (mValidListener) {
             mValidListener = false;
 
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+            unRegisterPhoneStateListeners(context);
 
             mSwitchBar.removeOnSwitchChangeListener(this);
         }
@@ -233,6 +252,30 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         context.unregisterReceiver(mIntentReceiver);
     }
 
+    private void registerPhoneStateListeners(Context context) {
+        TelephonyManager tm =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        for (int i = 0; i < mPhoneCount; i++) {
+            initPhoneStateListeners(i);
+            if (mPhoneStateListener[i] != null) {
+                Log.d(TAG, "Register for call state change for phone Id: " + i);
+                tm.listen(mPhoneStateListener[i], PhoneStateListener.LISTEN_CALL_STATE);
+            }
+        }
+    }
+
+    private void unRegisterPhoneStateListeners(Context context) {
+        TelephonyManager tm =
+               (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        for (int i = 0; i < mPhoneCount; i++) {
+            if (mPhoneStateListener[i] != null) {
+                Log.d(TAG, "unRegister for call state change for phone Id: " + i);
+                tm.listen(mPhoneStateListener[i], PhoneStateListener.LISTEN_NONE);
+                mPhoneStateListener[i] = null;
+            }
+        }
+    }
+
     /**
      * Listens to the state change of the switch.
      */
@@ -299,4 +342,15 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         }
         return resId;
     }
+
+    private boolean isCallStateIdle() {
+        boolean callStateIdle = true;
+        for (int i = 0; i < mCallState.length; i++) {
+            if (TelephonyManager.CALL_STATE_IDLE != mCallState[i]) {
+                callStateIdle = false;
+            }
+        }
+        Log.d(TAG, "isCallStateIdle " + callStateIdle);
+        return callStateIdle;
+    }
 }

--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -1,3 +1,5 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.*/
+
 /*
  * Copyright (C) 2009 The Android Open Source Project
  *
@@ -84,6 +86,10 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
     private static final String KEY_WFC_SETTINGS = "wifi_calling_settings";
     private static final String KEY_WFC_ENHANCED_SETTINGS = "wifi_calling_enhanced_settings";
 
+    private static final String ACTION_WIFI_CALL_ON = "com.android.wificall.TURNON";
+    private static final String ACTION_WIFI_CALL_OFF = "com.android.wificall.TURNOFF";
+    private static final String WIFI_CALLING_PREFERRED = "preference";
+
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
 
@@ -102,10 +108,11 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
     private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
-    private PreferenceScreen mButtonWfc;
+    private Preference mButtonWfc;
     private boolean mEnhancedWFCSettingsEnabled = false;
 
     private IWFCService mWFCService;
+
     private ServiceConnection mConnection = new ServiceConnection() {
 
         public void onServiceConnected(ComponentName className, IBinder service) {
@@ -124,15 +131,25 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
     };
 
     private IWFCServiceCB mCallback = new IWFCServiceCB.Stub() {
-        public void updateWFCMessage(String s) {
-            if (!mEnhancedWFCSettingsEnabled || (s == null)) {
+        public void updateWFCMessage(String errorCode) {
+            if (!mEnhancedWFCSettingsEnabled || (errorCode == null)) {
                 if(DEBUG) Log.e(TAG, "updateWFCMessage fail.");
                 return ;
             }
             getActivity().runOnUiThread(new Runnable() {
                 public void run() {
-                    if(DEBUG) Log.d (TAG, "new UI thread.");
-                    mButtonWfc.setSummary(s);
+                    if (DEBUG) Log.d(TAG, "new UI thread.");
+                    try {
+                        if (mWFCService.getWifiCallingStatus()) {
+                            if (mButtonWfc instanceof WFCPreference) {
+                                ((WFCPreference) mButtonWfc).setSummary(errorCode);
+                            } else {
+                                mButtonWfc.setSummary(errorCode);
+                            }
+                        }
+                    } catch (RemoteException r) {
+                        Log.e(TAG, "getWifiCallingStatus RemoteException");
+                    }
                 }
             });
 
@@ -303,6 +320,14 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
         return MetricsEvent.WIRELESS;
     }
 
+    private void broadcastWifiCallingStatus(Context ctx, boolean isTurnOn, int preference) {
+        if(DEBUG) Log.d(TAG, "broadcastWifiCallingStatus:");
+        Intent intent = new Intent(isTurnOn ? ACTION_WIFI_CALL_ON
+                    : ACTION_WIFI_CALL_OFF);
+        intent.putExtra(WIFI_CALLING_PREFERRED, preference);
+        ctx.sendBroadcast(intent);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -332,21 +357,52 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
         mEnhancedWFCSettingsEnabled = getActivity().getResources().getBoolean(
                     R.bool.wifi_call_enhanced_setting);
         if (mEnhancedWFCSettingsEnabled) {
-            mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_ENHANCED_SETTINGS);
+            mButtonWfc = (WFCPreference) findPreference(KEY_WFC_ENHANCED_SETTINGS);
             removePreference(KEY_WFC_SETTINGS);
+            mButtonWfc.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+                public boolean onPreferenceClick(Preference preference) {
+                    Intent intent = new Intent();
+                    intent.setAction("android.intent.action.MAIN");
+                    intent.setPackage("com.qualcomm.qti.wfcservice");
+                    intent.setClassName("com.qualcomm.qti.wfcservice",
+                            "com.qualcomm.qti.wfcservice.WifiCallingEnhancedSettings");
+                    mButtonWfc.setIntent(intent);
+                    return false;
+                }
+            });
+
+            mButtonWfc.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object value) {
+                    int wfcPreference = -1;
+                    try {
+                        wfcPreference = mWFCService.getWifiCallingPreference();
+                    } catch (RemoteException re) {
+                        Log.e(TAG, "getWifiCallingPreference RemoteException");
+                        return false;
+                    }
+
+                    boolean isChecked = (Boolean) value;
+
+                    try {
+                        mWFCService.setWifiCalling(isChecked, wfcPreference);
+                    } catch (RemoteException r) {
+                        Log.e(TAG, "setWifiCalling RemoteException");
+                    }
+
+                    if (!isChecked) {
+                        ((WFCPreference) preference).setSummary(R.string.disabled);
+                    }
+
+                    broadcastWifiCallingStatus(getActivity(), isChecked, wfcPreference);
+                    return false;
+                }
+            });
         } else {
             mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
             removePreference(KEY_WFC_ENHANCED_SETTINGS);
         }
 
-        if (mEnhancedWFCSettingsEnabled) {
-            //bind WFC service
-            final Intent intentWfc = new Intent();
-            intentWfc.setAction("com.qualcomm.qti.wfcservice.IWFCService");
-            intentWfc.setPackage("com.qualcomm.qti.wfcservice");
-            activity.bindService(intentWfc, mConnection, Context.BIND_AUTO_CREATE);
-        }
-
         String toggleable = Settings.Global.getString(activity.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
 
@@ -475,6 +531,14 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
     public void onResume() {
         super.onResume();
 
+        if (mEnhancedWFCSettingsEnabled && mWFCService == null) {
+            //bind WFC service
+            final Intent intentWfc = new Intent();
+            intentWfc.setAction("com.qualcomm.qti.wfcservice.IWFCService");
+            intentWfc.setPackage("com.qualcomm.qti.wfcservice");
+            getActivity().bindService(intentWfc, mConnection, Context.BIND_AUTO_CREATE);
+        }
+
         mAirplaneModeEnabler.resume();
         if (mNfcEnabler != null) {
             mNfcEnabler.resume();
@@ -486,12 +550,15 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
             getPreferenceScreen().addPreference(mButtonWfc);
             if (!mEnhancedWFCSettingsEnabled) {
                 mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
-                        context, ImsManager.getWfcMode(context)));
+                       context, ImsManager.getWfcMode(context)));
             } else {
                 if (!ImsManager.isWfcEnabledByUser(context)) {
-                    mButtonWfc.setSummary(R.string.disabled);
+                    ((WFCPreference) mButtonWfc).setChecked(false);
+                    ((WFCPreference) mButtonWfc).setSummary(R.string.disabled);
                 } else {
-                    mButtonWfc.setSummary(SystemProperties.get("sys.wificall.status.msg"));
+                    ((WFCPreference) mButtonWfc).setChecked(true);
+                    ((WFCPreference) mButtonWfc).setSummary(
+                            SystemProperties.get("sys.wificall.status.msg"));
                 }
             }
         } else {

--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -66,6 +66,7 @@ public final class DeviceProfilesSettings extends DialogFragment implements
     private ViewGroup mProfileContainer;
     private TextView mProfileLabel;
     private EditTextPreference mDeviceNamePref;
+    private static final int OK_BUTTON = -1;
 
     private final HashMap<LocalBluetoothProfile, CheckBoxPreference> mAutoConnectPrefs
             = new HashMap<LocalBluetoothProfile, CheckBoxPreference>();
@@ -173,11 +174,16 @@ public final class DeviceProfilesSettings extends DialogFragment implements
     private void addPreferencesForProfiles() {
         mProfileContainer.removeAllViews();
         for (LocalBluetoothProfile profile : mCachedDevice.getConnectableProfiles()) {
-            CheckBox pref = createProfilePreference(profile);
-            mProfileContainer.addView(pref);
+            // MAP and PBAP profiles would be added based on permission access
+            if (!((profile instanceof PbapServerProfile) ||
+                (profile instanceof MapProfile))) {
+                CheckBox pref = createProfilePreference(profile);
+                mProfileContainer.addView(pref);
+            }
         }
 
         final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+        Log.d(TAG, "addPreferencesForProfiles: pbapPermission = " + pbapPermission);
         // Only provide PBAP cabability if the client device has requested PBAP.
         if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
             final PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
@@ -187,6 +193,7 @@ public final class DeviceProfilesSettings extends DialogFragment implements
 
         final MapProfile mapProfile = mManager.getProfileManager().getMapProfile();
         final int mapPermission = mCachedDevice.getMessagePermissionChoice();
+        Log.d(TAG, "addPreferencesForProfiles: mapPermission = " + mapPermission);
         if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
             CheckBox mapPreference = createProfilePreference(mapProfile);
             mProfileContainer.addView(mapPreference);
@@ -241,15 +248,6 @@ public final class DeviceProfilesSettings extends DialogFragment implements
     private void onProfileClicked(LocalBluetoothProfile profile, CheckBox profilePref) {
         BluetoothDevice device = mCachedDevice.getDevice();
 
-        if (KEY_PBAP_SERVER.equals(profilePref.getTag())) {
-            final int newPermission = mCachedDevice.getPhonebookPermissionChoice()
-                == CachedBluetoothDevice.ACCESS_ALLOWED ? CachedBluetoothDevice.ACCESS_REJECTED
-                : CachedBluetoothDevice.ACCESS_ALLOWED;
-            mCachedDevice.setPhonebookPermissionChoice(newPermission);
-            profilePref.setChecked(newPermission == CachedBluetoothDevice.ACCESS_ALLOWED);
-            return;
-        }
-
         if (!profilePref.isChecked()) {
             // Recheck it, until the dialog is done.
             profilePref.setChecked(true);
@@ -258,6 +256,11 @@ public final class DeviceProfilesSettings extends DialogFragment implements
             if (profile instanceof MapProfile) {
                 mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
             }
+            if (profile instanceof PbapServerProfile) {
+                mCachedDevice.setPhonebookPermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+                refreshProfilePreference(profilePref, profile);
+                return;
+            }
             if (profile.isPreferred(device)) {
                 // profile is preferred but not connected: disable auto-connect
                 if (profile instanceof PanProfile) {
@@ -291,10 +294,18 @@ public final class DeviceProfilesSettings extends DialogFragment implements
         DialogInterface.OnClickListener disconnectListener =
                 new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int which) {
-                device.disconnect(profile);
-                profile.setPreferred(device.getDevice(), false);
-                if (profile instanceof MapProfile) {
-                    device.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+
+                // Disconnect only when user has selected OK
+                if (which == OK_BUTTON) {
+                    device.disconnect(profile);
+                    profile.setPreferred(device.getDevice(), false);
+                    if (profile instanceof MapProfile) {
+                        device.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+                    }
+                    if (profile instanceof PbapServerProfile) {
+                        device.setPhonebookPermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+                    }
+
                 }
                 refreshProfilePreference(findProfile(profile.toString()), profile);
             }
@@ -331,6 +342,19 @@ public final class DeviceProfilesSettings extends DialogFragment implements
         for (LocalBluetoothProfile profile : mCachedDevice.getRemovedProfiles()) {
             CheckBox profilePref = findProfile(profile.toString());
             if (profilePref != null) {
+
+                if (profile instanceof PbapServerProfile) {
+                    final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+                    Log.d(TAG, "refreshProfiles: pbapPermission = " + pbapPermission);
+                    if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN)
+                        continue;
+                }
+                if (profile instanceof MapProfile) {
+                    final int mapPermission = mCachedDevice.getMessagePermissionChoice();
+                    Log.d(TAG, "refreshProfiles: mapPermission = " + mapPermission);
+                    if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN)
+                        continue;
+                }
                 Log.d(TAG, "Removing " + profile.toString() + " from profile list");
                 mProfileContainer.removeView(profilePref);
             }

--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -51,7 +51,6 @@ import com.android.settingslib.net.ChartDataLoader;
 import com.android.settingslib.net.UidDetailProvider;
 
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
-import static android.net.TrafficStats.UID_TETHERING;
 
 public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
         DataSaverBackend.Listener {
@@ -202,20 +201,6 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
                 mLabel = Utils.getUserLabel(getActivity(), info);
                 mPackageName = getActivity().getPackageName();
             }
-            int userId = 0;
-            //UID_TETHERING will return wrong userId from UidDetailProvider, user UserHandle instead
-            if (mAppItem.key == UID_TETHERING) {
-                userId = UserHandle.getUserId(mAppItem.key);
-            } else {
-                userId = UidDetailProvider.getUserIdForKey(mAppItem.key);
-            }
-
-            final UserManager um = UserManager.get(getActivity());
-            final UserInfo info = um.getUserInfo(userId);
-            final PackageManager pm = getPackageManager();
-            mIcon = Utils.getUserIcon(getActivity(), um, info);
-            mLabel = Utils.getUserLabel(getActivity(), info);
-            mPackageName = getActivity().getPackageName();
             removePreference(KEY_UNRESTRICTED_DATA);
             removePreference(KEY_APP_SETTINGS);
             removePreference(KEY_RESTRICT_BACKGROUND);
@@ -251,6 +236,9 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (com.android.settings.Utils.isMonkeyRunning()) {
+            return false;
+        }
         if (preference == mRestrictBackground) {
             mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
             return true;

--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -134,6 +134,10 @@ public class DataUsageSummary extends DataUsageBase implements Indexable {
     public void onPrepareOptionsMenu(Menu menu) {
         final Context context = getActivity();
         final MenuItem networkaccess = menu.findItem(R.id.data_usage_menu_app_network_access);
+        if (networkaccess == null) {
+            return;
+        }
+
         if (context.getResources().getBoolean(R.bool.config_app_network_access_enabled)) {
             networkaccess.setVisible(true);
         } else {

--- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java
@@ -250,7 +250,7 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment
 
         @Override
         protected void onClick() {
-            if (mState.isDataSaverBlacklisted) {
+            if (mState != null && mState.isDataSaverBlacklisted) {
                 // app is blacklisted, launch App Data Usage screen
                 InstalledAppDetails.startAppInfoFragment(AppDataUsage.class,
                         getContext().getString(R.string.app_data_usage),

--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -27,6 +27,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.PersistableBundle;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -286,6 +287,20 @@ public class SimStatus extends SettingsPreferenceFragment {
         if (networktype != null && networktype.equals("LTE") && show4GForLTE) {
             networktype = "4G";
         }
+
+        String property = SystemProperties.get("persist.radio.atel.carrier");
+        boolean isCarrierOneSupported = "405854".equals(property);
+        if (isCarrierOneSupported) {
+            if (TelephonyManager.NETWORK_TYPE_LTE == actualDataNetworkType ||
+                    TelephonyManager.NETWORK_TYPE_LTE == actualVoiceNetworkType) {
+                if (mTelephonyManager.isImsRegistered()) {
+                    networktype = getResources().
+                            getString(R.string.lte_data_and_voice_calling_enabled);
+                } else {
+                    networktype = getResources().getString(R.string.lte_data_service_enabled);
+                }
+            }
+         }
         setSummaryText(KEY_NETWORK_TYPE, networktype);
     }
 

--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -28,6 +28,8 @@ import android.os.Process;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
+import android.support.v14.preference.SwitchPreference;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.util.TypedValue;
@@ -56,6 +58,7 @@ import java.util.List;
  */
 public class PowerUsageSummary extends PowerUsageBase {
 
+    public static final String SHOW_PERCENT_SETTING = "status_bar_show_battery_percent";
     private static final boolean DEBUG = false;
 
     private static final boolean USE_FAKE_DATA = false;
@@ -64,6 +67,7 @@ public class PowerUsageSummary extends PowerUsageBase {
 
     private static final String KEY_APP_LIST = "app_list";
     private static final String KEY_BATTERY_HISTORY = "battery_history";
+    private static final String KEY_BATTERY_PCT = "battery_pct";
 
     private static final int MENU_STATS_TYPE = Menu.FIRST;
     private static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;
@@ -71,8 +75,10 @@ public class PowerUsageSummary extends PowerUsageBase {
 
     private BatteryHistoryPreference mHistPref;
     private PreferenceGroup mAppListGroup;
+    private SwitchPreference mBatteryPct;
 
     private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
+    private boolean isShowBatteryPct;
 
     private static final int MIN_POWER_THRESHOLD_MILLI_AMP = 5;
     private static final int MAX_ITEMS_TO_LIST = USE_FAKE_DATA ? 30 : 10;
@@ -87,6 +93,11 @@ public class PowerUsageSummary extends PowerUsageBase {
         addPreferencesFromResource(R.xml.power_usage_summary);
         mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_HISTORY);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
+        mBatteryPct = (SwitchPreference) findPreference(KEY_BATTERY_PCT);
+        isShowBatteryPct = getResources().getBoolean(R.bool.config_show_battery_percentage);
+        if (!isShowBatteryPct) {
+            getPreferenceScreen().removePreference(mBatteryPct);
+        }
     }
 
     @Override
@@ -97,6 +108,9 @@ public class PowerUsageSummary extends PowerUsageBase {
     @Override
     public void onResume() {
         super.onResume();
+        if (isShowBatteryPct) {
+            updateBatteryPct();
+        }
         refreshStats();
     }
 
@@ -479,4 +493,24 @@ public class PowerUsageSummary extends PowerUsageBase {
             return new SummaryProvider(activity, summaryLoader);
         }
     };
+
+    private void updateBatteryPct() {
+        if (mBatteryPct != null) {
+            mBatteryPct.setChecked(
+                Settings.System.getInt(getContext().getContentResolver(),
+                SHOW_PERCENT_SETTING, 0) != 0);
+            mBatteryPct.setOnPreferenceChangeListener(mBatteryPctChange);
+        }
+    }
+
+    private final Preference.OnPreferenceChangeListener mBatteryPctChange =
+            new Preference.OnPreferenceChangeListener() {
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            final boolean v = (Boolean) newValue;
+            Settings.System.putInt(getContext().getContentResolver(),
+                    SHOW_PERCENT_SETTING, v ? 1 : 0);
+            return true;
+        }
+    };
 }

--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -20,6 +20,7 @@ import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -32,6 +33,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.CheckBoxPreference;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -50,9 +52,13 @@ import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.location.RecentLocationApps;
 
 import java.util.ArrayList;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Properties;
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -91,17 +97,28 @@ public class LocationSettings extends LocationSettingsBase
      * if there is a managed profile.
      */
     private static final String KEY_MANAGED_PROFILE_SWITCH = "managed_profile_location_switch";
+
+    // CMCC assisted gps SUPL(Secure User Plane Location) server address
+    private static final String ASSISTED_GPS_SUPL_HOST = "assisted_gps_supl_host";
+
+    // CMCC agps SUPL port address
+    private static final String ASSISTED_GPS_SUPL_PORT = "assisted_gps_supl_port";
+    private static final String KEY_ASSISTED_GPS = "assisted_gps";
+
     /** Key for preference screen "Mode" */
     private static final String KEY_LOCATION_MODE = "location_mode";
     /** Key for preference category "Recent location requests" */
     private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
     /** Key for preference category "Location services" */
     private static final String KEY_LOCATION_SERVICES = "location_services";
+    private static final String PROPERTIES_FILE = "/etc/gps.conf";
 
     private static final int MENU_SCANNING = Menu.FIRST;
 
+    private CheckBoxPreference mAssistedGps;
     private SwitchBar mSwitchBar;
     private Switch mSwitch;
+    private boolean mAgpsEnabled;
     private boolean mValidListener = false;
     private UserHandle mManagedProfile;
     private RestrictedSwitchPreference mManagedProfileSwitch;
@@ -199,6 +216,18 @@ public class LocationSettings extends LocationSettingsBase
                     }
                 });
 
+        mAgpsEnabled = getActivity().getResources().getBoolean(
+                        R.bool.config_agps_enabled);
+        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
+        if (!mAgpsEnabled) {
+            root.removePreference(mAssistedGps);
+        }
+
+        if (mAssistedGps != null) {
+            mAssistedGps.setChecked(Settings.Global.getInt(
+                    getContentResolver(), Settings.Global.ASSISTED_GPS_ENABLED, 0) == 1);
+        }
+
         mCategoryRecentLocationRequests =
                 (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
         RecentLocationApps recentApps = new RecentLocationApps(activity);
@@ -244,6 +273,47 @@ public class LocationSettings extends LocationSettingsBase
         return root;
     }
 
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        final ContentResolver cr = getContentResolver();
+        if (preference == mAssistedGps) {
+            if (mAssistedGps.isChecked()) {
+                if (Settings.Global.getString(cr, ASSISTED_GPS_SUPL_HOST) == null
+                        || Settings.Global
+                                .getString(cr, ASSISTED_GPS_SUPL_PORT) == null) {
+                    FileInputStream stream = null;
+                    try {
+                        Properties properties = new Properties();
+                        File file = new File(PROPERTIES_FILE);
+                        stream = new FileInputStream(file);
+                        properties.load(stream);
+                        Settings.Global.putString(cr, ASSISTED_GPS_SUPL_HOST,
+                                properties.getProperty("SUPL_HOST", null));
+                        Settings.Global.putString(cr, ASSISTED_GPS_SUPL_PORT,
+                                properties.getProperty("SUPL_PORT", null));
+                    } catch (IOException e) {
+                        Log.e("LocationSettings",
+                                "Could not open GPS configuration file "
+                                        + PROPERTIES_FILE + ", e=" + e);
+                    } finally {
+                        if (stream != null) {
+                            try {
+                                stream.close();
+                            } catch (Exception e) {
+                            }
+                       }
+                   }
+               }
+            }
+            Settings.Global.putInt(cr, Settings.Global.ASSISTED_GPS_ENABLED,
+                    mAssistedGps.isChecked() ? 1 : 0);
+        } else {
+            // If we didn't handle it, let preferences handle it.
+            return super.onPreferenceTreeClick(preference);
+        }
+
+        return true;
+    }
     private void setupManagedProfileCategory(PreferenceScreen root) {
         // Looking for a managed profile. If there are no managed profiles then we are removing the
         // managed profile category.

--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -153,7 +153,9 @@ public class AdvancedWifiSettings extends RestrictedSettingsFragment
             enableHs2.setChecked(Settings.Global.getInt(getContentResolver(),
                     Settings.Global.WIFI_HOTSPOT2_ENABLED, WIFI_HS2_DISABLED) == WIFI_HS2_ENABLED);
         } else {
-            getPreferenceScreen().removePreference(enableHs2);
+            if(enableHs2 != null){
+                getPreferenceScreen().removePreference(enableHs2);
+            }
         }
 
         Intent wifiDirectIntent = new Intent(context,

--- a/src/org/codeaurora/wfcservice/IWFCService.aidl
+++ b/src/org/codeaurora/wfcservice/IWFCService.aidl
@@ -35,5 +35,8 @@ import org.codeaurora.wfcservice.IWFCServiceCB;
 interface IWFCService {
     void registerCallback(IWFCServiceCB cb);
     void unregisterCallback(IWFCServiceCB cb);
+    void setWifiCalling(boolean state, int preference);
+    boolean getWifiCallingStatus();
+    int getWifiCallingPreference();
 }