Merge commit 'goog/readonly-p4-master'

res/values-cs/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Autorská práva"</string>
     <string name="license_title">"Licence"</string>
     <string name="terms_title">"Smluvní podmínky"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licence open source"</string>
     <string name="settings_license_activity_unavailable">"Při načítání licencí došlo k chybě."</string>
     <string name="settings_license_activity_loading">"Načítání..."</string>

res/values-de/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Urheberrecht"</string>
     <string name="license_title">"Lizenz"</string>
     <string name="terms_title">"Nutzungsbedingungen"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Open Source-Lizenzen"</string>
     <string name="settings_license_activity_unavailable">"Beim Laden der Lizenzen ist ein Problem aufgetreten."</string>
     <string name="settings_license_activity_loading">"Wird geladen..."</string>

res/values-es/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Derechos de autor"</string>
     <string name="license_title">"Licencia"</string>
     <string name="terms_title">"Términos y condiciones"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licencias de software libre"</string>
     <string name="settings_license_activity_unavailable">"Se ha producido un problema al intentar cargar las licencias."</string>
     <string name="settings_license_activity_loading">"Cargando..."</string>

res/values-fr/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licence"</string>
     <string name="terms_title">"Conditions d\'utilisation"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Ouvrir licences source"</string>
     <string name="settings_license_activity_unavailable">"Un problème est survenu lors du chargement des licences."</string>
     <string name="settings_license_activity_loading">"Chargement..."</string>

res/values-it/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Copyright"</string>
     <string name="license_title">"Licenza"</string>
     <string name="terms_title">"Termini e condizioni"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licenze open source"</string>
     <string name="settings_license_activity_unavailable">"Errore durante il caricamento delle licenze."</string>
     <string name="settings_license_activity_loading">"Caricamento..."</string>

res/values-ko/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"저작권"</string>
     <string name="license_title">"라이센스"</string>
     <string name="terms_title">"약관"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"오픈소스 라이센스"</string>
     <string name="settings_license_activity_unavailable">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
     <string name="settings_license_activity_loading">"로드 중..."</string>

res/values-nb/strings.xml

@@ -500,6 +500,10 @@
     <string name="copyright_title">"Opphavsrett"</string>
     <string name="license_title">"Lisens"</string>
     <string name="terms_title">"Betingelser"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Åpen kildekode-lisenser"</string>
     <string name="settings_license_activity_unavailable">"Kunne ikke hente lisensene."</string>
     <string name="settings_license_activity_loading">"henter…"</string>

res/values-nl/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Auteursrecht"</string>
     <string name="license_title">"Licentie"</string>
     <string name="terms_title">"Algemene voorwaarden"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Open-sourcelicenties"</string>
     <string name="settings_license_activity_unavailable">"Er is een probleem bij het laden van de licenties."</string>
     <string name="settings_license_activity_loading">"Laden..."</string>

res/values-pl/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Prawa autorskie"</string>
     <string name="license_title">"Licencja"</string>
     <string name="terms_title">"Warunki i zasady korzystania"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Licencje open source"</string>
     <string name="settings_license_activity_unavailable">"Wystąpił problem podczas ładowania licencji."</string>
     <string name="settings_license_activity_loading">"Ładowanie..."</string>

res/values-ru/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"Авторские права"</string>
     <string name="license_title">"Лицензия"</string>
     <string name="terms_title">"Условия предоставления услуг"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"Лицензии Open Source"</string>
     <string name="settings_license_activity_unavailable">"При загрузке лицензий произошла ошибка."</string>
     <string name="settings_license_activity_loading">"Идет загрузка…"</string>

res/values-zh-rCN/arrays.xml

@@ -55,15 +55,19 @@
     <item>"插入后从不进入休眠状态"</item>
     <item>"从不"</item>
   </string-array>
-    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+  <string-array name="battery_history_type_spinner">
-    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <item>"CPU 使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <item>"网络使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <item>"GPS 使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <item>"传感器使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <item>"部分激活使用率"</item>
-    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <item>"其他使用率"</item>
-    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+  </string-array>
-    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
+  <string-array name="battery_history_which_spinner">
+    <item>"自上次拔出后"</item>
+    <item>"自启动以来的总时间"</item>
+    <item>"所有时间总计"</item>
+  </string-array>
   <string-array name="usage_stats_display_order_types">
     <item>"使用时间"</item>
     <item>"启动次数"</item>

res/values-zh-rCN/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"版权"</string>
     <string name="license_title">"许可"</string>
     <string name="terms_title">"条款"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"开源许可"</string>
     <string name="settings_license_activity_unavailable">"载入许可时出现问题。"</string>
     <string name="settings_license_activity_loading">"正在载入..."</string>

res/values-zh-rTW/arrays.xml

@@ -55,15 +55,19 @@
     <item>"插入時絕不"</item>
     <item>"從不"</item>
   </string-array>
-    <!-- no translation found for battery_history_type_spinner:0 (2193799199027871385) -->
+  <string-array name="battery_history_type_spinner">
-    <!-- no translation found for battery_history_type_spinner:1 (6401018715947316517) -->
+    <item>"CPU 使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:2 (188092590354892392) -->
+    <item>"網路使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:3 (8414109131222049141) -->
+    <item>"GPS 使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:4 (1327904325081257093) -->
+    <item>"感應器使用率"</item>
-    <!-- no translation found for battery_history_type_spinner:5 (4832254146664706277) -->
+    <item>"部分喚醒使用率"</item>
-    <!-- no translation found for battery_history_which_spinner:0 (3451981114763440074) -->
+    <item>"其他使用率"</item>
-    <!-- no translation found for battery_history_which_spinner:1 (166936313535197598) -->
+  </string-array>
-    <!-- no translation found for battery_history_which_spinner:2 (4793941382744963893) -->
+  <string-array name="battery_history_which_spinner">
+    <item>"自上次拔除插頭後的時間"</item>
+    <item>"開機後總時間"</item>
+    <item>"所有時間的總計"</item>
+  </string-array>
   <string-array name="usage_stats_display_order_types">
     <item>"使用時間"</item>
     <item>"啟動計數"</item>

res/values-zh-rTW/strings.xml

@@ -498,6 +498,10 @@
     <string name="copyright_title">"版權"</string>
     <string name="license_title">"授權"</string>
     <string name="terms_title">"條款及細則"</string>
+    <!-- no translation found for system_tutorial_list_item_title (4315834755909579018) -->
+    <skip />
+    <!-- no translation found for system_tutorial_list_item_summary (3861815254521030201) -->
+    <skip />
     <string name="settings_license_activity_title">"開啟原始授權"</string>
     <string name="settings_license_activity_unavailable">"載入授權時發生問題"</string>
     <string name="settings_license_activity_loading">"載入中..."</string>

src/com/android/settings/bluetooth/LocalBluetoothDevice.java

@@ -575,9 +575,10 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
      */
     private void fetchBtClass() {
         mBtClass = mLocalManager.getBluetoothManager().getRemoteClass(mAddress);
-        mProfiles.clear();
+        if (mBtClass != BluetoothClass.ERROR) {
             LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
         }
+    }
 
     /**
      * Refreshes the UI for the BT class, including fetching the latest value

src/com/android/settings/bluetooth/LocalBluetoothManager.java

@@ -199,9 +199,17 @@ public class LocalBluetoothManager {
     }
     
     private void syncBluetoothState() {
-        setBluetoothStateInt(mManager.isEnabled()
+        int bluetoothState;
+
+        if (mManager != null) {
+            bluetoothState = mManager.isEnabled()
                     ? BluetoothDevice.BLUETOOTH_STATE_ON
-                : BluetoothDevice.BLUETOOTH_STATE_OFF);
+                    : BluetoothDevice.BLUETOOTH_STATE_OFF;
+        } else {
+            bluetoothState = BluetoothError.ERROR;
+        }
+
+        setBluetoothStateInt(bluetoothState);
     }
 
     public void setBluetoothEnabled(boolean enabled) {