release-request-108343c4-ad88-44f9-aaa2-24d8b8a5c176-for-git_oc-mr1-release-4321077 snap-temp-L97000000100182150

Change-Id: I152cd37c9760985e41d63aee84a41ca39b9718d0

3 files changed, 94 insertions, 94 deletions

diff --git a/init.angler.usb.rc b/init.angler.usb.rc
index 5e63724..dad9d7b 100644
--- a/init.angler.usb.rc
+++ b/init.angler.usb.rc
@@ -26,12 +26,12 @@ on boot
     write /sys/module/dwc3/boot_finished 1
 
 on post-fs
-    mkdir /dev/usb-ffs 0775 shell shell
+    mkdir /dev/usb-ffs 0770 shell shell
     mkdir /dev/usb-ffs/adb 0770 shell shell
     mount functionfs adb /dev/usb-ffs/adb noatime uid=2000,gid=2000,no_disconnect=1
-    mkdir /dev/usb-ffs/mtp 0770 mtp mtp
-    mount functionfs mtp /dev/usb-ffs/mtp noatime rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
-    write /sys/class/android_usb/android0/f_ffs/aliases adb,mtp
+    write /sys/class/android_usb/android0/f_ffs/aliases adb
+    write /sys/module/g_android/parameters/mtp_rx_req_len 131072
+    write /sys/module/g_android/parameters/mtp_tx_reqs 32
     setprop sys.usb.ffs.max_write 262144
     setprop sys.usb.ffs.max_read 262144
     setprop sys.usb.mtp.device_type 3
@@ -98,7 +98,7 @@ on property:sys.usb.config=ptp
     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/functions mtp
+    write /sys/class/android_usb/android0/functions ptp
     write /sys/class/android_usb/android0/enable 1
     setprop sys.usb.state ${sys.usb.config}
 
@@ -109,7 +109,7 @@ on property:sys.usb.config=ptp,adb
     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/functions mtp,adb
+    write /sys/class/android_usb/android0/functions ptp,adb
     write /sys/class/android_usb/android0/enable 1
     start adbd
     setprop sys.usb.state ${sys.usb.config}
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index 40184a8..da4a689 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -14,139 +14,139 @@
      limitations under the License.
 -->
 
-<!-- Generated file for angler using measurements between OPR1.170207.001 and OPM1.170816.001 -->
+<!-- Generated file for angler using measurements between OPR1.170623.008 and OPM1.170904.001 -->
 <MediaCodecs>
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <!-- measured 98%:120-525 med:166/163 variance:2.1 -->
-            <Limit name="measured-frame-rate-176x144" range="163-287" /> <!-- N=132 -->
-            <Limit name="measured-frame-rate-352x288" range="292-292" /> <!-- N=108 v98%=1.5 -->
+            <!-- measured 98%:120-525 med:177/177 variance:2.1 -->
+            <Limit name="measured-frame-rate-176x144" range="177-325" /> <!-- N=126 -->
+            <Limit name="measured-frame-rate-352x288" range="283-283" /> <!-- N=116 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <!-- measured 98%:129-525 med:287/283 FLAKY(mn=122.1 < 127 - 566) variance:2.0 -->
-            <Limit name="measured-frame-rate-320x240" range="254-283" /> <!-- N=108 -->
-            <!-- measured 98%:82-191 med:163/163 FLAKY(mn=81.2 < 82 - 326) -->
-            <Limit name="measured-frame-rate-720x480" range="163-163" /> <!-- N=108 v98%=1.5 -->
-            <Limit name="measured-frame-rate-1280x720" range="70-70" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=108 v98%=1.2 -->
+            <!-- measured 98%:129-525 med:288/285 FLAKY(mn=122.1 < 128 - 572) variance:2.0 -->
+            <Limit name="measured-frame-rate-320x240" range="256-286" /> <!-- N=116 -->
+            <!-- measured 98%:82-203 med:163/163 FLAKY(mn=81.2 < 82 - 326) -->
+            <Limit name="measured-frame-rate-720x480" range="163-163" /> <!-- N=116 v98%=1.6 -->
+            <Limit name="measured-frame-rate-1280x720" range="67-68" /> <!-- N=116 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=116 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="271-310" /> <!-- N=108 v98%=1.7 -->
-            <Limit name="measured-frame-rate-720x480" range="155-155" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="42-42" /> <!-- N=108 v98%=1.2 -->
-            <!-- measured 98%:7-34 med:15/15 variance:2.2 -->
-            <Limit name="measured-frame-rate-3840x2160" range="13-22" /> <!-- N=110 -->
+            <Limit name="measured-frame-rate-320x240" range="284-311" /> <!-- N=116 v98%=1.6 -->
+            <Limit name="measured-frame-rate-720x480" range="156-156" /> <!-- N=116 v98%=1.5 -->
+            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=116 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=116 v98%=1.2 -->
+            <!-- measured 98%:7-34 med:14/15 variance:2.2 -->
+            <Limit name="measured-frame-rate-3840x2160" range="12-20" /> <!-- N=118 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <!-- measured 98%:111-398 med:156/155 FLAKY(78 - 398 < mx=406.2) -->
-            <Limit name="measured-frame-rate-176x144" range="155-199" /> <!-- N=132 v98%=1.9 -->
-            <Limit name="measured-frame-rate-352x288" range="220-220" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x480" range="85-85" /> <!-- N=108 v98%=1.0 -->
+            <!-- measured 98%:111-400 med:174/172 FLAKY(86 - 400 < mx=406.2) -->
+            <Limit name="measured-frame-rate-176x144" range="172-200" /> <!-- N=130 v98%=1.9 -->
+            <Limit name="measured-frame-rate-352x288" range="222-222" /> <!-- N=116 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x480" range="85-85" /> <!-- N=116 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="122-122" /> <!-- N=108 v98%=1.0 -->
-            <Limit name="measured-frame-rate-640x360" range="113-113" /> <!-- N=102 v98%=1.0 -->
-            <Limit name="measured-frame-rate-1280x720" range="39-39" /> <!-- N=108 v98%=1.0 -->
-            <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=108 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="122-122" /> <!-- N=116 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="113-113" /> <!-- N=110 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="39-39" /> <!-- N=116 v98%=1.0 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=116 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="236-236" /> <!-- N=108 v98%=1.3 -->
+            <Limit name="measured-frame-rate-176x144" range="235-235" /> <!-- N=116 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <!-- measured 98%:178-374 med:235/236 FLAKY(mn=113.4 < 118 - 472) -->
-            <Limit name="measured-frame-rate-320x240" range="236-236" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-720x480" range="91-92" /> <!-- N=108 v98%=1.5 -->
-            <Limit name="measured-frame-rate-1280x720" range="47-52" /> <!-- N=108 v98%=1.6 -->
-            <Limit name="measured-frame-rate-1920x1080" range="21-28" /> <!-- N=122 v98%=1.7 -->
+            <!-- measured 98%:129-364 med:228/233 FLAKY(mn=113.4 < 114 - 466) -->
+            <Limit name="measured-frame-rate-320x240" range="228-233" /> <!-- N=116 v98%=1.7 -->
+            <!-- measured 98%:53-124 med:86/87 FLAKY(mn=35.7 < 43 - 180) -->
+            <Limit name="measured-frame-rate-720x480" range="71-90" /> <!-- TWEAKED N=116 v98%=1.5 -->
+            <Limit name="measured-frame-rate-1280x720" range="41-48" /> <!-- N=116 v98%=1.7 -->
+            <Limit name="measured-frame-rate-1920x1080" range="17-22" /> <!-- N=120 v98%=1.7 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="277-277" /> <!-- N=108 v98%=1.3 -->
+            <Limit name="measured-frame-rate-176x144" range="268-269" /> <!-- N=116 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="97-97" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="37-37" /> <!-- N=108 v98%=1.0 -->
-            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="15-16" /> <!-- N=108 v98%=1.4 -->
+            <Limit name="measured-frame-rate-320x180" range="96-96" /> <!-- N=116 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="37-37" /> <!-- N=116 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="29-31" /> <!-- N=116 v98%=1.3 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="13-14" /> <!-- N=116 v98%=1.5 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 98%:96-128 med:109/109 N=60 -->
-            <Limit name="measured-frame-rate-320x180" range="109-109" /> <!-- v98%=1.2 -->
-            <!-- measured 98%:30-44 med:40/39 N=60 -->
-            <Limit name="measured-frame-rate-640x360" range="39-39" /> <!-- v98%=1.2 -->
-            <!-- measured 98%:8-11 med:11/11 N=60 -->
-            <Limit name="measured-frame-rate-1280x720" range="11-11" /> <!-- v98%=1.2 -->
+            <!-- measured 98%:48-128 med:107/106 N=90 -->
+            <Limit name="measured-frame-rate-320x180" range="96-106" /> <!-- v98%=1.6 (OPR1.170207.001-) -->
+            <!-- measured 98%:23-46 med:39/39 N=88 -->
+            <Limit name="measured-frame-rate-640x360" range="39-39" /> <!-- v98%=1.4 (OPR1.170207.001-) -->
+            <!-- measured 98%:4-11 med:10/10 N=90 -->
+            <Limit name="measured-frame-rate-1280x720" range="7-10" /> <!-- v98%=1.7 (OPR1.170207.001-) -->
             <!-- measured 97%:3-6 med:5/5 N=56 -->
-            <Limit name="measured-frame-rate-1920x1080" range="5-5" /> <!-- v97%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="5-5" /> <!-- v97%=1.2 (OPR1.170207.001-OPM1.170810.004) -->
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="740-740" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-352x288" range="712-712" /> <!-- N=108 v98%=1.2 -->
+            <Limit name="measured-frame-rate-176x144" range="728-728" /> <!-- N=114 v98%=1.3 -->
+            <Limit name="measured-frame-rate-352x288" range="693-695" /> <!-- N=114 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="414-414" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-720x480" range="236-236" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="288-288" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="142-142" /> <!-- N=108 v98%=1.1 -->
+            <Limit name="measured-frame-rate-320x240" range="409-409" /> <!-- N=112 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="238-238" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="289-289" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="144-144" /> <!-- N=112 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="481-481" /> <!-- N=106 v98%=1.2 -->
-            <Limit name="measured-frame-rate-640x360" range="429-429" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="368-368" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="443-443" /> <!-- N=108 v98%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="250-250" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-3840x2160" range="43-43" /> <!-- N=108 v98%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="463-463" /> <!-- N=114 v98%=1.3 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-640x360" range="413-413" /> <!-- N=112 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="366-366" /> <!-- N=112 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="435-435" /> <!-- N=114 v98%=1.3 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="250-250" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-3840x2160" range="43-43" /> <!-- N=112 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="707-707" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-480x360" range="632-632" /> <!-- N=108 v98%=1.1 -->
+            <!-- measured 98%:467-742 med:700/699 FLAKY(mn=326.9 < 350 - 1398) -->
+            <Limit name="measured-frame-rate-176x144" range="699-699" /> <!-- N=114 v98%=1.3 -->
+            <Limit name="measured-frame-rate-480x360" range="619-619" /> <!-- N=114 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="413-413" /> <!-- N=106 v98%=1.0 -->
-            <!-- measured 98%:370-411 med:395/395 FLAKY(mn=0.5 < 198 - 790) -->
-            <Limit name="measured-frame-rate-640x360" range="395-395" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="453-453" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="248-248" /> <!-- N=108 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="412-412" /> <!-- N=114 v98%=1.1 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-640x360" range="393-393" /> <!-- N=114 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="446-446" /> <!-- N=114 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="248-248" /> <!-- N=112 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <!-- measured 90%:104-249 med:115/116 FLAKY(58 - 298 < mx=454.5) -->
-            <Limit name="measured-frame-rate-176x144" range="116-149" /> <!-- N=112 v90%=1.5 -->
+            <!-- measured 98%:99-335 med:116/118 FLAKY(58 - 336 < mx=345.2) -->
+            <Limit name="measured-frame-rate-176x144" range="116-173" /> <!-- TWEAKED N=112 v98%=1.8 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <!-- measured 93%:262-382 med:354/353 FLAKY(mn=96.2 < 177 - 706) -->
-            <Limit name="measured-frame-rate-320x240" range="353-353" /> <!-- N=110 v93%=1.2 -->
-            <Limit name="measured-frame-rate-720x480" range="118-118" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="46-46" /> <!-- N=108 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1920x1080" range="21-21" /> <!-- N=108 v98%=1.2 -->
+            <Limit name="measured-frame-rate-320x240" range="349-349" /> <!-- N=114 v98%=1.2 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-720x480" range="117-117" /> <!-- N=114 v98%=1.2 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1280x720" range="46-46" /> <!-- N=114 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=114 v98%=1.3 (OPR1.170623.006-) -->
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <!-- measured 93%:228-447 med:284/284 FLAKY(mn=82.5 < 142 - 568) -->
-            <Limit name="measured-frame-rate-352x288" range="284-284" /> <!-- N=112 v93%=1.4 -->
-            <Limit name="measured-frame-rate-640x360" range="193-193" /> <!-- N=108 v98%=1.3 -->
-            <Limit name="measured-frame-rate-720x480" range="192-192" /> <!-- N=106 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1280x720" range="81-81" /> <!-- N=108 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1920x1080" range="44-44" /> <!-- N=108 v98%=1.3 -->
+            <Limit name="measured-frame-rate-352x288" range="281-282" /> <!-- N=112 v98%=1.7 -->
+            <!-- measured 98%:90-218 med:175/174 FLAKY(mn=70.0 < 87 - 348) -->
+            <Limit name="measured-frame-rate-640x360" range="140-174" /> <!-- TWEAKED N=112 v98%=1.6 -->
+            <Limit name="measured-frame-rate-720x480" range="150-155" /> <!-- N=118 v98%=1.7 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1280x720" range="62-63" /> <!-- N=118 v98%=1.7 -->
+            <Limit name="measured-frame-rate-1920x1080" range="35-35" /> <!-- N=116 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <!-- measured 97%:114-279 med:136/138 FLAKY(69 - 326 < mx=532.2) -->
-            <Limit name="measured-frame-rate-176x144" range="138-163" /> <!-- N=108 v97%=1.6 -->
+            <!-- measured 98%:111-416 med:147/152 FLAKY(74 - 416 < mx=429.4) -->
+            <Limit name="measured-frame-rate-176x144" range="147-215" /> <!-- TWEAKED N=114 v98%=1.9 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- measured 98%:303-1006 med:357/359 FLAKY(180 - 1006 < mx=1011.1) -->
-            <Limit name="measured-frame-rate-320x180" range="359-503" /> <!-- N=108 v98%=1.8 -->
-            <Limit name="measured-frame-rate-640x360" range="249-249" /> <!-- N=108 v98%=1.5 -->
-            <Limit name="measured-frame-rate-1280x720" range="64-64" /> <!-- N=102 v98%=1.4 -->
-            <Limit name="measured-frame-rate-1920x1080" range="25-25" /> <!-- N=106 v98%=1.4 -->
+            <!-- measured 98%:303-975 med:358/359 FLAKY(179 - 976 < mx=1000.0) -->
+            <Limit name="measured-frame-rate-320x180" range="358-488" /> <!-- N=114 v98%=1.8 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-640x360" range="219-239" /> <!-- N=116 v98%=1.6 -->
+            <Limit name="measured-frame-rate-1280x720" range="52-52" /> <!-- N=116 v98%=1.6 (OPR1.170618.001-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=114 v98%=1.5 (OPR1.170623.006-) -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- measured 98%:231-661 med:288/287 FLAKY(144 - 662 < mx=662.7) -->
-            <Limit name="measured-frame-rate-320x180" range="287-331" /> <!-- N=108 v98%=1.7 -->
-            <!-- measured 98%:107-279 med:137/137 FLAKY(69 - 280 < mx=285.8) -->
-            <Limit name="measured-frame-rate-640x360" range="137-140" /> <!-- N=108 v98%=1.6 -->
-            <Limit name="measured-frame-rate-1280x720" range="68-68" /> <!-- N=106 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="41-41" /> <!-- N=108 v98%=1.2 -->
+            <!-- measured 98%:225-614 med:290/288 FLAKY(144 - 614 < mx=662.7) -->
+            <Limit name="measured-frame-rate-320x180" range="288-307" /> <!-- N=114 v98%=1.7 -->
+            <!-- measured 98%:102-279 med:138/138 FLAKY(69 - 280 < mx=285.8) -->
+            <Limit name="measured-frame-rate-640x360" range="138-140" /> <!-- N=114 v98%=1.7 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1280x720" range="58-58" /> <!-- N=114 v98%=1.4 (OPR1.170623.006-) -->
+            <Limit name="measured-frame-rate-1920x1080" range="35-35" /> <!-- N=114 v98%=1.4 -->
         </MediaCodec>
     </Decoders>
 </MediaCodecs>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
index b066794..1713b4d 100755
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
@@ -26,7 +26,7 @@
 
     <!-- Values for GPS configuration (AT&T) -->
     <string-array translatable="false" name="config_gpsParameters">
-        <item>SUPL_HOST=NONE</item>
+        <item>SUPL_HOST=supl.google.com</item>
         <item>SUPL_PORT=7275</item>
         <item>NTP_SERVER=north-america.pool.ntp.org</item>
         <item>SUPL_MODE=3</item>