Merge "sepolicy: Allow kernel net_admin" into mnc-dev
diff --git a/ShamuLayout/res/values-bg/strings.xml b/ShamuLayout/res/values-bg/strings.xml
index 4b3d7a3..d043eaf 100644
--- a/ShamuLayout/res/values-bg/strings.xml
+++ b/ShamuLayout/res/values-bg/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Начален екран на Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Googlе"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Създаване"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Google Play"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-cs/strings.xml b/ShamuLayout/res/values-cs/strings.xml
index fc64569..4b63464 100644
--- a/ShamuLayout/res/values-cs/strings.xml
+++ b/ShamuLayout/res/values-cs/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Plocha tabletu Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Vytvořit"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Přehrát"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-es/strings.xml b/ShamuLayout/res/values-es/strings.xml
index bdfc978..177281f 100644
--- a/ShamuLayout/res/values-es/strings.xml
+++ b/ShamuLayout/res/values-es/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Pantalla de inicio de Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Crear"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Reproducir"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-et-rEE/strings.xml b/ShamuLayout/res/values-et-rEE/strings.xml
index 08af861..770f921 100644
--- a/ShamuLayout/res/values-et-rEE/strings.xml
+++ b/ShamuLayout/res/values-et-rEE/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 avaekraan"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Loomine"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Esitamine"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-fa/strings.xml b/ShamuLayout/res/values-fa/strings.xml
index 4e57eb5..379288b 100644
--- a/ShamuLayout/res/values-fa/strings.xml
+++ b/ShamuLayout/res/values-fa/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"صفحه اصلی Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"ایجاد"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"پخش"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-fi/strings.xml b/ShamuLayout/res/values-fi/strings.xml
index 33366d6..bfc3a40 100644
--- a/ShamuLayout/res/values-fi/strings.xml
+++ b/ShamuLayout/res/values-fi/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6:n aloitusruutu"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Luo"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Toista"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-fr-rCA/strings.xml b/ShamuLayout/res/values-fr-rCA/strings.xml
index 910b509..b73b4f7 100644
--- a/ShamuLayout/res/values-fr-rCA/strings.xml
+++ b/ShamuLayout/res/values-fr-rCA/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Écran d\'accueil du Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Créer"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Google Play"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-hi/strings.xml b/ShamuLayout/res/values-hi/strings.xml
index 65711ed..24e181a 100644
--- a/ShamuLayout/res/values-hi/strings.xml
+++ b/ShamuLayout/res/values-hi/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 होम स्क्रीन"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"बनाएं"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"चलाएं"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-kk-rKZ/strings.xml b/ShamuLayout/res/values-kk-rKZ/strings.xml
index 8512a92..607d120 100644
--- a/ShamuLayout/res/values-kk-rKZ/strings.xml
+++ b/ShamuLayout/res/values-kk-rKZ/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 негізгі экраны"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Жасау"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Ойнату"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-ky-rKG/strings.xml b/ShamuLayout/res/values-ky-rKG/strings.xml
index ce04d48..466ad97 100644
--- a/ShamuLayout/res/values-ky-rKG/strings.xml
+++ b/ShamuLayout/res/values-ky-rKG/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 Башкы экраны"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Түзүү"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Ойнотуу"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-lt/strings.xml b/ShamuLayout/res/values-lt/strings.xml
index 9f17d19..82ddaf8 100644
--- a/ShamuLayout/res/values-lt/strings.xml
+++ b/ShamuLayout/res/values-lt/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Pagrindinis „Nexus 6“ ekranas"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Sukurti"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Google Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-lv/strings.xml b/ShamuLayout/res/values-lv/strings.xml
index 39c3219..90f51e3 100644
--- a/ShamuLayout/res/values-lv/strings.xml
+++ b/ShamuLayout/res/values-lv/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 sākuma ekrāns"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Izveidot"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Atskaņot"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-mk-rMK/strings.xml b/ShamuLayout/res/values-mk-rMK/strings.xml
index f0ac9d6..e5efbf3 100644
--- a/ShamuLayout/res/values-mk-rMK/strings.xml
+++ b/ShamuLayout/res/values-mk-rMK/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Почетен екран на Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Создај"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Пушти"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-ml-rIN/strings.xml b/ShamuLayout/res/values-ml-rIN/strings.xml
index 60772eb..26aa8e4 100644
--- a/ShamuLayout/res/values-ml-rIN/strings.xml
+++ b/ShamuLayout/res/values-ml-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 ഹോം സ്ക്രീൻ"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"സൃഷ്ടിക്കുക"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"പ്ലേ ചെയ്യുക"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-mr-rIN/strings.xml b/ShamuLayout/res/values-mr-rIN/strings.xml
index 1a866b7..785400d 100644
--- a/ShamuLayout/res/values-mr-rIN/strings.xml
+++ b/ShamuLayout/res/values-mr-rIN/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 मुख्य स्क्रीन"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"तयार करा"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"प्ले करा"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-ne-rNP/strings.xml b/ShamuLayout/res/values-ne-rNP/strings.xml
index 2f8a96f..df5ec50 100644
--- a/ShamuLayout/res/values-ne-rNP/strings.xml
+++ b/ShamuLayout/res/values-ne-rNP/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"नेक्सस ६ गृह स्क्रिन"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"सिर्जना गर्नुहोस्"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"बजाउनुहोस्"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-nl/strings.xml b/ShamuLayout/res/values-nl/strings.xml
index 399f81c..41afb74 100644
--- a/ShamuLayout/res/values-nl/strings.xml
+++ b/ShamuLayout/res/values-nl/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6-startscherm"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Maken"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Afspelen"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-ro/strings.xml b/ShamuLayout/res/values-ro/strings.xml
index f087d26..ed33fc2 100644
--- a/ShamuLayout/res/values-ro/strings.xml
+++ b/ShamuLayout/res/values-ro/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Ecranul de pornire Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Creați"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Redați"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-si-rLK/strings.xml b/ShamuLayout/res/values-si-rLK/strings.xml
index a8e1d1f..dfe5792 100644
--- a/ShamuLayout/res/values-si-rLK/strings.xml
+++ b/ShamuLayout/res/values-si-rLK/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 මුල් තිරය"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"සාදන්න"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"ධාවනය කරන්න"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-sl/strings.xml b/ShamuLayout/res/values-sl/strings.xml
index f1be526..a36ea44 100644
--- a/ShamuLayout/res/values-sl/strings.xml
+++ b/ShamuLayout/res/values-sl/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Začetni zaslon Nexusa 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Ustvari"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Google Play"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-sq-rAL/strings.xml b/ShamuLayout/res/values-sq-rAL/strings.xml
index ab69a32..be9ce07 100644
--- a/ShamuLayout/res/values-sq-rAL/strings.xml
+++ b/ShamuLayout/res/values-sq-rAL/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Ekrani bazë i Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Krijo"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Luaj"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-th/strings.xml b/ShamuLayout/res/values-th/strings.xml
index 1a2a44e..491ab6c 100644
--- a/ShamuLayout/res/values-th/strings.xml
+++ b/ShamuLayout/res/values-th/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"หน้าจอหลักของ Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"สร้าง"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"เล่น"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-tl/strings.xml b/ShamuLayout/res/values-tl/strings.xml
index 13e9505..c903790 100644
--- a/ShamuLayout/res/values-tl/strings.xml
+++ b/ShamuLayout/res/values-tl/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Home Screen ng Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Gumawa"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"I-play"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-tr/strings.xml b/ShamuLayout/res/values-tr/strings.xml
index 80f22f8..60d6757 100644
--- a/ShamuLayout/res/values-tr/strings.xml
+++ b/ShamuLayout/res/values-tr/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 Ana Ekranı"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Oluştur"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Google Play"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-vi/strings.xml b/ShamuLayout/res/values-vi/strings.xml
index dcebff1..814da6c 100644
--- a/ShamuLayout/res/values-vi/strings.xml
+++ b/ShamuLayout/res/values-vi/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Màn hình chính Nexus 6"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"Tạo"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"Phát"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/ShamuLayout/res/values-zh-rHK/strings.xml b/ShamuLayout/res/values-zh-rHK/strings.xml
index eed3e51..40605ec 100644
--- a/ShamuLayout/res/values-zh-rHK/strings.xml
+++ b/ShamuLayout/res/values-zh-rHK/strings.xml
@@ -19,5 +19,5 @@
<string name="app_label" msgid="4827444239162090155">"Nexus 6 主畫面"</string>
<string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
<string name="create_folder_title" msgid="1626185277541881691">"建立"</string>
- <string name="play_folder_title" msgid="8796147714003891112">"播放"</string>
+ <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
</resources>
diff --git a/bluetooth/BCM4356A2_001.003.015.0077.0214_ORC.hcd b/bluetooth/BCM4356A2_001.003.015.0077.0214_ORC.hcd
new file mode 100644
index 0000000..b242dc4
--- /dev/null
+++ b/bluetooth/BCM4356A2_001.003.015.0077.0214_ORC.hcd
Binary files differ
diff --git a/camera/QCamera2/stack/common/cam_types.h b/camera/QCamera2/stack/common/cam_types.h
index 704bcbf..5261961 100644
--- a/camera/QCamera2/stack/common/cam_types.h
+++ b/camera/QCamera2/stack/common/cam_types.h
@@ -576,7 +576,8 @@
typedef enum {
CAM_AEC_TRIGGER_IDLE,
- CAM_AEC_TRIGGER_START
+ CAM_AEC_TRIGGER_START,
+ CAM_AEC_TRIGGER_CANCEL
} cam_aec_trigger_type_t;
typedef enum {
diff --git a/device.mk b/device.mk
index 41e2288..b2c8f4a 100644
--- a/device.mk
+++ b/device.mk
@@ -104,7 +104,7 @@
# BT FW
PRODUCT_COPY_FILES += \
- device/moto/shamu/bluetooth/BCM4356A2_001.003.015.0071.0190_ORC.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/bcm4354A2.hcd
+ device/moto/shamu/bluetooth/BCM4356A2_001.003.015.0077.0214_ORC.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/bcm4354A2.hcd
# For SPN display
PRODUCT_COPY_FILES += \
@@ -224,7 +224,19 @@
#Reduce IMS logging
PRODUCT_PROPERTY_OVERRIDES += \
- persist.ims.disableDebugLogs=1
+ persist.ims.disableDebugLogs=1 \
+ persist.ims.disableADBLogs=2 \
+ persist.ims.disableDebugLogs=0 \
+ persist.ims.disableQXDMLogs=0 \
+ persist.ims.disableIMSLogs=1 \
+ persist.camera.hal.debug.mask=7 \
+ persist.camera.ISP.debug.mask=0 \
+ persist.camera.pproc.debug.mask=7 \
+ persist.camera.stats.debug.mask=0 \
+ persit.camera.imglib.logs=1 \
+ persist.camera.mct.debug.mask=1 \
+ persist.camera.sensor.debug=0 \
+ vidc.debug.level=1
#Disable QC Oem Hook
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/mixer_paths.xml b/mixer_paths.xml
index e89bd3e..3f50de3 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -872,10 +872,19 @@
<ctl name="BOOST_STUB Left Mixer left" value="1" />
</path>
+ <path name="speaker-safe-and-headphones">
+ <path name="speaker-safe" />
+ <path name="headphones" />
+ </path>
+
<path name="speaker-and-line">
<path name="speaker-and-headphones" />
</path>
+ <path name="speaker-safe-and-line">
+ <path name="speaker-safe-and-headphones" />
+ </path>
+
<path name="voice-rec-mic">
<path name="handset-mic" />
</path>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 4c5413a..150d10d 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -135,6 +135,7 @@
<item>"bp-tools:rndis:rndis,diag,diag_mdm,serial_hsic,serial_tty,rmnet_hsic,usbnet,adb"</item>
<item>"bp-tools:mtp,adb:diag,diag_mdm,serial_hsic,serial_tty,rmnet_hsic,usbnet,adb"</item>
<item>"bp-tools:mtp:diag,diag_mdm,serial_hsic,serial_tty,rmnet_hsic,usbnet"</item>
+ <item>"bp-tools:adb:diag,diag_mdm,serial_hsic,serial_tty,rmnet_hsic,usbnet,adb"</item>
<item>"mot-factory:rndis,adb:usbnet,adb"</item>
<item>"mot-factory:rndis:usbnet"</item>
<item>"mot-factory:mtp,adb:usbnet,adb"</item>
@@ -190,6 +191,7 @@
<item>"mobile_ia,14,0,2,-1,true"</item>
<item>"bluetooth,7,7,2,-1,true"</item>
<item>"ethernet,9,9,9,-1,true"</item>
+ <item>"mobile_emergency,15,0,2,-1,true</item>
</string-array>
<!-- This string array should be overridden by the device to present a list of radio
@@ -333,4 +335,8 @@
don't support RIL_REQUEST_GET_RADIO_CAPABILITY
format is UMTS|LTE|... -->
<string translatable="false" name="config_radio_access_family">GSM | WCDMA | LTE | CDMA | EVDO</string>
+
+ <string-array name="config_cell_retries_per_error_code">
+ <item>36,3</item> <!-- REGULAR_DEACTIVATION, 3 retries -->
+ </string-array>
</resources>
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 02a6ad2..4a565ab 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -28,7 +28,8 @@
<item name="wifi.scan">100</item>
<item name="dsp.audio">25</item>
<item name="dsp.video">180</item>
- <item name="camera.flashlight">153.33</item>
+ <item name="camera.avg">272.57</item>
+ <item name="camera.flashlight">149.28</item>
<item name="gps.on">70</item>
<item name="radio.active">350</item>
<!-- The current consumed by the radio when it is scanning for a signal -->
diff --git a/sepolicy/init.te b/sepolicy/init.te
index 33cbf02..9e6cef3 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -1,2 +1,4 @@
allow init diag_device:chr_file unlink;
allow init tmpfs:lnk_file create_file_perms;
+allow init userdata_block_device:blk_file rw_file_perms;
+allow init cache_block_device:blk_file rw_file_perms;
