Merge tag 'android-8.1.0_r46' into oreo-x86

Android 8.1.0 Release 46 (OPM6.171019.030.K1)

Conflicts:
	AndroidManifest.xml
	res/values-es/strings.xml
	res/values-km/strings.xml

diff --cc AndroidManifest.xml
index dab5e13,591a132..09651b6
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -2048,37 -1983,6 +2048,28 @@@
                  android:value="com.android.settings.print.PrintJobSettingsFragment" />
          </activity>
  
-         <!-- Keep compatibility with old shortcuts. -->
-         <activity-alias android:name="DevelopmentSettings"
-                   android:exported="true"
-                   android:label="@string/development_settings_title"
-                   android:targetActivity="Settings$DevelopmentSettingsActivity">
-             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                 android:value="com.android.settings.development.DevelopmentSettings" />
-         </activity-alias>
- 
 +        <activity android:name="Settings$SuperuserActivity"
 +                android:label="@string/superuser"
 +                android:icon="@drawable/ic_action_permission"
 +                android:taskAffinity="com.android.settings"
 +                android:parentActivityName="Settings$UserAndAccountDashboardActivity">
 +            <intent-filter>
 +                <action android:name="android.intent.action.MAIN" />
 +                <category android:name="android.intent.category.DEFAULT" />
 +            </intent-filter>
 +            <intent-filter android:priority="3">
 +                <action android:name="com.android.settings.action.SETTINGS" />
 +            </intent-filter>
 +            <meta-data android:name="com.android.settings.summary"
 +                android:resource="@string/superuser_description"/>
 +            <meta-data android:name="com.android.settings.category"
 +                android:value="com.android.settings.category.ia.accounts" />
 +            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
 +                android:value="com.android.settings.cyanogenmod.superuser.PolicyNativeFragment" />
 +            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
 +                android:value="true" />
 +        </activity>
 +
          <activity android:name=".development.AppPicker"
                    android:label="@string/select_application"
                    android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />

diff --cc res/values-af/strings.xml
Simple merge

diff --cc res/values-am/strings.xml
Simple merge

diff --cc res/values-ar/strings.xml
index fc26ad3,bfdb455..8ff57e5
--- 1/res/values-ar/strings.xml
--- 2/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@@ -1178,10 -1178,9 +1178,10 @@@
      <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
      <string name="firmware_version" msgid="4801135784886859972">"‏إصدار Android"</string>
      <string name="security_patch" msgid="8438384045870296634">"‏مستوى رمز تصحيح أمان Android"</string>
 +    <string name="device_manufacturer" msgid="3516742885166545865">"جهة التصنيع"</string>
      <string name="model_info" msgid="1952009518045740889">"الطراز"</string>
-     <string name="hardware_info" msgid="2605080746512527805">"اÙ\84طراز Ù\88اÙ\84أجÙ\87زة"</string>
-     <string name="hardware_revision" msgid="8893547686367095527">"إصدار اÙ\84أجÙ\87زة"</string>
+     <string name="hardware_info" msgid="2605080746512527805">"اÙ\84طراز Ù\88اÙ\84جÙ\87از"</string>
+     <string name="hardware_revision" msgid="8893547686367095527">"إصدار اÙ\84جÙ\87از"</string>
      <string name="fcc_equipment_id" msgid="149114368246356737">"معرّف الجهاز"</string>
      <string name="baseband_version" msgid="1848990160763524801">"إصدار النطاق الأساسي"</string>
      <string name="kernel_version" msgid="9192574954196167602">"إصدار النواة"</string>

diff --cc res/values-az/strings.xml
Simple merge

diff --cc res/values-b+sr+Latn/strings.xml
Simple merge

diff --cc res/values-be/strings.xml
Simple merge

diff --cc res/values-bg/strings.xml
Simple merge

diff --cc res/values-bn/strings.xml
Simple merge

diff --cc res/values-bs/strings.xml
Simple merge

diff --cc res/values-ca/strings.xml
Simple merge

diff --cc res/values-cs/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-en-rAU/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values-en-rIN/strings.xml
Simple merge

diff --cc res/values-es-rUS/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
index 0cbd4c7,9f34e11..f412b03
--- 1/res/values-es/strings.xml
--- 2/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@@ -1125,8 -1125,7 +1125,8 @@@
      <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Actualizaciones del sistema"</string>
      <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
      <string name="firmware_version" msgid="4801135784886859972">"Versión de Android"</string>
-     <string name="security_patch" msgid="8438384045870296634">"Nivel de parche de seguridad de Android"</string>
+     <string name="security_patch" msgid="8438384045870296634">"Nivel del parche de seguridad de Android"</string>
 +    <string name="device_manufacturer" msgid="3516742885166545865">"Fabricante"</string>
      <string name="model_info" msgid="1952009518045740889">"Modelo"</string>
      <string name="hardware_info" msgid="2605080746512527805">"Modelo y hardware"</string>
      <string name="hardware_revision" msgid="8893547686367095527">"Versión de hardware"</string>

diff --cc res/values-et/strings.xml
Simple merge

diff --cc res/values-eu/strings.xml
index 81c278c,f49b1f8..c80fe15
--- 1/res/values-eu/strings.xml
--- 2/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@@ -1126,10 -1126,9 +1126,10 @@@
      <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
      <string name="firmware_version" msgid="4801135784886859972">"Android bertsioa"</string>
      <string name="security_patch" msgid="8438384045870296634">"Android segurtasunaren adabaki-maila"</string>
 +    <string name="device_manufacturer" msgid="3516742885166545865">"Fabrikatzailea"</string>
      <string name="model_info" msgid="1952009518045740889">"Modeloa"</string>
      <string name="hardware_info" msgid="2605080746512527805">"Modeloa eta hardwarea"</string>
-     <string name="hardware_revision" msgid="8893547686367095527">"Hardware bertsioa"</string>
+     <string name="hardware_revision" msgid="8893547686367095527">"Hardware-bertsioa"</string>
      <string name="fcc_equipment_id" msgid="149114368246356737">"Ekipoaren IDa"</string>
      <string name="baseband_version" msgid="1848990160763524801">"Oinarri-bandaren bertsioa"</string>
      <string name="kernel_version" msgid="9192574954196167602">"Kernel bertsioa"</string>

diff --cc res/values-fa/strings.xml
Simple merge

diff --cc res/values-fi/strings.xml
Simple merge

diff --cc res/values-fr-rCA/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-gl/strings.xml
Simple merge

diff --cc res/values-gu/strings.xml
index feae63e,04097c1..a9f4155
--- 1/res/values-gu/strings.xml
--- 2/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@@ -1126,10 -1126,9 +1126,10 @@@
      <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
      <string name="firmware_version" msgid="4801135784886859972">"Android સંસ્કરણ"</string>
      <string name="security_patch" msgid="8438384045870296634">"Android સુરક્ષા પૅચ સ્તર"</string>
 +    <string name="device_manufacturer" msgid="3516742885166545865">"નિર્માતા"</string>
      <string name="model_info" msgid="1952009518045740889">"મોડલ"</string>
      <string name="hardware_info" msgid="2605080746512527805">"મૉડલ અને હાર્ડવેર"</string>
-     <string name="hardware_revision" msgid="8893547686367095527">"હારà«\8dડવà«\87ર સàª\82સà«\8dàª\95રણ"</string>
+     <string name="hardware_revision" msgid="8893547686367095527">"હારà«\8dડવà«\87ર વરà«\8dàª\9dન"</string>
      <string name="fcc_equipment_id" msgid="149114368246356737">"સાધન ID"</string>
      <string name="baseband_version" msgid="1848990160763524801">"બેઝબૅન્ડ વર્ઝન"</string>
      <string name="kernel_version" msgid="9192574954196167602">"કર્નલ વર્ઝન"</string>

diff --cc res/values-hi/strings.xml
Simple merge

diff --cc res/values-hr/strings.xml
Simple merge

diff --cc res/values-hu/strings.xml
Simple merge

diff --cc res/values-hy/strings.xml
Simple merge

diff --cc res/values-in/strings.xml
Simple merge

diff --cc res/values-is/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-iw/strings.xml
Simple merge

diff --cc res/values-ja/strings.xml
Simple merge

diff --cc res/values-ka/strings.xml
Simple merge

diff --cc res/values-kk/strings.xml
Simple merge

diff --cc res/values-km/strings.xml
index e412fc2,b1339d4..b6d0b9d
--- 1/res/values-km/strings.xml
--- 2/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@@ -1126,8 -1126,7 +1126,8 @@@
      <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
      <string name="firmware_version" msgid="4801135784886859972">"កំណែ Android"</string>
      <string name="security_patch" msgid="8438384045870296634">"កម្រិតនៃការដោះស្រាយសុវត្ថិភាព Android"</string>
-     <string name="model_info" msgid="1952009518045740889">"គំរូ"</string>
 +    <string name="device_manufacturer" msgid="3516742885166545865">"ក្រុមហ៊ុនផលិត"</string>
+     <string name="model_info" msgid="1952009518045740889">"ម៉ូដែល"</string>
      <string name="hardware_info" msgid="2605080746512527805">"ម៉ូដែល និង​ផ្នែករឹង"</string>
      <string name="hardware_revision" msgid="8893547686367095527">"កំណែ​ផ្នែករឹង"</string>
      <string name="fcc_equipment_id" msgid="149114368246356737">"លេខ​សម្គាល់​បរិក្ខារ"</string>

diff --cc res/values-kn/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-ky/strings.xml
Simple merge

diff --cc res/values-lo/strings.xml
Simple merge

diff --cc res/values-lt/strings.xml
Simple merge

diff --cc res/values-lv/strings.xml
Simple merge

diff --cc res/values-mk/strings.xml
Simple merge

diff --cc res/values-ml/strings.xml
Simple merge

diff --cc res/values-mn/strings.xml
Simple merge

diff --cc res/values-mr/strings.xml
Simple merge

diff --cc res/values-ms/strings.xml
Simple merge

diff --cc res/values-my/strings.xml
Simple merge

diff --cc res/values-nb/strings.xml
Simple merge

diff --cc res/values-ne/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-pa/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rBR/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-pt/strings.xml
Simple merge

diff --cc res/values-ro/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
Simple merge

diff --cc res/values-si/strings.xml
Simple merge

diff --cc res/values-sk/strings.xml
Simple merge

diff --cc res/values-sl/strings.xml
Simple merge

diff --cc res/values-sq/strings.xml
Simple merge

diff --cc res/values-sr/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-sw/strings.xml
Simple merge

diff --cc res/values-ta/strings.xml
Simple merge

diff --cc res/values-te/strings.xml
Simple merge

diff --cc res/values-th/strings.xml
Simple merge

diff --cc res/values-tl/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
Simple merge

diff --cc res/values-uk/strings.xml
Simple merge

diff --cc res/values-ur/strings.xml
Simple merge

diff --cc res/values-uz/strings.xml
index 8a4b4ed,15329e1..388da58
--- 1/res/values-uz/strings.xml
--- 2/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@@ -1126,9 -1126,8 +1126,9 @@@
      <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
      <string name="firmware_version" msgid="4801135784886859972">"Android versiyasi"</string>
      <string name="security_patch" msgid="8438384045870296634">"Tizim xavfsizligi uchun yangilanish"</string>
 +    <string name="device_manufacturer" msgid="3516742885166545865">"Ishlab chiqaruvchi"</string>
      <string name="model_info" msgid="1952009518045740889">"Model"</string>
-     <string name="hardware_info" msgid="2605080746512527805">"Model va apparat ta’minoti"</string>
+     <string name="hardware_info" msgid="2605080746512527805">"Model va qurilma"</string>
      <string name="hardware_revision" msgid="8893547686367095527">"Apparat versiyasi"</string>
      <string name="fcc_equipment_id" msgid="149114368246356737">"Jihozning nomi"</string>
      <string name="baseband_version" msgid="1848990160763524801">"Aloqa moduli versiyasi"</string>

diff --cc res/values-vi/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
Simple merge

diff --cc res/values-zh-rHK/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge

diff --cc res/values-zu/strings.xml
Simple merge