From 7ddcb36b527fb94b54ca7a99bbdd1acd2966decb Mon Sep 17 00:00:00 2001 From: Michael Chan <> Date: Tue, 31 Mar 2009 13:55:18 -0700 Subject: [PATCH 1/3] AI 143628: am: CL 143480 Fixed the problem where Settings would crash if you enable airplane mode, go Home, go back to Wireless Settings. This only happens in emulator. Bluetooth isn't supported in emulator but the crash was fixed so users can enable/disable Airplane Mode. Original author: chanm Merged from: //branches/donutburger/... Automated import of CL 143628 --- .../settings/bluetooth/LocalBluetoothManager.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java index 1a848b2d066..273f79748e4 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java @@ -199,9 +199,17 @@ public class LocalBluetoothManager { } private void syncBluetoothState() { - setBluetoothStateInt(mManager.isEnabled() - ? BluetoothDevice.BLUETOOTH_STATE_ON - : BluetoothDevice.BLUETOOTH_STATE_OFF); + int bluetoothState; + + if (mManager != null) { + bluetoothState = mManager.isEnabled() + ? BluetoothDevice.BLUETOOTH_STATE_ON + : BluetoothDevice.BLUETOOTH_STATE_OFF; + } else { + bluetoothState = BluetoothError.ERROR; + } + + setBluetoothStateInt(bluetoothState); } public void setBluetoothEnabled(boolean enabled) { From af7e1c9295976dffacd82ca831f381e629216c14 Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Tue, 31 Mar 2009 14:20:41 -0700 Subject: [PATCH 2/3] AI 143712: am: CL 143685 am: CL 143547 Import revised translations. Original author: enf Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143712 --- res/values-cs/strings.xml | 4 ++++ res/values-de/strings.xml | 4 ++++ res/values-es/strings.xml | 4 ++++ res/values-fr/strings.xml | 4 ++++ res/values-it/strings.xml | 4 ++++ res/values-ko/strings.xml | 4 ++++ res/values-nb/strings.xml | 4 ++++ res/values-nl/strings.xml | 4 ++++ res/values-pl/strings.xml | 4 ++++ res/values-ru/strings.xml | 4 ++++ res/values-zh-rCN/arrays.xml | 22 +++++++++++++--------- res/values-zh-rCN/strings.xml | 4 ++++ res/values-zh-rTW/arrays.xml | 22 +++++++++++++--------- res/values-zh-rTW/strings.xml | 4 ++++ 14 files changed, 74 insertions(+), 18 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 92f30c46d92..6d029ecea1b 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -498,6 +498,10 @@ "Autorská práva" "Licence" "Smluvní podmínky" + + + + "Licence open source" "Při načítání licencí došlo k chybě." "Načítání..." diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 39e6b338dff..c9267b9db1a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -498,6 +498,10 @@ "Urheberrecht" "Lizenz" "Nutzungsbedingungen" + + + + "Open Source-Lizenzen" "Beim Laden der Lizenzen ist ein Problem aufgetreten." "Wird geladen..." diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index cc0f857c499..e4396f2de06 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -498,6 +498,10 @@ "Derechos de autor" "Licencia" "Términos y condiciones" + + + + "Licencias de software libre" "Se ha producido un problema al intentar cargar las licencias." "Cargando..." diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index c1299d5f5d9..23caacc30ea 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -498,6 +498,10 @@ "Copyright" "Licence" "Conditions d\'utilisation" + + + + "Ouvrir licences source" "Un problème est survenu lors du chargement des licences." "Chargement..." diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index c1433d99ddf..97491e019b9 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -498,6 +498,10 @@ "Copyright" "Licenza" "Termini e condizioni" + + + + "Licenze open source" "Errore durante il caricamento delle licenze." "Caricamento..." diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index e71639359c2..2a3d233a535 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -498,6 +498,10 @@ "저작권" "라이센스" "약관" + + + + "오픈소스 라이센스" "라이센스를 로드하는 동안 문제가 발생했습니다." "로드 중..." diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6a3727a747a..af7bb4c8f86 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -500,6 +500,10 @@ "Opphavsrett" "Lisens" "Betingelser" + + + + "Åpen kildekode-lisenser" "Kunne ikke hente lisensene." "henter…" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 46adabe1e57..1b57d4de125 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -498,6 +498,10 @@ "Auteursrecht" "Licentie" "Algemene voorwaarden" + + + + "Open-sourcelicenties" "Er is een probleem bij het laden van de licenties." "Laden..." diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 7ccff23c777..a452c0cefd0 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -498,6 +498,10 @@ "Prawa autorskie" "Licencja" "Warunki i zasady korzystania" + + + + "Licencje open source" "Wystąpił problem podczas ładowania licencji." "Ładowanie..." diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index cc6a90198dc..18353e349f2 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -498,6 +498,10 @@ "Авторские права" "Лицензия" "Условия предоставления услуг" + + + + "Лицензии Open Source" "При загрузке лицензий произошла ошибка." "Идет загрузка…" diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml index 5b3b651343f..5f3ec45c13e 100644 --- a/res/values-zh-rCN/arrays.xml +++ b/res/values-zh-rCN/arrays.xml @@ -55,15 +55,19 @@ "插入后从不进入休眠状态" "从不" - - - - - - - - - + + "CPU 使用率" + "网络使用率" + "GPS 使用率" + "传感器使用率" + "部分激活使用率" + "其他使用率" + + + "自上次拔出后" + "自启动以来的总时间" + "所有时间总计" + "使用时间" "启动次数" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3be275a86de..1428b85d3a2 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -498,6 +498,10 @@ "版权" "许可" "条款" + + + + "开源许可" "载入许可时出现问题。" "正在载入..." diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml index 2ec9ed2a5c6..a399602f0e8 100644 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -55,15 +55,19 @@ "插入時絕不" "從不" - - - - - - - - - + + "CPU 使用率" + "網路使用率" + "GPS 使用率" + "感應器使用率" + "部分喚醒使用率" + "其他使用率" + + + "自上次拔除插頭後的時間" + "開機後總時間" + "所有時間的總計" + "使用時間" "啟動計數" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index b8ffcbc9b39..629cb659b29 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -498,6 +498,10 @@ "版權" "授權" "條款及細則" + + + + "開啟原始授權" "載入授權時發生問題" "載入中..." From 0e2016789ee27db86300329305f2f638b25037f0 Mon Sep 17 00:00:00 2001 From: Nick Pelly <> Date: Tue, 31 Mar 2009 14:42:35 -0700 Subject: [PATCH 3/3] AI 143812: am: CL 143788 am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error. Also clean up the error codes returned by the framework, so that the settings app can properly detect an error. Original author: npelly Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143812 --- src/com/android/settings/bluetooth/LocalBluetoothDevice.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java index 199a4225baf..86b1d69e3b3 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java @@ -575,8 +575,9 @@ public class LocalBluetoothDevice implements Comparable { */ private void fetchBtClass() { mBtClass = mLocalManager.getBluetoothManager().getRemoteClass(mAddress); - mProfiles.clear(); - LocalBluetoothProfileManager.fill(mBtClass, mProfiles); + if (mBtClass != BluetoothClass.ERROR) { + LocalBluetoothProfileManager.fill(mBtClass, mProfiles); + } } /**