summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apns-full-conf.xml356
-rw-r--r--camera/QCamera2/HAL3/QCamera3HWI.cpp2
-rw-r--r--media_codecs_performance.xml179
-rw-r--r--overlay/frameworks/base/core/res/res/xml/power_profile.xml163
-rw-r--r--overlay/packages/apps/CarrierConfig/res/xml/vendor.xml3
-rw-r--r--ueventd.bullhead.rc4
6 files changed, 259 insertions, 448 deletions
diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index c586934..fad89d8 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -2740,7 +2740,7 @@
<apn carrier="Internet"
mcc="222"
mnc="01"
- apn="internet.windmobile.ca"
+ apn="internet.freedommobile.ca"
type="default,supl"
protocol="IPV4V6"
mvno_match_data="FFFFFF00"
@@ -2750,8 +2750,8 @@
<apn carrier="MMS"
mcc="222"
mnc="01"
- apn="mms.windmobile.ca"
- mmsc="http://mms.windmobile.ca"
+ apn="mms.freedommobile.ca"
+ mmsc="http://mms.freedommobile.ca"
mmsproxy="74.115.197.70"
mmsport="8080"
type="mms"
@@ -2953,7 +2953,7 @@
<apn carrier="Internet"
mcc="222"
mnc="88"
- apn="internet.windmobile.ca"
+ apn="internet.freedommobile.ca"
type="default,supl"
protocol="IPV4V6"
mvno_match_data="FFFFFF00"
@@ -2963,8 +2963,8 @@
<apn carrier="MMS"
mcc="222"
mnc="88"
- apn="mms.windmobile.ca"
- mmsc="http://mms.windmobile.ca"
+ apn="mms.freedommobile.ca"
+ mmsc="http://mms.freedommobile.ca"
mmsproxy="74.115.197.70"
mmsport="8080"
type="mms"
@@ -7214,7 +7214,7 @@
<apn carrier="Internet"
mcc="302"
mnc="490"
- apn="internet.windmobile.ca"
+ apn="internet.freedommobile.ca"
type="default,supl"
protocol="IPV4V6"
/>
@@ -7222,8 +7222,8 @@
<apn carrier="MMS"
mcc="302"
mnc="490"
- apn="mms.windmobile.ca"
- mmsc="http://mms.windmobile.ca"
+ apn="mms.freedommobile.ca"
+ mmsc="http://mms.freedommobile.ca"
mmsproxy="74.115.197.70"
mmsport="8080"
type="mms"
@@ -7261,6 +7261,16 @@
mmsc="http://mms.bell.ca/mms/wapenc"
/>
+ <apn carrier="Virgin Mobile"
+ mcc="302"
+ mnc="610"
+ apn="pda.bell.ca"
+ type="default,mms,supl"
+ mmsc="http://mms.bell.ca/mms/wapenc"
+ mvno_match_data="3E"
+ mvno_type="gid"
+ />
+
<apn carrier="MTS"
mcc="302"
mnc="660"
@@ -12562,36 +12572,12 @@
<apn carrier="U.S. Cellular"
mcc="311"
mnc="220"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- authtype="3"
- roaming_protocol="IPV4V6"
- bearer_bitmask="6"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="220"
apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="220"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -12603,21 +12589,10 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
+ bearer_bitmask="13|14"
mtu="1422"
/>
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="221"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- />
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -12646,49 +12621,13 @@
<apn carrier="U.S. Cellular"
mcc="311"
- mnc="221"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- authtype="3"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="221"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- authtype="3"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="222"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
mnc="222"
apn="usccinternet"
mmsc="http://mmsc1.uscc.net/mmsc/MMS"
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -12713,21 +12652,11 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
+ bearer_bitmask="13|14"
mtu="1422"
/>
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="223"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- mtu="1422"
- />
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
@@ -12750,19 +12679,7 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="224"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -12801,35 +12718,9 @@
carrier_enabled="true"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="225"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- carrier_enabled="true"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="226"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<apn carrier="U.S. Cellular"
mcc="311"
mnc="226"
@@ -12838,7 +12729,7 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -12863,19 +12754,7 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="227"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -12900,19 +12779,7 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="228"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -12937,22 +12804,10 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="229"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
+
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14242,34 +14097,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="580"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="581"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<apn carrier="U.S. Cellular"
mcc="311"
mnc="581"
@@ -14278,7 +14108,7 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
@@ -14303,22 +14133,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="582"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14340,22 +14157,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="583"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14377,22 +14181,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="584"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14414,22 +14205,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="585"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14451,22 +14229,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="586"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14488,22 +14253,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="587"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14525,22 +14277,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="588"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
@@ -14562,22 +14301,9 @@
type="default,mms,dun,hipri,fota"
protocol="IPV4V6"
roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- mtu="1422"
- />
-
- <apn carrier="U.S. Cellular"
- mcc="311"
- mnc="589"
- apn="usccinternet"
- mmsc="http://mmsc1.uscc.net/mmsc/MMS"
- type="default,mms,dun,hipri,fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ bearer_bitmask="13|14"
mtu="1422"
/>
-
<!-- bearer 4, 5, 6, 7, 8, 12 -->
<apn carrier="U.S. Cellular"
mcc="311"
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index 18a11ed..05c0c41 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -1892,6 +1892,7 @@ int QCamera3HardwareInterface::configureStreamsPerfLocked(
newStream->max_buffers = MAX_INFLIGHT_REPROCESS_REQUESTS;
} else {
ALOGE("%s: Error, Unknown stream type", __func__);
+ pthread_mutex_unlock(&mMutex);
return -EINVAL;
}
@@ -3701,6 +3702,7 @@ no_error:
if(ADD_SET_PARAM_ENTRY_TO_BATCH(mParameters,
CAM_INTF_META_FRAME_NUMBER, request->frame_number)) {
ALOGE("%s: Failed to set the frame number in the parameters", __func__);
+ pthread_mutex_unlock(&mMutex);
return BAD_VALUE;
}
}
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index b9d1a90..032a952 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2016 The Android Open Source Project
+<!-- Copyright 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,115 +14,156 @@
limitations under the License.
-->
+<!-- Generated file for bullhead using measurements between OPR1.170208.003 and OPM1.170816.001 -->
<MediaCodecs>
<Encoders>
<MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="235-418" /> <!-- TWEAKED -->
- <Limit name="measured-frame-rate-352x288" range="231-245" /> <!-- N=40 v95%=1.2 -->
- <!-- measured 93%:57-64 med:59 FLAKY(30 - 122 < mx=133.9) WIDEN(30 - 134) -->
- <Limit name="measured-frame-rate-704x576" range="59-67" /> <!-- N=40 v93%=1.0 -->
+ <!-- measured 98%:101-510 med:186/183 FLAKY(90 - 510 < mx=510.7) variance:2.2 -->
+ <Limit name="measured-frame-rate-176x144" range="180-255" /> <!-- N=118 -->
+ <!-- measured 98%:158-485 med:222/229 FLAKY(115 - 486 < mx=490.0) -->
+ <Limit name="measured-frame-rate-352x288" range="229-243" /> <!-- N=114 v98%=1.8 -->
+ <Limit name="measured-frame-rate-704x576" range="128-128" /> <!-- N=110 v98%=1.3 -->
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="251-251" /> <!-- N=40 v95%=1.3 -->
- <Limit name="measured-frame-rate-720x480" range="69-86" /> <!-- TWEAKED -->
- <!-- measured 93%:38-67 med:44 SLOW -->
- <Limit name="measured-frame-rate-1280x720" range="43-51" /> <!-- N=40 v93%=1.3 -->
- <Limit name="measured-frame-rate-1920x1080" range="27-27" /> <!-- N=40 v95%=1.3 -->
+ <Limit name="measured-frame-rate-320x240" range="209-255" /> <!-- N=114 v98%=2.0 -->
+ <Limit name="measured-frame-rate-720x480" range="143-143" /> <!-- N=114 v98%=1.4 -->
+ <Limit name="measured-frame-rate-1280x720" range="72-72" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-1920x1080" range="37-37" /> <!-- N=114 v98%=1.3 -->
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="260-374" /> <!-- TWEAKED -->
- <Limit name="measured-frame-rate-352x288" range="201-201" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-640x480" range="77-77" /> <!-- N=40 v95%=1.0 -->
+ <Limit name="measured-frame-rate-176x144" range="174-195" /> <!-- N=120 v98%=1.9 -->
+ <Limit name="measured-frame-rate-352x288" range="198-198" /> <!-- N=114 v98%=1.2 -->
+ <Limit name="measured-frame-rate-640x480" range="77-77" /> <!-- N=114 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="112-113" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-640x360" range="107-107" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="38-38" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=40 v95%=1.0 -->
+ <Limit name="measured-frame-rate-320x180" range="112-112" /> <!-- N=114 v98%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="103-103" /> <!-- N=112 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="38-38" /> <!-- N=114 v98%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=110 v98%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="246-246" /> <!-- N=40 v95%=1.3 -->
+ <Limit name="measured-frame-rate-176x144" range="228-228" /> <!-- N=114 v98%=1.4 -->
</MediaCodec>
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
- <!-- measured 93%:141-243 med:161 SLOW -->
- <Limit name="measured-frame-rate-320x240" range="161-185" /> <!-- N=40 v93%=1.3 -->
- <!-- measured 95%:45-72 med:48 SLOW -->
- <Limit name="measured-frame-rate-720x480" range="47-57" /> <!-- N=40 v95%=1.3 -->
- <Limit name="measured-frame-rate-1280x720" range="20-31" /> <!-- TWEAKED -->
- <Limit name="measured-frame-rate-1920x1080" range="10-13" /> <!-- TWEAKED -->
+ <Limit name="measured-frame-rate-320x240" range="233-233" /> <!-- N=114 v98%=1.4 -->
+ <Limit name="measured-frame-rate-720x480" range="101-101" /> <!-- N=114 v98%=1.3 -->
+ <Limit name="measured-frame-rate-1280x720" range="52-52" /> <!-- N=122 v98%=1.4 -->
+ <Limit name="measured-frame-rate-1920x1080" range="21-23" /> <!-- N=122 v98%=1.5 -->
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="321-321" /> <!-- N=40 v95%=1.2 -->
+ <Limit name="measured-frame-rate-176x144" range="258-258" /> <!-- N=114 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="79-79" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-640x360" range="37-37" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="16-16" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="8-8" /> <!-- N=40 v95%=1.2 -->
+ <Limit name="measured-frame-rate-320x180" range="99-99" /> <!-- N=114 v98%=1.0 -->
+ <Limit name="measured-frame-rate-640x360" range="37-37" /> <!-- N=108 v98%=1.0 -->
+ <Limit name="measured-frame-rate-1280x720" range="31-31" /> <!-- N=112 v98%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="14-14" /> <!-- N=114 v98%=1.3 -->
+ </MediaCodec>
+ <MediaCodec name="OMX.google.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
+ <!-- measured 96%:86-119 med:109/109 N=48 FLAKY(mn=45.9 < 55 - 218) -->
+ <Limit name="measured-frame-rate-320x180" range="109-109" /> <!-- v96%=1.2 -->
+ <!-- measured 96%:14-45 med:36/36 N=48 -->
+ <Limit name="measured-frame-rate-640x360" range="22-36" /> <!-- v96%=1.8 -->
+ <!-- measured 97%:4-12 med:6/6 N=50 -->
+ <Limit name="measured-frame-rate-1280x720" range="5-9" /> <!-- v97%=1.7 -->
+ <!-- measured 98%:1-6 med:5/4 N=64 -->
+ <Limit name="measured-frame-rate-1920x1080" range="2-4" /> <!-- v98%=1.9 -->
</MediaCodec>
</Encoders>
<Decoders>
<MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="683-683" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-352x288" range="699-699" /> <!-- N=40 v95%=1.1 -->
+ <!-- measured 97%:522-733 med:679/679 FLAKY(mn=290.8 < 340 - 1358) -->
+ <Limit name="measured-frame-rate-176x144" range="679-679" /> <!-- N=92 v97%=1.2 -->
+ <!-- measured 97%:520-747 med:654/652 FLAKY(mn=285.3 < 326 - 1304) -->
+ <Limit name="measured-frame-rate-352x288" range="652-652" /> <!-- N=94 v97%=1.2 -->
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="399-399" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-720x480" range="217-218" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="284-292" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-1920x1088" range="145-148" /> <!-- N=40 v95%=1.0 -->
+ <!-- measured 98%:350-415 med:382/382 N=92 -->
+ <Limit name="measured-frame-rate-320x240" range="382-382" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:194-224 med:211/211 N=92 -->
+ <Limit name="measured-frame-rate-720x480" range="211-211" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:265-299 med:287/287 N=92 -->
+ <Limit name="measured-frame-rate-1280x720" range="287-287" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:129-146 med:141/141 N=92 -->
+ <Limit name="measured-frame-rate-1920x1080" range="141-141" /> <!-- v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="498-498" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-640x360" range="379-379" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-720x480" range="309-309" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-1280x720" range="433-433" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="242-242" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-3840x2160" range="42-43" /> <!-- N=40 v95%=1.0 -->
+ <!-- measured 98%:352-544 med:408/410 N=92 -->
+ <Limit name="measured-frame-rate-352x288" range="410-410" /> <!-- v98%=1.2 -->
+ <!-- measured 98%:314-431 med:370/370 N=92 -->
+ <Limit name="measured-frame-rate-640x360" range="370-370" /> <!-- v98%=1.2 -->
+ <!-- measured 98%:268-345 med:332/333 N=92 -->
+ <Limit name="measured-frame-rate-720x480" range="333-333" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:341-460 med:372/372 N=92 -->
+ <Limit name="measured-frame-rate-1280x720" range="372-372" /> <!-- v98%=1.2 -->
+ <!-- measured 98%:230-257 med:253/253 N=92 -->
+ <Limit name="measured-frame-rate-1920x1080" range="253-253" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:43-44 med:43/43 N=92 -->
+ <Limit name="measured-frame-rate-3840x2160" range="43-43" /> <!-- v98%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="694-699" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-480x360" range="581-581" /> <!-- N=40 v95%=1.0 -->
+ <!-- measured 97%:496-699 med:664/663 FLAKY(mn=297.4 < 332 - 1326) -->
+ <Limit name="measured-frame-rate-176x144" range="663-663" /> <!-- N=94 v97%=1.2 -->
+ <!-- measured 98%:491-595 med:569/569 N=92 -->
+ <Limit name="measured-frame-rate-480x360" range="569-569" /> <!-- v98%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="385-385" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-640x360" range="366-366" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-1280x720" range="400-400" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="247-249" /> <!-- N=40 v95%=1.0 -->
+ <!-- measured 98%:366-391 med:382/382 N=92 -->
+ <Limit name="measured-frame-rate-320x180" range="382-382" /> <!-- v98%=1.0 -->
+ <!-- measured 97%:339-376 med:357/357 FLAKY(mn=0.5 < 179 - 714) -->
+ <Limit name="measured-frame-rate-640x360" range="357-357" /> <!-- N=92 v97%=1.1 -->
+ <!-- measured 98%:368-445 med:385/384 N=92 -->
+ <Limit name="measured-frame-rate-1280x720" range="384-384" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:244-252 med:248/248 N=92 -->
+ <Limit name="measured-frame-rate-1920x1080" range="248-248" /> <!-- v98%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
- <!-- measured 95%:111-254 med:124 SLOW -->
- <Limit name="measured-frame-rate-176x144" range="124-168" /> <!-- N=40 v95%=1.5 -->
+ <!-- measured 98%:86-282 med:104/105 N=92 FLAKY(53 - 282 < mx=302.2) -->
+ <Limit name="measured-frame-rate-176x144" range="105-141" /> <!-- v98%=1.8 -->
</MediaCodec>
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="355-359" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-720x480" range="109-110" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-1280x720" range="40-43" /> <!-- N=40 v95%=1.1 -->
- <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=40 v95%=1.2 -->
+ <!-- measured 90%:252-351 med:331/330 FLAKY(mn=104.6 < 165 - 660) -->
+ <Limit name="measured-frame-rate-320x240" range="330-330" /> <!-- N=96 v90%=1.2 -->
+ <!-- measured 98%:101-115 med:107/107 N=92 -->
+ <Limit name="measured-frame-rate-720x480" range="107-107" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:41-47 med:44/44 N=92 -->
+ <Limit name="measured-frame-rate-1280x720" range="44-44" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:16-26 med:18/18 N=92 -->
+ <Limit name="measured-frame-rate-1920x1080" range="18-18" /> <!-- v98%=1.3 -->
</MediaCodec>
<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="305-306" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-640x360" range="105-105" /> <!-- N=40 v95%=1.4 -->
- <Limit name="measured-frame-rate-720x480" range="97-97" /> <!-- N=40 v95%=1.3 -->
- <Limit name="measured-frame-rate-1280x720" range="39-39" /> <!-- N=40 v95%=1.3 -->
- <Limit name="measured-frame-rate-1920x1080" range="21-21" /> <!-- N=40 v95%=1.2 -->
+ <!-- measured 98%:97-438 med:273/272 N=98 FLAKY(mn=89.2 < 97 - 544) variance:2.1 -->
+ <Limit name="measured-frame-rate-352x288" range="194-272" />
+ <!-- measured 98%:141-195 med:175/175 N=92 -->
+ <Limit name="measured-frame-rate-640x360" range="175-175" /> <!-- v98%=1.2 -->
+ <!-- measured 98%:126-187 med:159/159 N=92 -->
+ <Limit name="measured-frame-rate-720x480" range="159-159" /> <!-- v98%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="74-74" /> <!-- N=124 v98%=1.3 -->
+ <!-- measured 98%:25-45 med:37/37 N=92 -->
+ <Limit name="measured-frame-rate-1920x1080" range="37-37" /> <!-- v98%=1.3 -->
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
- <!-- measured 95%:135-404 med:150 SLOW -->
- <Limit name="measured-frame-rate-176x144" range="150-233" /> <!-- N=40 v95%=1.7 -->
+ <!-- measured 98%:96-344 med:127/127 N=92 FLAKY(64 - 344 < mx=356.4) -->
+ <Limit name="measured-frame-rate-176x144" range="127-172" /> <!-- v98%=1.9 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
- <!-- measured 95%:383-730 med:397 SLOW -->
- <Limit name="measured-frame-rate-320x180" range="397-529" /> <!-- N=40 v95%=1.4 -->
- <Limit name="measured-frame-rate-640x360" range="107-150" /> <!-- TWEAKED -->
- <Limit name="measured-frame-rate-1280x720" range="25-26" /> <!-- N=40 v95%=1.0 -->
- <Limit name="measured-frame-rate-1920x1080" range="10-10" /> <!-- N=40 v95%=1.0 -->
+ <!-- measured 98%:318-939 med:337/337 N=92 FLAKY(169 - 940 < mx=956.9) -->
+ <Limit name="measured-frame-rate-320x180" range="337-470" /> <!-- v98%=1.7 -->
+ <!-- measured 98%:191-300 med:262/261 FLAKY(mn=115.2 < 131 - 522) -->
+ <Limit name="measured-frame-rate-640x360" range="261-261" /> <!-- N=248 v98%=1.3 -->
+ <Limit name="measured-frame-rate-1280x720" range="51-59" /> <!-- N=230 v98%=1.5 -->
+ <!-- measured 98%:11-24 med:23/23 FLAKY(mn=10.1 < 11 - 46) -->
+ <Limit name="measured-frame-rate-1920x1080" range="21-23" /> <!-- N=188 v98%=1.5 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="206-206" /> <!-- N=40 v95%=1.3 -->
- <Limit name="measured-frame-rate-640x360" range="89-89" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-1280x720" range="35-35" /> <!-- N=40 v95%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="21-21" /> <!-- N=40 v95%=1.2 -->
+ <!-- measured 98%:234-640 med:285/285 N=98 -->
+ <Limit name="measured-frame-rate-320x180" range="285-354" /> <!-- v98%=1.7 -->
+ <!-- measured 98%:104-305 med:122/122 N=94 FLAKY(61 - 306 < mx=317.3) -->
+ <Limit name="measured-frame-rate-640x360" range="122-153" /> <!-- v98%=1.7 -->
+ <!-- measured 98%:50-60 med:54/54 N=92 -->
+ <Limit name="measured-frame-rate-1280x720" range="54-54" /> <!-- v98%=1.1 -->
+ <!-- measured 98%:27-37 med:33/33 N=92 -->
+ <Limit name="measured-frame-rate-1920x1080" range="33-33" /> <!-- v98%=1.2 -->
</MediaCodec>
</Decoders>
</MediaCodecs>
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 1c44e72..43a17c2 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -18,45 +18,43 @@
-->
<device name="Android">
<!-- All values are in mA except as noted -->
+
+ <!-- Nothing -->
<item name="none">0</item>
- <item name="screen.on">159.667124493062</item>
- <item name="screen.full">203.327990537703</item>
- <item name="bluetooth.active">84.4</item>
- <item name="bluetooth.on">0.43</item>
- <item name="wifi.on">0.56</item>
- <item name="wifi.active">172.99</item>
- <item name="wifi.scan">25.7523644684504</item>
- <item name="dsp.audio">100.88</item>
- <item name="dsp.video">187.86</item>
- <item name="gps.on">21.3112768663199</item>
- <item name="radio.active">91.859655777944</item>
- <!-- The current consumed by the radio when it is scanning for a signal -->
- <item name="radio.scanning">4.56959643376497</item>
- <!-- Current consumed by the radio at different signal strengths, when paging -->
- <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
- <value>14.718992198734</value>
- <value>7.11953513364874</value>
- <value>9.67242765594385</value>
- <value>10.9664724655329</value>
- <value>5.9382806608961</value>
+
+ <!-- This is the battery capacity in mAh -->
+ <item name="battery.capacity">2700</item>
+
+ <!-- Number of cores each CPU cluster contains -->
+ <array name="cpu.clusters.cores">
+ <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
+ <value>2</value> <!-- Cluster 1 has 2 cores (cpu4, cpu5) -->
</array>
+
+ <!-- Power consumption when CPU is suspended -->
+ <item name="cpu.idle">0.075</item>
+ <!-- Additional power consumption when CPU is in a kernel idle loop -->
+ <item name="cpu.awake">4.397</item>
+
<!-- Different CPU speeds as reported in
- /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
+ /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies -->
<array name="cpu.speeds.cluster0">
<value>384000</value> <!-- 384 MHz CPU speed -->
- <value>460800</value> <!-- 460.8 MHz CPU speed -->
+ <value>460800</value> <!-- 460 MHz CPU speed -->
<value>600000</value> <!-- 600 MHz CPU speed -->
<value>672000</value> <!-- 672 MHz CPU speed -->
- <value>787200</value> <!-- 787.2 MHz CPU speed -->
+ <value>787200</value> <!-- 787 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>1440000</value> <!-- 1440 MHz CPU speed -->
</array>
+ <!-- Different CPU speeds as reported in
+ /sys/devices/system/cpu/cpu4/cpufreq/scaling_available_frequencies -->
<array name="cpu.speeds.cluster1">
<value>384000</value> <!-- 384 MHz CPU speed -->
<value>480000</value> <!-- 480 MHz CPU speed -->
- <value>633600</value> <!-- 633.6 MHz CPU speed -->
+ <value>633600</value> <!-- 633 MHz CPU speed -->
<value>768000</value> <!-- 768 MHz CPU speed -->
<value>864000</value> <!-- 864 MHz CPU speed -->
<value>960000</value> <!-- 960 MHz CPU speed -->
@@ -65,53 +63,80 @@
<value>1440000</value> <!-- 1440 MHz CPU speed -->
<value>1536000</value> <!-- 1536 MHz CPU speed -->
<value>1632000</value> <!-- 1632 MHz CPU speed -->
- <value>1689600</value> <!-- 1689.6 MHz CPU speed -->
+ <value>1689600</value> <!-- 1689 MHz CPU speed -->
<value>1824000</value> <!-- 1824 MHz CPU speed -->
</array>
- <!-- Power consumption when CPU is idle -->
- <item name="cpu.idle">3.46965169575592</item>
- <item name="cpu.awake">1.34521161231221</item>
- <!-- Power consumption at different speeds -->
+
+ <!-- Additional power used by a CPU from cluster 0 when running at different
+ speeds. Currently this measurement also includes cluster cost. -->
<array name="cpu.active.cluster0">
- <value>102.762</value> <!-- 384 MHz CPU speed -->
- <value>108.702</value> <!-- 460.8 MHz CPU speed -->
- <value>117.097</value> <!-- 600 MHz CPU speed -->
- <value>126.066</value> <!-- 672 MHz CPU speed -->
- <value>134.956</value> <!-- 787.2 MHz CPU speed -->
- <value>152.321</value> <!-- 864 MHz CPU speed -->
- <value>174.992</value> <!-- 960 MHz CPU speed -->
- <value>232.194</value> <!-- 1248 MHz CPU speed -->
- <value>275.754</value> <!-- 1440 MHz CPU speed -->
+ <value>77.358</value> <!-- 384 MHz CPU speed -->
+ <value>82.744</value> <!-- 460 MHz CPU speed -->
+ <value>85.913</value> <!-- 600 MHz CPU speed -->
+ <value>91.972</value> <!-- 672 MHz CPU speed -->
+ <value>97.483</value> <!-- 787 MHz CPU speed -->
+ <value>105.882</value> <!-- 864 MHz CPU speed -->
+ <value>113.951</value> <!-- 960 MHz CPU speed -->
+ <value>142.006</value> <!-- 1248 MHz CPU speed -->
+ <value>165.514</value> <!-- 1440 MHz CPU speed -->
</array>
+ <!-- Additional power used by a CPU from cluster 1 when running at different
+ speeds. Currently this measurement also includes cluster cost. -->
<array name="cpu.active.cluster1">
- <value>308.385</value> <!-- 384 MHz CPU speed -->
- <value>309.652</value> <!-- 480 MHz CPU speed -->
- <value>310.345</value> <!-- 633.6 MHz CPU speed -->
- <value>366.795</value> <!-- 768 MHz CPU speed -->
- <value>407.682</value> <!-- 864 MHz CPU speed -->
- <value>449.222</value> <!-- 960 MHz CPU speed -->
- <value>597.979</value> <!-- 1248 MHz CPU speed -->
- <value>658.785</value> <!-- 1344 MHz CPU speed -->
- <value>723.789</value> <!-- 1440 MHz CPU speed -->
- <value>801.563</value> <!-- 1536 MHz CPU speed -->
- <value>889.732</value> <!-- 1632 MHz CPU speed -->
- <value>941.965</value> <!-- 1689.6 MHz CPU speed -->
- <value>1074.40</value> <!-- 1824 MHz CPU speed -->
+ <value>132.714</value> <!-- 384 MHz CPU speed -->
+ <value>146.321</value> <!-- 480 MHz CPU speed -->
+ <value>167.495</value> <!-- 633 MHz CPU speed -->
+ <value>194.391</value> <!-- 768 MHz CPU speed -->
+ <value>211.625</value> <!-- 864 MHz CPU speed -->
+ <value>231.291</value> <!-- 960 MHz CPU speed -->
+ <value>298.062</value> <!-- 1248 MHz CPU speed -->
+ <value>325.774</value> <!-- 1344 MHz CPU speed -->
+ <value>353.432</value> <!-- 1440 MHz CPU speed -->
+ <value>389.501</value> <!-- 1536 MHz CPU speed -->
+ <value>427.866</value> <!-- 1632 MHz CPU speed -->
+ <value>444.878</value> <!-- 1689 MHz CPU speed -->
+ <value>496.031</value> <!-- 1824 MHz CPU speed -->
</array>
- <array name="cpu.clusters.cores">
- <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
- <value>2</value> <!-- Cluster 1 has 2 cores (cpu4, cpu5) -->
- </array>
- <!-- This is the battery capacity in mAh -->
- <item name="battery.capacity">2700</item>
- <array name="wifi.batchedscan"> <!-- mA. Current figures based on .0801 s/c and 75.48mA while scanning -->
- <value>.0076</value> <!-- 1-8/hr -->
- <value>.0613</value> <!-- 9-64/hr -->
- <value>.4845</value> <!-- 65-512/hr -->
+ <!-- Additional power used when screen is turned on at minimum brightness -->
+ <item name="screen.on">97.690</item>
+ <!-- Additional power used when screen is at maximum brightness, compared to
+ screen at minimum brightness -->
+ <item name="screen.full">171.856</item>
+
+ <!-- Average power used by the camera flash module when on -->
+ <item name="camera.flashlight">266.707</item>
+ <!-- Average power use by the camera subsystem for a typical camera
+ application. Intended as a rough estimate for an application running a
+ preview and capturing approximately 10 full-resolution pictures per
+ minute. -->
+ <item name="camera.avg">889.245</item>
+
+ <!-- Additional power used when audio decoding/encoding via DSP -->
+ <item name="dsp.audio">34.523</item>
+ <!-- Additional power used when video decoding via DSP -->
+ <item name="dsp.video">187.86</item>
+
+ <!-- Additional power used when GPS is acquiring a signal -->
+ <item name="gps.on">21.3112768663199</item>
+
+ <!-- Additional power used when Wi-Fi is turned on but not receiving,
+ transmitting, or scanning -->
+ <item name="wifi.on">0.56</item>
+ <!-- Additional power used when transmitting or receiving over Wi-Fi -->
+ <item name="wifi.active">172.99</item>
+ <!-- Additional power used when Wi-Fi is scanning for access points -->
+ <item name="wifi.scan">25.7523644684504</item>
+
+ <!-- mA. Current figures based on .0801 s/c and 75.48mA while scanning -->
+ <array name="wifi.batchedscan">
+ <value>0.0076</value> <!-- 1-8/hr -->
+ <value>0.0613</value> <!-- 9-64/hr -->
+ <value>0.4845</value> <!-- 65-512/hr -->
<value>3.870</value> <!-- 513-4096/hr -->
- <value>30.96</value> <!-- 4097-?/hr -->
+ <value>30.96</value> <!-- 4097-?/hr -->
</array>
+
<!-- Current at each of the wifi Tx levels in mA. The number of tx levels varies per device
and is available only of wifi chipsets which support the tx level reporting. Use
wifi.tx for other chipsets. none by default -->
@@ -280,4 +305,18 @@
<value>2.324374274</value>
<value>2.355329002</value>
</array>
+
+ <!-- Additional power used when cellular radio is transmitting/receiving -->
+ <item name="radio.active">91.859655777944</item>
+ <!-- The current consumed by the radio when it is scanning for a signal -->
+ <item name="radio.scanning">4.56959643376497</item>
+ <!-- Current consumed by the radio at different signal strengths, when paging -->
+ <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
+ <value>14.718992198734</value>
+ <value>7.11953513364874</value>
+ <value>9.67242765594385</value>
+ <value>10.9664724655329</value>
+ <value>5.9382806608961</value>
+ </array>
+
</device>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index 4a58f75..1749697 100644
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
@@ -89,6 +89,9 @@
<carrier_config mcc="268" mnc="01">
<boolean name="carrier_volte_available_bool" value="false" />
</carrier_config>
+ <carrier_config mcc="234" mnc="10" spn="giffgaff">
+ <string name="default_vm_number_string">443</string>
+ </carrier_config>
<carrier_config mcc="234" mnc="30">
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="hide_ims_apn_bool" value="true" />
diff --git a/ueventd.bullhead.rc b/ueventd.bullhead.rc
index 31613db..3138659 100644
--- a/ueventd.bullhead.rc
+++ b/ueventd.bullhead.rc
@@ -79,5 +79,5 @@
/dev/block/platform/soc.0/f9824900.sdhci/by-name/persistent 0600 system system
# sensor HUB
/dev/spich 0640 system system
-/dev/nanohub 0640 system system
-/dev/nanohub_comms 0640 system system
+/dev/nanohub 0660 system system
+/dev/nanohub_comms 0660 system system
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 14:25:22 +0000