Merge "bullhead/apn: update NOVA initial attach APN" into mnc-dr-dev
diff --git a/BullheadLayout/res/xml/partner_default_layout.xml b/BullheadLayout/res/xml/partner_default_layout.xml
index 33b17fa..0842c87 100644
--- a/BullheadLayout/res/xml/partner_default_layout.xml
+++ b/BullheadLayout/res/xml/partner_default_layout.xml
@@ -13,188 +13,34 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <!-- Google-specific version of Launcher3/res/xml/default_workspace.xml -->
 <favorites>
-
-    <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
-    <!-- Dialer Messaging [All Apps] Browser Camera -->
-
-    <favorite
-        container="-101"
-        screen="0"
-        x="0"
-        y="0"
-        packageName="com.google.android.dialer"
-        className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
-    />
-
-    <favorite
-        container="-101"
-        screen="1"
-        x="1"
-        y="0"
-        packageName="com.google.android.apps.messaging"
-        className="com.google.android.apps.messaging.ui.ConversationListActivity"
-    />
-
-    <favorite
-        container="-101"
-        screen="3"
-        x="2"
-        y="0"
-        packageName="com.android.chrome"
-        className="com.google.android.apps.chrome.Main"
-    />
-
-    <favorite
-        container="-101"
-        screen="4"
-        x="3"
-        y="0"
-        packageName="com.google.android.GoogleCamera"
-        className="com.android.camera.CameraActivity"
-    />
-
-    <!-- In Launcher3, workspaces extend infinitely to the right, incrementing from zero -->
-
-	<!-- Google folder -->
-	<!-- Google, Maps, Gmail, G+, Calendar, Photos, YouTube, News & Weather, Hangouts -->
-
-	<folder
-			title="@string/google_folder_title"
-			screen="0"
-			x="0"
-			y="4">
-
-			<favorite
-	                packageName="com.google.android.googlequicksearchbox"
-	                className="com.google.android.googlequicksearchbox.SearchActivity"
-	                />
-
-			<favorite
-		            packageName="com.google.android.apps.maps"
-					className="com.google.android.maps.MapsActivity"
-			        />
-
-			<favorite
-	                packageName="com.google.android.gm"
-	                className="com.google.android.gm.ConversationListActivityGmail"
-	                />
-
-			<favorite
-				    packageName="com.google.android.apps.plus"
-					className="com.google.android.apps.plus.phone.HomeActivity"
-					/>
-
-			<favorite
-	                packageName="com.google.android.calendar"
-	                className="com.android.calendar.AllInOneActivity"
-	                />
-
-
-			<favorite
-		            packageName="com.google.android.apps.photos"
-				    className="com.google.android.apps.photos.home.HomeActivity"
-					/>
-
-			<favorite
-		            packageName="com.google.android.youtube"
-					className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"
-			        />
-
-			<favorite
-		            packageName="com.google.android.apps.genie.geniewidget"
-					className="com.google.android.apps.genie.geniewidget.activities.NewsActivity"
-			        />
-
-			<favorite
-		            packageName="com.google.android.talk"
-					className="com.google.android.talk.SigningInActivity"
-			        />
-
-	</folder>
-
-	<!-- Create folder -->
-	<!-- Docs, Sheets, Slides, Drive, Keep -->
-
-	<folder
-			title="@string/create_folder_title"
-			screen="0"
-			x="1"
-			y="4">
-
-			<favorite
-	                packageName="com.google.android.apps.docs.editors.docs"
-	                className="com.google.android.apps.docs.app.NewMainProxyActivity"
-	                />
-
-			<favorite
-					packageName="com.google.android.apps.docs.editors.sheets"
-			        className="com.google.android.apps.docs.app.NewMainProxyActivity"
-			        />
-
-			<favorite
-					packageName="com.google.android.apps.docs.editors.slides"
-			        className="com.google.android.apps.docs.app.NewMainProxyActivity"
-			        />
-
-			<favorite
-	                packageName="com.google.android.apps.docs"
-	                className="com.google.android.apps.docs.app.NewMainProxyActivity"
-	                />
-
-			<favorite
-		            packageName="com.google.android.keep"
-					className="com.google.android.keep.activities.BrowseActivity"
-			        />
-
-	</folder>
-
-	<!-- Play folder -->
-	<!-- Movies, Music, Games, Books, Newsstand -->
-
-	<folder
-			title="@string/play_folder_title"
-			screen="0"
-			x="3"
-			y="4">
-
-			<favorite
-		            packageName="com.google.android.videos"
-					className="com.google.android.youtube.videos.EntryPoint"
-			        />
-
-			<favorite
-	                packageName="com.google.android.music"
-	                className="com.android.music.activitymanagement.TopLevelActivity"
-	                />
-
-			<favorite
-	                packageName="com.google.android.play.games"
-	                className="com.google.android.gms.games.ui.destination.main.MainActivity"
-	                />
-
-			<favorite
-		            packageName="com.google.android.apps.books"
-					className="com.google.android.apps.books.app.BooksActivity"
-			        />
-
-			<favorite
-	                packageName="com.google.android.apps.magazines"
-	                className="com.google.apps.dots.android.app.activity.CurrentsStartActivity"
-	                />
-
-	</folder>
-
-	<favorite
-        screen="0"
-        x="4"
-        y="4"
-        packageName="com.android.vending"
-        className="com.android.vending.AssetBrowserActivity"
-    />
-
-    <!-- Any other installed apps will appear in All Apps -->
-
+  <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
+  <!-- Dialer Messaging [All Apps] Browser Camera -->
+  <favorite container="-101" screen="0" x="0" y="0" packageName="com.google.android.dialer" className="com.google.android.dialer.extensions.GoogleDialtactsActivity"/>
+  <favorite container="-101" screen="1" x="1" y="0" packageName="com.google.android.apps.messaging" className="com.google.android.apps.messaging.ui.ConversationListActivity"/>
+  <favorite container="-101" screen="3" x="2" y="0" packageName="com.android.chrome" className="com.google.android.apps.chrome.Main"/>
+  <favorite container="-101" screen="4" x="3" y="0" packageName="com.google.android.GoogleCamera" className="com.android.camera.CameraActivity"/>
+  <!-- In Launcher3, workspaces extend infinitely to the right, incrementing from zero -->
+  <!-- Google folder -->
+  <!-- Google, Maps, Gmail, Calendar, Photos, YouTube, Hangouts -->
+  <folder title="@string/google_folder_title" screen="0" x="0" y="4">
+    <favorite packageName="com.google.android.googlequicksearchbox" className="com.google.android.googlequicksearchbox.SearchActivity"/>
+    <favorite packageName="com.google.android.apps.maps" className="com.google.android.maps.MapsActivity"/>
+    <favorite packageName="com.google.android.gm" className="com.google.android.gm.ConversationListActivityGmail"/>
+    <favorite packageName="com.google.android.calendar" className="com.android.calendar.AllInOneActivity"/>
+    <favorite packageName="com.google.android.apps.photos" className="com.google.android.apps.photos.home.HomeActivity"/>
+    <favorite packageName="com.google.android.youtube" className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>
+    <favorite packageName="com.google.android.talk" className="com.google.android.talk.SigningInActivity"/>
+  </folder>
+  <!-- Play folder -->
+  <!-- Movies, Music, Games -->
+  <folder title="@string/play_folder_title" screen="0" x="3" y="4">
+    <favorite packageName="com.google.android.videos" className="com.google.android.youtube.videos.EntryPoint"/>
+    <favorite packageName="com.google.android.music" className="com.android.music.activitymanagement.TopLevelActivity"/>
+    <favorite packageName="com.google.android.play.games" className="com.google.android.gms.games.ui.destination.main.MainActivity"/>
+  </folder>
+  <favorite screen="0" x="4" y="4" packageName="com.android.vending" className="com.android.vending.AssetBrowserActivity"/>
+  <!-- Any other installed apps will appear in All Apps -->
 </favorites>
+
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6573d49..7bc29cc 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -66,3 +66,5 @@
 $(call add-clean-step, find $(OUT_DIR)/target/product/bullhead/ -name \*build.prop* -exec rm -rf {} \;)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/system_build_prop_intermediates/build.prop)
+$(call add-clean-step, find $(OUT_DIR)/target/product/bullhead/ -name \*build.prop* -exec rm -rf {} \;)
+$(call add-clean-step, find $(OUT_DIR)/target/product/bullhead/ -name \*build.prop* -exec rm -rf {} \;)
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 4a5ffcd..4a98a45 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -558,14 +558,17 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="KPN/Hi 4G LTE Mobiel internet"
+  <apn carrier="USCCROAMING"
       mcc="204"
-      mnc="08"
-      apn="KPN4G.nl"
-      mmsc="http://mp.mobiel.kpn/mmsc"
-      mmsproxy="10.10.100.20"
-      mmsport="5080"
-      type="default,supl,mms"
+      mnc="04"
+      apn="usccinternet"
+      mmsport=""
+      mmsproxy=""
+      mmsc="http://mmsc1.uscc.net/mmsc/MMS"
+      mvno_type="spn"
+      mvno_match_data="U.S. Cellular"
+      type="mms,fota,default,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="KPN/Hi Mobiel Internet"
@@ -652,7 +655,7 @@
   <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="16"
-      apn="internet"
+      apn="smartsites.t-mobile"
       authtype="1"
       type="default,supl"
   />
@@ -701,6 +704,13 @@
       mvno_type="spn"
   />
 
+  <apn carrier="Ziggo mobiel internet"
+      mcc="204"
+      mnc="18"
+      apn="internet.ziggo.nl"
+      type="default,supl"
+  />
+
   <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="20"
@@ -711,7 +721,7 @@
   <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="20"
-      apn="internet"
+      apn="smartsites.t-mobile"
       authtype="1"
       type="default,supl"
   />
@@ -2141,7 +2151,7 @@
       type="ia"
   />
 
-  <apn carrier="T-Mobile H MMS"
+  <apn carrier="Telekom HU MMS"
       mcc="216"
       mnc="30"
       apn="internet.telekom"
@@ -2152,11 +2162,11 @@
       authtype="1"
   />
 
-  <apn carrier="T-Mobile H"
+  <apn carrier="Telekom HU NET"
       mcc="216"
       mnc="30"
       apn="internet.telekom"
-      type="default,supl"
+      type="default,dun,supl"
       authtype="1"
   />
 
@@ -2541,7 +2551,7 @@
       type="default,supl"
   />
 
-  <apn carrier="TIM DUN (IT)"
+  <apn carrier="TIM Web"
       mcc="222"
       mnc="01"
       apn="ibox.tim.it"
@@ -2549,7 +2559,7 @@
       type="dun"
   />
 
-  <apn carrier="TIM MMS"
+  <apn carrier="iTIM"
       mcc="222"
       mnc="01"
       apn="unico.tim.it"
@@ -2755,14 +2765,14 @@
       mvno_match_data="ERG"
   />
 
-  <apn carrier="WIND WEB"
+  <apn carrier="INTERNET WIND"
       mcc="222"
       mnc="88"
       apn="internet.wind"
       type="default,supl"
   />
 
-  <apn carrier="WIND MMS"
+  <apn carrier="MMS WIND"
       mcc="222"
       mnc="88"
       apn="mms.wind"
@@ -2989,8 +2999,6 @@
       mcc="228"
       mnc="01"
       apn="gprs.swisscom.ch"
-      proxy="192.168.210.1"
-      port="8080"
       type="default,supl"
   />
 
@@ -3011,14 +3019,14 @@
       type="mms"
   />
 
-  <apn carrier="Orange Internet"
+  <apn carrier="Salt Internet"
       mcc="228"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="Salt MMS"
       mcc="228"
       mnc="03"
       apn="mms"
@@ -6581,8 +6589,6 @@
       user="simobil"
       password="internet"
       authtype="1"
-      proxy="80.95.224.17"
-      port="9201"
       type="default,supl"
   />
 
@@ -6605,7 +6611,6 @@
       apn="internet"
       user="mobitel"
       password="internet"
-      authtype="1"
       mmsc="http://mms.mobitel.si/servlets/mms"
       mmsproxy="213.229.249.40"
       mmsport="8080"
@@ -6622,27 +6627,14 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Tusmobil Internet"
+  <apn carrier="Internet"
       mcc="293"
       mnc="70"
-      apn="internet.tusmobil.si"
-      user="tusmobil"
-      password="internet"
-      authtype="1"
-      type="default,supl"
-  />
-
-  <apn carrier="Tusmobil MMS"
-      mcc="293"
-      mnc="70"
-      apn="mms.tusmobil.si"
-      user="tusmobil"
-      password="mms"
-      authtype="1"
-      mmsc="http://mms.tusmobil.si:8002"
+      apn="internet"
+      mmsc="http://mms.telemach.net:8002"
       mmsproxy="91.185.221.85"
       mmsport="8080"
-      type="mms"
+      type="default,supl,mms"
   />
 
   <apn carrier="Telemach Internet"
@@ -6731,6 +6723,27 @@
       type="mms"
   />
 
+  <apn carrier="Telenor MNE mms"
+      mcc="297"
+      mnc="01"
+      apn="mms"
+      authtype="0"
+      mmsc="http://mm.vor.telenor.me"
+      mmsproxy="192.168.246.005"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Telenor MNE internet"
+      mcc="297"
+      mnc="01"
+      apn="internet"
+      authtype="0"
+      proxy="192.168.246.005"
+      port="8080"
+      type="default,supl"
+  />
+
   <apn carrier="T-Mobile MMS"
       mcc="297"
       mnc="02"
@@ -6865,6 +6878,23 @@
       mvno_type="gid"
   />
 
+  <apn carrier="MMS"
+      mcc="302"
+      mnc="270"
+      apn="mms.mobi.eastlink.ca"
+      mmsc="http://mmss.mobi.eastlink.ca"
+      mmsproxy="10.232.12.49"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Internet"
+      mcc="302"
+      mnc="270"
+      apn="wisp.mobi.eastlink.ca"
+      type="default,supl"
+  />
+
   <apn carrier="MOWAP"
       mcc="302"
       mnc="320"
@@ -6884,23 +6914,27 @@
       type="mms"
   />
 
-  <apn carrier="MMS"
-      mcc="302"
-      mnc="270"
-      apn="mms.mobi.eastlink.ca"
-      mmsc="http://mmss.mobi.eastlink.ca"
-      mmsproxy="10.232.12.49"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="Internet"
       mcc="302"
-      mnc="270"
-      apn="wisp.mobi.eastlink.ca"
+      mnc="370"
+      apn="movil.vtr.com"
+      user="vtrmovil"
+      password="vtrmovil"
+      authtype="2"
       type="default,supl"
   />
 
+  <apn carrier="MMS"
+      mcc="302"
+      mnc="370"
+      apn="mms.vtr.com"
+      authtype="0"
+      mmsproxy="194.168.94.210"
+      mmsc="http://192.168.94.162:19090/was"
+      mmsport="9028"
+      type="mms"
+  />
+
   <apn carrier="Fido Tethering"
       mcc="302"
       mnc="370"
@@ -15591,6 +15625,8 @@
       password="webgprs2002"
       authtype="1"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
 
@@ -15605,6 +15641,8 @@
       mmsport="8080"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
 
@@ -23701,7 +23739,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="Zain JO WAP"
       mcc="416"
       mnc="01"
@@ -23714,18 +23751,6 @@
       type="default,supl"
   />
 
-
-  <apn carrier="Zain JO Streaming"
-      mcc="416"
-      mnc="01"
-      apn="Zain"
-      user="zain"
-      password="zain"
-      authtype="1"
-      type="default,supl"
-  />
-
-
   <apn carrier="Zain JO MMS"
       mcc="416"
       mnc="01"
@@ -23739,7 +23764,6 @@
       type="mms"
   />
 
-
   <apn carrier="Umniah internet"
       mcc="416"
       mnc="03"
@@ -24960,7 +24984,7 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="IMS"
+  <apn carrier="ims"
       mcc="440"
       mnc="10"
       apn="ims"
@@ -24968,7 +24992,7 @@
       protocol="IPV6"
   />
 
-  <apn carrier="sp-mode"
+  <apn carrier="SP-MODE"
       mcc="440"
       mnc="10"
       apn="spmode.ne.jp"
@@ -24978,200 +25002,138 @@
       type="default,supl"
   />
 
-  <apn carrier="mopera U"
+  <apn carrier="IMS"
       mcc="440"
-      mnc="10"
-      apn="mopera.net"
-      user=""
-      server=""
-      password=""
-      type="default,supl"
+      mnc="00"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
   />
 
-  <apn carrier="b-mobile for Nexus"
+  <apn carrier="Application"
       mcc="440"
-      mnc="10"
-      apn="bmobile.ne.jp"
-      user="bmobile@nx"
-      server=""
-      password="bmobile"
-      authtype="3"
-      type="default,supl"
+      mnc="00"
+      apn="plus.acs.jp"
+      user="ym"
+      password="ym"
+      mmsproxy="andmms.plusacs.ne.jp"
+      mmsport="8080"
+      mmsc="http://mms-s"
+      type="default,mms,supl,hipri"
+      authtype="2"
   />
 
-  <apn carrier="IIJmio"
+  <apn carrier="IMS"
       mcc="440"
-      mnc="10"
-      apn="iijmio.jp"
-      user="mio@iij"
-      server=""
-      password="iij"
-      authtype="3"
+      mnc="20"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="Application"
+      mcc="440"
+      mnc="20"
+      apn="plus.acs.jp"
+      user="ym"
+      password="ym"
+      mmsproxy="andmms.plusacs.ne.jp"
+      mmsport="8080"
+      mmsc="http://mms-s"
+      type="default,mms,supl,hipri"
+      authtype="2"
+  />
+
+  <apn carrier="IMS"
+      mcc="441"
+      mnc="00"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="Application"
+      mcc="441"
+      mnc="00"
+      apn="plus.acs.jp"
+      user="ym"
+      password="ym"
+      mmsproxy="andmms.plusacs.ne.jp"
+      mmsport="8080"
+      mmsc="http://mms-s"
+      type="default,mms,supl,hipri"
+      authtype="2"
+  />
+
+  <apn carrier="LTE NET"
+      mcc="440"
+      mnc="50"
+      apn="uno.au-net.ne.jp"
+      user="685840734641020@uno.au-net.ne.jp"
+      password="KpyrR6BP"
+      authtype="2"
+      mmsproxy=""
+      mmsport="80"
+      mmsc="http://mms.ezweb.ne.jp/MMS"
+      type="default,mms,supl,hipri"
       protocol="IPV4V6"
-      type="default,supl"
+      roaming_protocol="IP"
+      defaultflag="0"
+      preferapp=""
   />
 
-  <apn carrier="OCN モバイル ONE (3G)"
+  <apn carrier="LTE NET for DATA"
       mcc="440"
-      mnc="10"
-      apn="3g-d-2.ocn.ne.jp"
-      user="mobileid@ocn"
-      server=""
-      password="mobile"
+      mnc="50"
+      apn="au.au-net.ne.jp"
+      user="user@au.au-net.ne.jp"
+      password="au"
       authtype="2"
-      type="default,supl"
-  />
-
-  <apn carrier="OCN モバイル ONE (LTE)"
-      mcc="440"
-      mnc="10"
-      apn="lte-d.ocn.ne.jp"
-      user="mobileid@ocn"
-      server=""
-      password="mobile"
-      authtype="2"
-      type="default,supl"
-  />
-
-  <apn carrier="IMS"
-      mcc="440"
-      mnc="00"
-      apn="IMS"
-      type="ims"
-      protocol="IPV6"
-  />
-
-  <apn carrier="SoftBank 3G"
-      mcc="440"
-      mnc="00"
-      apn="plus.softbank"
-      user="plus"
-      password="softbank"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
+      mmsproxy=""
+      mmsport="80"
+      mmsc="http://mms.ezweb.ne.jp/MMS"
       type="default,mms,supl,hipri"
-      authtype="2"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      defaultflag="0"
+      preferapp=""
   />
 
-  <apn carrier="SoftBank 4G"
+  <apn carrier="LTE NET"
       mcc="440"
-      mnc="00"
-      apn="plus.4g"
-      user="plus"
-      password="4g"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
+      mnc="51"
+      apn="uno.au-net.ne.jp"
+      user="685840734641020@uno.au-net.ne.jp"
+      password="KpyrR6BP"
       authtype="2"
+      mmsproxy=""
+      mmsport="80"
+      mmsc="http://mms.ezweb.ne.jp/MMS"
+      type="default,mms,supl,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      defaultflag="0"
+      preferapp=""
   />
 
-  <apn carrier="Y! mobile"
+  <apn carrier="LTE NET for DATA"
       mcc="440"
-      mnc="00"
-      apn="plus.acs.jp"
-      user="ym"
-      password="ym"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
+      mnc="51"
+      apn="au.au-net.ne.jp"
+      user="user@au.au-net.ne.jp"
+      password="au"
       authtype="2"
-  />
-
-  <apn carrier="IMS"
-      mcc="440"
-      mnc="20"
-      apn="IMS"
-      type="ims"
-      protocol="IPV6"
-  />
-
-  <apn carrier="SoftBank 3G"
-      mcc="440"
-      mnc="20"
-      apn="plus.softbank"
-      user="plus"
-      password="softbank"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
+      mmsproxy=""
+      mmsport="80"
+      mmsc="http://mms.ezweb.ne.jp/MMS"
       type="default,mms,supl,hipri"
-      authtype="2"
-  />
-
-  <apn carrier="SoftBank 4G"
-      mcc="440"
-      mnc="20"
-      apn="plus.4g"
-      user="plus"
-      password="4g"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
-  />
-
-  <apn carrier="Y! mobile"
-      mcc="440"
-      mnc="20"
-      apn="plus.acs.jp"
-      user="ym"
-      password="ym"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
-  />
-
-  <apn carrier="IMS"
-      mcc="441"
-      mnc="00"
-      apn="IMS"
-      type="ims"
-      protocol="IPV6"
-  />
-
-  <apn carrier="SoftBank 3G"
-      mcc="441"
-      mnc="00"
-      apn="plus.softbank"
-      user="plus"
-      password="softbank"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
-  />
-
-  <apn carrier="SoftBank 4G"
-      mcc="441"
-      mnc="00"
-      apn="plus.4g"
-      user="plus"
-      password="4g"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
-  />
-
-  <apn carrier="Y! mobile"
-      mcc="441"
-      mnc="00"
-      apn="plus.acs.jp"
-      user="ym"
-      password="ym"
-      mmsproxy="andmms.plusacs.ne.jp"
-      mmsport="8080"
-      mmsc="http://mms-s"
-      type="default,mms,supl,hipri"
-      authtype="2"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+      defaultflag="0"
+      preferapp=""
   />
 
   <apn carrier="SKT IMS"
@@ -25534,7 +25496,7 @@
       type="mms"
   />
 
-  <apn carrier="csl"
+  <apn carrier="1O1O"
       mcc="454"
       mnc="00"
       apn="mobile"
@@ -25545,7 +25507,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="1O1O"
+  <apn carrier="csl"
       mcc="454"
       mnc="00"
       apn="mobile"
@@ -25567,7 +25529,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="csl"
+  <apn carrier="1O1O"
       mcc="454"
       mnc="02"
       apn="mobile"
@@ -25578,7 +25540,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="1O1O"
+  <apn carrier="csl"
       mcc="454"
       mnc="02"
       apn="mobile"
@@ -25733,7 +25695,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="csl"
+  <apn carrier="1O1O"
       mcc="454"
       mnc="18"
       apn="mobile"
@@ -25744,7 +25706,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="1O1O"
+  <apn carrier="csl"
       mcc="454"
       mnc="18"
       apn="mobile"
@@ -26269,13 +26231,6 @@
       type="mms"
   />
 
-  <apn carrier="VIBO-vibo"
-      mcc="466"
-      mnc="89"
-      apn="vibo"
-      type="default,supl"
-  />
-
   <apn carrier="T Star-internet"
       mcc="466"
       mnc="89"
@@ -26283,6 +26238,13 @@
       type="default,supl"
   />
 
+  <apn carrier="VIBO-vibo"
+      mcc="466"
+      mnc="89"
+      apn="vibo"
+      type="default,supl"
+  />
+
   <apn carrier="VIBOONE"
       mcc="466"
       mnc="89"
@@ -26607,6 +26569,13 @@
       type="default,supl"
   />
 
+  <apn carrier="Optus Business Mobile Broadband"
+      mcc="505"
+      mnc="02"
+      apn="yesbusiness"
+      type="default,supl"
+  />
+
   <apn carrier="Optus MMS"
       mcc="505"
       mnc="02"
@@ -26777,6 +26746,13 @@
       type="default,supl"
   />
 
+  <apn carrier="Optus Business Mobile Broadband"
+      mcc="505"
+      mnc="90"
+      apn="yesbusiness"
+      type="default,supl"
+  />
+
   <apn carrier="Optus MMS"
       mcc="505"
       mnc="90"
@@ -30640,7 +30616,7 @@
       type="mms"
   />
 
-  <apn carrier='Argentina:Nuestro:MMS'
+  <apn carrier="Nuestro MMS"
       mcc='722'
       mnc='36'
       apn='mms.nuestro.com.ar'
@@ -30652,7 +30628,7 @@
       user='mms'
   />
 
-  <apn carrier='Argentina:Nuestro:Internet'
+  <apn carrier="Nuestro Internet"
       mcc='722'
       mnc='36'
       apn='gprs.nuestro.com.ar'
@@ -31145,8 +31121,6 @@
       mmsproxy='129.192.129.104'
       mmsport='8080'
       type='mms'
-      protocol='IPV4V6'
-      roaming_protocol='IPV4V6'
   />
 
   <apn carrier='Nextel WAP'
@@ -31154,7 +31128,7 @@
       mnc='39'
       apn='wap.nextel3g.net.br'
       authtype='0'
-      type='default,dun'
+      type='default'
       protocol='IPV4V6'
       roaming_protocol='IPV4V6'
   />
@@ -31175,9 +31149,10 @@
       password="entelpcs"
       authtype="1"
       type="default,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="MMS Entel"
+  <apn carrier="MMS Entel PCS"
       mcc="730"
       mnc="01"
       apn="mms.entelpcs.cl"
@@ -31188,48 +31163,26 @@
       mmsc="http://mmsc.entelpcs.cl"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
   />
 
-  <apn carrier='Internet Nextel'
-      mcc='730'
-      mnc='09'
-      apn='wap.nextelmovil.cl'
-      authtype='0'
-      type='default'
-  />
-
-  <apn carrier='MMS Nextel'
-      mcc='730'
-      mnc='09'
-      apn='mms.nextelmovil.cl'
-      authtype='0'
-      mmsc='http://3gmms.nextelmovil.cl'
-      mmsproxy='129.192.129.104'
-      mmsport='8080'
-      type='mms'
-  />
-
-  <apn carrier="Internet Movil"
+  <apn carrier="Internet Móvil"
       mcc="730"
-      mnc="10"
-      apn="bam.entelpcs.cl"
-      user="entelpcs"
-      password="entelpcs"
-      authtype="1"
+      mnc="01"
+      apn="internet.movilfalabella.com"
       type="default,supl"
+      mvno_match_data="Falabella"
+      mvno_type="spn"
   />
 
-  <apn carrier="MMS Entel"
+  <apn carrier="MMS"
       mcc="730"
-      mnc="10"
-      apn="mms.entelpcs.cl"
-      user="entelpcs"
-      password="entelpcs"
-      mmsproxy="10.99.0.10"
-      mmsport="8080"
-      mmsc="http://mmsc.entelpcs.cl"
-      authtype="1"
+      mnc="01"
+      apn="mms.movilfalabella.com"
+      mmsc="http://mmsc.movilfalabella.com"
       type="mms"
+      mvno_match_data="Falabella"
+      mvno_type="spn"
   />
 
   <apn carrier="Movistar APLICACIONES"
@@ -31278,16 +31231,21 @@
       type="mms"
   />
 
-  <apn carrier="web"
+  <apn carrier="Virgin Internet Movil"
       mcc="730"
       mnc="07"
-      apn="web.gtdmovil.cl"
-      user="webgtd"
-      password="webgtd"
-      authtype="1"
+      apn="imovil.virginmobile.cl"
       type="default,supl"
   />
 
+  <apn carrier='Virgin MMS'
+      mcc="730"
+      mnc="07"
+      apn="mmsc.virginmobile.cl"
+      mmsc="http://mms.virginmobile.cl:1981/mms"
+      type="mms"
+  />
+
   <apn carrier="Internet"
       mcc="730"
       mnc="08"
@@ -31298,18 +31256,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Wap"
-      mcc="730"
-      mnc="08"
-      apn="wap.vtr.com"
-      proxy="192.168.94.210"
-      port="9028"
-      user=""
-      password=""
-      authtype="0"
-      type="default,supl"
-  />
-
   <apn carrier="MMS"
       mcc="730"
       mnc="08"
@@ -31323,6 +31269,25 @@
       type="mms"
   />
 
+  <apn carrier='Internet Nextel'
+      mcc='730'
+      mnc='09'
+      apn='wap.nextelmovil.cl'
+      authtype='0'
+      type='default'
+  />
+
+  <apn carrier='MMS Nextel'
+      mcc='730'
+      mnc='09'
+      apn='mms.nextelmovil.cl'
+      authtype='0'
+      mmsc='http://3gmms.nextelmovil.cl'
+      mmsproxy='129.192.129.104'
+      mmsport='8080'
+      type='mms'
+  />
+
   <apn carrier="Internet Movil"
       mcc="730"
       mnc="10"
@@ -31331,6 +31296,7 @@
       password="entelpcs"
       authtype="1"
       type="default,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="MMS Entel PCS"
@@ -31344,6 +31310,7 @@
       mmsport="8080"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
   />
 
   <apn carrier='Movistar INTERNET'
diff --git a/device.mk b/device.mk
index cbf6e93..e413dc2 100644
--- a/device.mk
+++ b/device.mk
@@ -311,7 +311,7 @@
 
 # LTE, CDMA, GSM/WCDMA
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.telephony.default_network=10 \
+    ro.telephony.default_network=22 \
     telephony.lteOnCdmaDevice=1 \
     persist.radio.mode_pref_nv10=1
 
@@ -340,10 +340,13 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.call_ring.multiple=0
 
-# Update 1x signal strength after 2s
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.radio.use_cc_names=true
+
+# Update 1x signal strength after 10s
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     persist.radio.snapshot_enabled=1 \
-    persist.radio.snapshot_timer=2
+    persist.radio.snapshot_timer=10
 
 # If data_no_toggle is 0 there are no reports if the screen is off.
 # If data_no_toggle is 1 then dormancy indications will come with screen off.
diff --git a/init.bullhead.rc b/init.bullhead.rc
index 96c1af5..95337f3 100644
--- a/init.bullhead.rc
+++ b/init.bullhead.rc
@@ -149,7 +149,7 @@
     write /sys/module/msm_poweroff/parameters/download_mode 0
 
     # Adjust socket buffer to enlarge TCP receive window for high bandwidth
-    write /proc/sys/net/ipv4/tcp_adv_win_scale 2
+    write /proc/sys/net/ipv4/tcp_adv_win_scale 1
 
     # Assign TCP buffer thresholds to be ceiling value of technology maximums
     # Increased technology maximums should be reflected here.
diff --git a/init.bullhead.usb.rc b/init.bullhead.usb.rc
index d23df02..f8a2274 100644
--- a/init.bullhead.usb.rc
+++ b/init.bullhead.usb.rc
@@ -163,3 +163,32 @@
     write /sys/class/android_usb/android0/enable 1
     start adbd
     setprop sys.usb.state ${sys.usb.config}
+
+# qmicm
+on property:sys.usb.config=qmicm
+    stop adbd
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 05C6
+    write /sys/class/android_usb/android0/idProduct 902D
+    write /sys/class/android_usb/android0/bDeviceClass 0
+    write /sys/class/android_usb/android0/bDeviceSubClass 0
+    write /sys/class/android_usb/android0/bDeviceProtocol 0
+    write /sys/class/android_usb/android0/f_diag/clients diag
+    write /sys/class/android_usb/android0/functions rndis,diag,adb
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop sys.usb.state ${sys.usb.config}
+
+on property:sys.usb.config=qmicm,adb
+    stop adbd
+    write /sys/class/android_usb/android0/enable 0
+    write /sys/class/android_usb/android0/idVendor 05C6
+    write /sys/class/android_usb/android0/idProduct 902D
+    write /sys/class/android_usb/android0/bDeviceClass 0
+    write /sys/class/android_usb/android0/bDeviceSubClass 0
+    write /sys/class/android_usb/android0/bDeviceProtocol 0
+    write /sys/class/android_usb/android0/f_diag/clients diag
+    write /sys/class/android_usb/android0/functions rndis,diag,adb
+    write /sys/class/android_usb/android0/enable 1
+    start adbd
+    setprop sys.usb.state ${sys.usb.config}
diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf
index 30b5511..6603d97 100644
--- a/nfc/libnfc-nxp.conf
+++ b/nfc/libnfc-nxp.conf
@@ -171,7 +171,7 @@
         A0, CB, 01, 0F,
         A0, CE, 01, 7F,
         A0, 40, 01, 01,
-        A0, 41, 01, 03,
+        A0, 41, 01, 02,
         A0, 42, 01, 19,
         A0, 43, 01, 00,
         A0, F2, 01, 00,
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 49d3ce8..aab8e76 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -42,7 +42,7 @@
     <integer name="config_defaultNotificationLedOff">9000</integer>
 
     <!-- reference volume index for music stream to limit headphone volume and display warning -->
-    <integer name="config_safe_media_volume_index">4</integer>
+    <integer name="config_safe_media_volume_index">5</integer>
 
     <!-- Max number of scan filters supported by blutooth controller. 0 if the
          device does not support hardware scan filters-->
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 26e7970..fc9e839 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -19,16 +19,16 @@
 <device name="Android">
     <!-- All values are in mAh except as noted -->
     <item name="none">0</item>
-    <item name="screen.on">82.75</item>
-    <item name="screen.full">201.16</item>
-    <item name="bluetooth.active">51.55</item>
-    <item name="bluetooth.on">0.57</item>
-    <item name="wifi.on">.52</item>
-    <item name="wifi.active">73.24</item>
-    <item name="wifi.scan">75.48</item>
-    <item name="dsp.audio">0.1</item>
-    <item name="dsp.video">0.1</item>
-    <item name="gps.on">76.23</item>
+    <item name="screen.on">91.82</item>
+    <item name="screen.full">313.05</item>
+    <item name="bluetooth.active">84.4</item>
+    <item name="bluetooth.on">0.78</item>
+    <item name="wifi.on">1.29</item>
+    <item name="wifi.active">172.99</item>
+    <item name="wifi.scan">2.13</item>
+    <item name="dsp.audio">100.88</item>
+    <item name="dsp.video">187.86</item>
+    <item name="gps.on">59.74</item>
     <item name="radio.active">185.19</item>
     <!-- The current consumed by the radio when it is scanning for a signal -->
     <item name="radio.scanning">99.2</item>
@@ -51,10 +51,9 @@
         <value>1440000</value> <!-- 1440 MHz CPU speed -->
     </array>
     <array name="cpu.speeds.big">
-        <value>384000</value> <!-- 384 MHz CPU speed -->
-        <value>480000</value> <!-- 480 MHz CPU speed -->
         <value>633600</value> <!-- 633.6 MHz CPU speed -->
         <value>768000</value> <!-- 768 MHz CPU speed -->
+        <value>864000</value> <!-- 864 MHz CPU speed -->
         <value>960000</value> <!-- 960 MHz CPU speed -->
         <value>1248000</value> <!-- 1248 MHz CPU speed -->
         <value>1344000</value> <!-- 1344 MHz CPU speed -->
@@ -65,34 +64,32 @@
         <value>1824000</value> <!-- 1824 MHz CPU speed -->
     </array>
     <!-- Power consumption when CPU is idle -->
-    <item name="cpu.idle">3.88</item>
-    <item name="cpu.awake">17.4</item>
+    <item name="cpu.idle">4.06</item>
+    <item name="cpu.awake">23.35</item>
     <!-- Power consumption at different speeds -->
     <array name="cpu.active">
-        <value>18.25</value> <!-- 384 MHz CPU speed -->
-        <value>24.35</value> <!-- 460.8 MHz CPU speed -->
-        <value>26.92</value> <!-- 600 MHz CPU speed -->
-        <value>34.6</value> <!-- 672 MHz CPU speed -->
-        <value>38.15</value> <!-- 787.2 MHz CPU speed -->
-        <value>46.88</value> <!-- 864 MHz CPU speed -->
-        <value>55.94</value> <!-- 960 MHz CPU speed -->
-        <value>81.74</value> <!-- 1248 MHz CPU speed -->
-        <value>105.87</value> <!-- 1440 MHz CPU speed -->
+        <value>183</value> <!-- 384 MHz CPU speed -->
+        <value>189</value> <!-- 460.8 MHz CPU speed -->
+        <value>194</value> <!-- 600 MHz CPU speed -->
+        <value>205</value> <!-- 672 MHz CPU speed -->
+        <value>211</value> <!-- 787.2 MHz CPU speed -->
+        <value>220</value> <!-- 864 MHz CPU speed -->
+        <value>232</value> <!-- 960 MHz CPU speed -->
+        <value>263</value> <!-- 1248 MHz CPU speed -->
+        <value>288</value> <!-- 1440 MHz CPU speed -->
     </array>
     <array name="cpu.active.big">
-        <value>67.74</value> <!-- 384 MHz CPU speed -->
-        <value>82.96</value> <!-- 480 MHz CPU speed -->
-        <value>105.87</value> <!-- 633.6 MHz CPU speed -->
-        <value>133.16</value> <!-- 768 MHz CPU speed -->
-        <value>150.16</value> <!-- 864 MHz CPU speed -->
-        <value>167.18</value> <!-- 960 MHz CPU speed -->
-        <value>230.04</value> <!-- 1248 MHz CPU speed -->
-        <value>261.43</value> <!-- 1344 MHz CPU speed -->
-        <value>290.46</value> <!-- 1440 MHz CPU speed -->
-        <value>317.2</value> <!-- 1536 MHz CPU speed -->
-        <value>352.87</value> <!-- 1632 MHz CPU speed -->
-        <value>374.36</value> <!-- 1689.6 MHz CPU speed -->
-        <value>443.88</value> <!-- 1824 MHz CPU speed -->
+        <value>433</value> <!-- 633.6 MHz CPU speed -->
+        <value>462</value> <!-- 768 MHz CPU speed -->
+        <value>487</value> <!-- 864 MHz CPU speed -->
+        <value>511</value> <!-- 960 MHz CPU speed -->
+        <value>589</value> <!-- 1248 MHz CPU speed -->
+        <value>623</value> <!-- 1344 MHz CPU speed -->
+        <value>655</value> <!-- 1440 MHz CPU speed -->
+        <value>691</value> <!-- 1536 MHz CPU speed -->
+        <value>737</value> <!-- 1632 MHz CPU speed -->
+        <value>750</value> <!-- 1689.6 MHz CPU speed -->
+        <value>797</value> <!-- 1824 MHz CPU speed -->
     </array>
     <!-- This is the battery capacity in mAh -->
     <item name="battery.capacity">2700</item>
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 0548407..f2ab8f1 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -23,8 +23,7 @@
 type ramdump_data_file, file_type, data_file_type;
 type diag_logs, file_type, data_file_type, mlstrustedobject;
 
-type mpctl_data_file, file_type, data_file_type;
-type mpctl_socket, file_type;
+type perfd_data_file, file_type, data_file_type;
 
 type cnd_data_file, file_type, data_file_type;
 
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index acf6432..0dda892 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -3,8 +3,7 @@
 /data/nfc(/.*)?     u:object_r:nfc_data_file:s0
 
 # Data files
-/data/misc/perfd(/.*)?         u:object_r:mpctl_data_file:s0
-/data/misc/perfd/mpctl         u:object_r:mpctl_socket:s0
+/data/misc/perfd(/.*)?         u:object_r:perfd_data_file:s0
 /data/misc/radio(/.*)?         u:object_r:radio_data_file:s0
 /data/misc/location(/.*)?      u:object_r:location_data_file:s0
 /data/time(/.*)?               u:object_r:time_data_file:s0
diff --git a/sepolicy/kernel.te b/sepolicy/kernel.te
new file mode 100644
index 0000000..dd801ad
--- /dev/null
+++ b/sepolicy/kernel.te
@@ -0,0 +1,3 @@
+# TODO - root cause why the kernel generating this denial.
+allow kernel domain:process setsched;
+auditallow kernel domain:process setsched;
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
index aaeace5..bb53b12 100644
--- a/sepolicy/mediaserver.te
+++ b/sepolicy/mediaserver.te
@@ -4,6 +4,8 @@
 allow mediaserver camera:unix_dgram_socket sendto;
 allow mediaserver camera_data_file:sock_file write;
 
-allow mediaserver mpctl_data_file:dir search;
-unix_socket_connect(mediaserver, mpctl, perfd)
-unix_socket_send(mediaserver, mpctl, perfd)
+# allow communication w/perfd
+allow mediaserver perfd_data_file:dir search;
+allow mediaserver perfd_data_file:sock_file write;
+allow mediaserver perfd:unix_dgram_socket sendto;
+allow mediaserver perfd:unix_stream_socket connectto;
diff --git a/sepolicy/perfd.te b/sepolicy/perfd.te
index 39b5525..122f046 100644
--- a/sepolicy/perfd.te
+++ b/sepolicy/perfd.te
@@ -12,12 +12,11 @@
 dontaudit perfd self:capability fsetid;
 
 # Data file accesses.
-allow perfd mpctl_data_file:dir create_dir_perms;
-allow perfd mpctl_data_file:file create_file_perms;
+allow perfd perfd_data_file:dir create_dir_perms;
+allow perfd perfd_data_file:file create_file_perms;
 
 # Socket creation under /data/misc/perfd
-type_transition perfd mpctl_data_file:sock_file mpctl_socket;
-allow perfd mpctl_socket:sock_file create_file_perms;
+allow perfd perfd_data_file:sock_file create_file_perms;
 
 allow perfd sysfs_performance:dir search;
 allow perfd sysfs_performance:file rw_file_perms;
@@ -29,3 +28,6 @@
 
 # allow writing to /sys/devices/system/cpu/*
 allow perfd sysfs_devices_system_cpu:file rw_file_perms;
+
+# access to /sys/module/lpm_levels/parameters/sleep_disabled
+allow perfd sysfs_power_management:file w_file_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index d294985..2eaa5a3 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -25,11 +25,15 @@
 allow system_server location_data_file:dir rw_dir_perms;
 allow system_server location_data_file:sock_file create_file_perms;
 
-
-allow system_server mpctl_data_file:dir search;
-
 # talk to perfd
-unix_socket_connect(system_server, mpctl, perfd)
+allow system_server perfd_data_file:dir search;
+allow system_server perfd_data_file:sock_file write;
+allow system_server perfd:unix_stream_socket connectto;
 
 # hubconnection to get and set sensors.contexthub.* properties
 set_prop(system_server, contexthub_prop);
+
+# To improve app launch times - we would like to force all tasks to
+# run on big cores for app launch (sched_boost) - instead of just
+# boosting them to make it "more likely" to run on big cores.
+allow system_server zygote:process setsched;
diff --git a/wifi/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini
index ce7163c..0f8ce71 100644
--- a/wifi/WCNSS_qcom_cfg.ini
+++ b/wifi/WCNSS_qcom_cfg.ini
@@ -466,6 +466,9 @@
 
 #Enable firmware log
 gEnablefwlog=1
+# Additional firmware log levels
+gFwDebugLogLevel=4
+gFwDebugModuleLoglevel=1,0,2,0,4,0,5,0,6,0,7,4,8,0,9,0,11,0,13,0,17,0,18,0,19,0,27,0,29,0,31,0,35,0,36,0,38,0
 
 #IPA config
 gIPAEnable=0x00
@@ -576,7 +579,8 @@
 # RA filtering rate limit param, the current value would not
 # help if the lifetime in RA is less than 3*60=3min. Then
 # we need to change it, though it is uncommon.
-# gRAFilterEnable=0
+# Enable RA filtering offload
+gRAFilterEnable=1
 gRArateLimitInterval=600
 
 # Inactivity time (in ms) to end TX Service Period while in IBSS power save mode
@@ -622,9 +626,6 @@
 
 gEnableSelfRecovery=1
 
-#Enable RA filtering offload
-gRAFilterEnable=1
-
 #Enable MC address filtering offload
 gMCAddrListEnable=1
 # Enable Runtime PM Feature.