Merge "Expose Location toggling logic" into oc-dr1-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b2a55c9..a9c7689 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1343,8 +1343,8 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"በeSIM ላይ አገልግሎት አቅራቢዎች"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ይህ የእርስዎን የተንቀሳቃሽ ስልክ አገልግሎት ዕቅድ አይሰርዘውም።"</string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"በeSIM ላይ ያሉ የአገልግሎት አቅራቢዎች"</li></string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ይሄ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ማከማቻ አጥፋ"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index d68f3eb..91c3d17 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1343,7 +1343,7 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başqa istifadəçilər iştirak edir.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM"</li>" operatorları"</string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM operatorları"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7cc9f06..a4b729a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1344,7 +1344,7 @@
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
<string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilfunkanbieter auf der eSIM"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dein Mobilfunktarif wird dadurch nicht gekündigt."</string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4182c83..c8073f2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1050,7 +1050,7 @@
<string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la carga o si está conectado a una base"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
<string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
- <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Con el dispositivo en un dock"</string>
+ <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Con el dispositivo en una base"</string>
<string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nunca"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
<string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar lo que ocurre cuando el teléfono está en un dock o inactivo, activa el salvapantallas."</string>
@@ -2860,9 +2860,9 @@
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tonos de llamada"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"Otros sonidos y vibraciones"</string>
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
- <string name="advanced_section_header" msgid="8833934850242546903">"Opciones avanzadas"</string>
+ <string name="advanced_section_header" msgid="8833934850242546903">"Ajustes avanzados"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
- <string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos notificación"</string>
+ <string name="notification_badging_title" msgid="5938709971403474078">"Permitir burbujas notificación"</string>
<string name="notification_pulse_title" msgid="1905382958860387030">"Luz parpadeante"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla de bloqueo"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de las notificaciones"</string>
@@ -3123,7 +3123,7 @@
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
<string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Categorías: prioritarias"</string>
- <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
+ <string name="advanced_apps" msgid="4812975097124803873">"Ajustes avanzados"</string>
<string name="configure_apps" msgid="6685680790825882528">"Configurar aplicaciones"</string>
<string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
<string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 21a00d6..819e317 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -351,13 +351,13 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivado polo administrador"</string>
<string name="security_status_title" msgid="5848766673665944640">"Estado da seguranza"</string>
- <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo da pantalla, impresión dixital"</string>
- <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo da pantalla"</string>
+ <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla, impresión dixital"</string>
+ <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Xest. identificación"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar identificac. para"</string>
<string name="fingerprint_add_title" msgid="1926752654454033904">"Engadir impresión dixital"</string>
- <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo da pantalla"</string>
+ <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueo de pantalla"</string>
<plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
<item quantity="other">Configuráronse <xliff:g id="COUNT_1">%1$d</xliff:g> impresións dixitais</item>
<item quantity="one">Configurouse <xliff:g id="COUNT_0">%1$d</xliff:g> impresión dixital</item>
@@ -462,7 +462,7 @@
<string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Escolle o método de bloqueo da pantalla alternativo"</string>
<string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"Opcións de bloqueo da pantalla"</string>
<string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"Opcións de bloqueo da pantalla"</string>
- <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo da pantalla"</string>
+ <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueo de pantalla"</string>
<string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / inmediatamente despois de entrar en suspensión"</string>
<string name="unlock_set_unlock_launch_picker_summary_lock_after_timeout" msgid="4696710373399258413">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/<xliff:g id="TIMEOUT_STRING">%2$s</xliff:g> despois de entrar en suspensión"</string>
<string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Bloqueo perf. traballo"</string>
@@ -1343,8 +1343,8 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores en eSIM"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Esta acción non cancelará o teu plan de servizos móbiles."</string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores da eSIM"</li></string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imaxes e outros datos de usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamento USB"</string>
@@ -1519,7 +1519,7 @@
<string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Realizáronse demasiados intentos incorrectos. Téntao de novo en <xliff:g id="NUMBER">%d</xliff:g> segundos."</string>
<string name="activity_not_found" msgid="5551664692991605325">"A aplicación non está instalada no teléfono."</string>
<string name="lock_settings_profile_title" msgid="2121876391814535295">"Seguranza do perfil de traballolevel"</string>
- <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Bloqueo da pantalla do perfil de traballo"</string>
+ <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Bloqueo de pantalla do perfil de traballo"</string>
<string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Utilizar un bloqueo"</string>
<string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Utilizar un bloqueo para o perfil de traballo e a pantalla do dispositivo"</string>
<string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Queres utilizar un bloqueo?"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 6e07074..cd1580a 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1343,8 +1343,8 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Հաշիվներն այս սարքում՝\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան:\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Էլեկտրոնային SIM քարտի օպերատորներ"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Սա չի չեղարկի ձեր բջջային ծառայությունների փաթեթը:"</string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-ի օպերատորներ"</li></string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Բջջային ծառայությունների ձեր փաթեթը չի չեղարկվի:"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"USB կրիչը "</b>"պետք է ջնջվի:"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Երաժշտությունը, նկարները և այլ տվյալները "<b>"SD քարտից"</b>" մաքրելու համար` այն պետք է ջնջել:"</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ջնջել USB կրիչը"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b4bd72a..821f8f5 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1343,8 +1343,8 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"បច្ចុប្បន្ន អ្នកបានចូលគណនីដូចខាងក្រោម៖ \n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"មានអ្នកផ្សេងច្រើនទៀតមានវត្តមាននៅលើឧបករណ៍នេះ។\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យអ្នកប្រើផ្សេងទៀត"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទដែលប្រើ eSIM"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"វានឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទរបស់អ្នកទេ។"</string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទដែលប្រើ eSIM"</li></string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"វានឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទរបស់អ្នកទេ។"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ដើម្បីសម្អាតតន្ត្រី រូបថត និងទិន្នន័យអ្នកប្រើផ្សេងៗ តម្រូវឲ្យលុប"<b>"ឧបករណ៍ផ្ទុកយូអេសប៊ី"</b>" ។"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ដើម្បីសម្អាតតន្ត្រី, រូបភាព និងទិន្នន័យអ្នកប្រើផ្សេងទៀត "<b>"ចាំបាច់ត្រូវ"</b>" លុបកាតអេសឌី។"</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"លុបឧបករណ៍ផ្ទុកយូអេសប៊ី"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 9cf4319..5030149 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1344,7 +1344,7 @@
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ມີຜູ້ໃຊ້ອື່ນຢູ່ເທິງອຸປະກອນນີ້.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ"</li></string>
<string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ຜູ້ໃຫ້ບໍລິການຢູ່ eSIM"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດມືຖືຂອງທ່ານ."</string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"ລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2cf8c91..819e5d6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1055,7 +1055,7 @@
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
<string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Noklusējums"</string>
<string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Pielāgota"</string>
- <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Fona tapetes mainīšana"</string>
+ <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Mainīt fona tapeti"</string>
<string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Ekrāna personalizēšana"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
<string name="screensaver_settings_title" msgid="1770575686476851778">"Ekrānsaudzētājs"</string>
@@ -1357,7 +1357,7 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilo sakaru operatori iegultajā SIM kartē"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilo sakaru operatori iegultajā SIM kartē"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
@@ -1823,7 +1823,7 @@
<string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrāna lasītāji, attēlojums, mijiedarbības vadīklas"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Redzes iestatījumi"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Varat pielāgot šo ierīci savām vajadzībām. Šīs pieejamības funkcijas var mainīt vēlāk sadaļā Iestatījumi."</string>
- <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Fonta palielināšana"</string>
+ <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Palielināt fonta izmēru"</string>
<string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrāna lasītāji"</string>
<string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio un ekrānā redzamais teksts"</string>
<string name="display_category_title" msgid="685461049938269166">"Attēlojums"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b42b6b1..f38df34 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1372,7 +1372,7 @@
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
<string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorzy na karcie eSIM"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Wyczyść nośnik USB"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 978314a..e86d813 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1324,14 +1324,14 @@
<string name="menu_restore" msgid="8260067415075573273">"Återställ standardinst."</string>
<string name="restore_default_apn_completed" msgid="2824775307377604897">"Återställning av standardinställningar för APN har slutförts."</string>
<string name="reset_dashboard_title" msgid="4412694650600342973">"Återställ"</string>
- <string name="reset_network_title" msgid="4557113742173895074">"Nätverksinställningarna återställda"</string>
+ <string name="reset_network_title" msgid="4557113742173895074">"Återställ nätverksinställningar"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Alla nätverksinställningar återställs, till exempel \n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
<string name="reset_network_button_text" msgid="2035676527471089853">"Återställ inställningar"</string>
<string name="reset_network_final_desc" msgid="6388371121099245116">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
<string name="reset_network_final_button_text" msgid="1797434793741744635">"Återställ inställningar"</string>
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Vill du återställa?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Den här användaren kan inte återställa nätverket"</string>
- <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har inte återställts"</string>
+ <string name="reset_network_complete_toast" msgid="787829973559541880">"Nätverksinställningarna har återställts"</string>
<string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
<plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
<item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> konton återställs</item>
@@ -1343,7 +1343,7 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det finns andra användare på enheten.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Öperatörer på eSIM-kortet"</li></string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatörer på eSIM-kortet"</li></string>
<string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"SD-kortet"</b>"."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ec93ec5..d3111ff 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1344,7 +1344,7 @@
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
<string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM\'deki operatörler"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir"</string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB belleği sil"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 65e1da8..9217177 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -341,7 +341,7 @@
<string name="Accounts_settings_title" msgid="1643879107901699406">"帐号"</string>
<string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
<string name="account_settings_title" msgid="626177544686329806">"帐号"</string>
- <string name="security_settings_title" msgid="4918904614964215087">"安全性和位置"</string>
+ <string name="security_settings_title" msgid="4918904614964215087">"安全性和位置信息"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密与凭据"</string>
<string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"手机已加密"</string>
<string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"设备已加密"</string>
@@ -1343,8 +1343,8 @@
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐号：\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"此设备上目前还有其他用户。\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
- <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 的运营商"</li></string>
- <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"这样并不会取消移动服务套餐。"</string>
+ <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡中的运营商"</li></string>
+ <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"这样并不会取消您的移动服务套餐。"</string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化USB存储设备"</string>
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 196fec8..ddcdd8c 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -118,7 +118,6 @@
private String[] mReadOnlyApnTypes;
private String[] mReadOnlyApnFields;
private boolean mReadOnlyApn;
- private String mUserEnteredApnType;
/**
* Standard projection for the interesting columns of a normal note.
@@ -216,7 +215,6 @@
mReadOnlyApn = false;
mReadOnlyApnTypes = null;
mReadOnlyApnFields = null;
- mUserEnteredApnType = null;
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
@@ -1120,15 +1118,11 @@
}
private String getUserEnteredApnType() {
- if (mUserEnteredApnType != null) {
- return mUserEnteredApnType;
- }
-
// if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
- mUserEnteredApnType = mApnType.getText();
- if (mUserEnteredApnType != null) mUserEnteredApnType = mUserEnteredApnType.trim();
- if ((TextUtils.isEmpty(mUserEnteredApnType)
- || PhoneConstants.APN_TYPE_ALL.equals(mUserEnteredApnType))
+ String userEnteredApnType = mApnType.getText();
+ if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
+ if ((TextUtils.isEmpty(userEnteredApnType)
+ || PhoneConstants.APN_TYPE_ALL.equals(userEnteredApnType))
&& !ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
StringBuilder editableApnTypes = new StringBuilder();
List<String> readOnlyApnTypes = Arrays.asList(mReadOnlyApnTypes);
@@ -1146,12 +1140,12 @@
editableApnTypes.append(apnType);
}
}
- mUserEnteredApnType = editableApnTypes.toString();
+ userEnteredApnType = editableApnTypes.toString();
Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
- + mUserEnteredApnType);
+ + userEnteredApnType);
}
- return mUserEnteredApnType;
+ return userEnteredApnType;
}
public static class ErrorDialog extends InstrumentedDialogFragment {
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 406d293..db1f01d 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1365,25 +1365,21 @@
OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() {
public void onClick(View v) {
- final Intent intent = new Intent();
- final ComponentName serviceComponent = new ComponentName("com.android.omadm.service",
- "DMIntentReceiver");
+ final Intent intent = new Intent("com.android.settings.CARRIER_PROVISIONING");
+ final ComponentName serviceComponent = ComponentName.unflattenFromString(
+ "com.android.omadm.service/.DMIntentReceiver");
intent.setComponent(serviceComponent);
- intent.setAction("com.android.settings.CARRIER_PROVISIONING");
- getApplicationContext().sendBroadcast(
- intent, android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
+ sendBroadcast(intent);
}
};
OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() {
public void onClick(View v) {
- final Intent intent = new Intent();
- final ComponentName serviceComponent = new ComponentName("com.android.omadm.service",
- "DMIntentReceiver");
+ final Intent intent = new Intent("com.android.settings.TRIGGER_CARRIER_PROVISIONING");
+ final ComponentName serviceComponent = ComponentName.unflattenFromString(
+ "com.android.omadm.service/.DMIntentReceiver");
intent.setComponent(serviceComponent);
- intent.setAction("com.android.settings.TRIGGER_CARRIER_PROVISIONING");
- getApplicationContext().sendBroadcast(
- intent, android.Manifest.permission.MODIFY_PHONE_STATE);
+ sendBroadcast(intent);
}
};
diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java
index f66970d..3e869fe 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -72,7 +72,6 @@
String titleResPackageName, int titleResId, CharSequence summary, String fragment,
Bundle fragmentArguments, Drawable icon) {
super(context);
- setLayoutResource(R.layout.preference_small_icon);
mTitle = account.name;
mTitleResPackageName = titleResPackageName;
mTitleResId = titleResId;
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index 8f4b27d..70fd659 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -232,8 +232,7 @@
.build();
notifyDashboardDataChanged(prevData);
} else {
- suggestions.remove(suggestion);
- mSuggestionAdapter.notifyDataSetChanged();
+ mSuggestionAdapter.removeSuggestion(suggestion);
}
}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 7a2ab2d..4539680 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -134,4 +134,8 @@
return null;
}
+ public void removeSuggestion(Tile suggestion) {
+ mSuggestions.remove(suggestion);
+ notifyDataSetChanged();
+ }
}
diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
index 23c70bb..0c401b5 100644
--- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
@@ -124,7 +124,7 @@
wakeupAlarmDetectionEnabled = mParserWrapper.getBoolean(KEY_WAKEUP_ALARM_DETECTION_ENABLED,
false);
bluetoothScanDetectionEnabled = mParserWrapper.getBoolean(
- KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
+ KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,
DateUtils.HOUR_IN_MILLIS);
wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 60);
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
index 6779828..b0e34fa 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
@@ -16,8 +16,10 @@
package com.android.settings.fuelgauge.anomaly.action;
+import android.Manifest;
import android.content.Context;
import android.content.pm.permission.RuntimePermissionPresenter;
+import android.support.annotation.VisibleForTesting;
import android.support.v4.content.PermissionChecker;
import com.android.internal.logging.nano.MetricsProto;
@@ -29,13 +31,17 @@
public class LocationCheckAction extends AnomalyAction {
private static final String TAG = "LocationCheckAction";
- private static final String LOCATION_PERMISSION = "android.permission-group.LOCATION";
private final RuntimePermissionPresenter mRuntimePermissionPresenter;
public LocationCheckAction(Context context) {
+ this(context, RuntimePermissionPresenter.getInstance(context));
+ }
+
+ @VisibleForTesting
+ LocationCheckAction(Context context, RuntimePermissionPresenter runtimePermissionPresenter) {
super(context);
- mRuntimePermissionPresenter = RuntimePermissionPresenter.getInstance(context);
+ mRuntimePermissionPresenter = runtimePermissionPresenter;
mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_LOCATION_CHECK;
}
@@ -43,17 +49,22 @@
public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
super.handlePositiveAction(anomaly, contextMetricsKey);
mRuntimePermissionPresenter.revokeRuntimePermission(anomaly.packageName,
- LOCATION_PERMISSION);
+ Manifest.permission_group.LOCATION);
}
@Override
public boolean isActionActive(Anomaly anomaly) {
- return PermissionChecker.checkPermission(mContext, LOCATION_PERMISSION, -1, anomaly.uid,
- anomaly.packageName) == PermissionChecker.PERMISSION_GRANTED;
+ return isPermissionGranted(anomaly, Manifest.permission.ACCESS_COARSE_LOCATION)
+ || isPermissionGranted(anomaly, Manifest.permission.ACCESS_FINE_LOCATION);
}
@Override
public int getActionType() {
return Anomaly.AnomalyActionType.LOCATION_CHECK;
}
+
+ private boolean isPermissionGranted(Anomaly anomaly, String permission) {
+ return PermissionChecker.checkPermission(mContext, permission, -1, anomaly.uid,
+ anomaly.packageName) == PermissionChecker.PERMISSION_GRANTED;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index df16b4b..4d81320 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -34,14 +34,12 @@
import android.content.Intent;
import android.content.res.Resources;
import android.content.res.TypedArray;
-import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.support.v7.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
-import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -356,6 +354,30 @@
}
@Test
+ public void testSuggestionDismissed_moreThanTwoSuggestions_defaultMode_shouldNotCrash() {
+ final RecyclerView data = new RecyclerView(RuntimeEnvironment.application);
+ final View itemView = mock(View.class);
+ when(itemView.findViewById(R.id.data)).thenReturn(data);
+ final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
+ new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
+ final List<Tile> suggestions =
+ makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
+ final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
+ null /* conditions */, null /* suggestionParser */, null /* callback */));
+ adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+ adapter.onBindConditionAndSuggestion(
+ holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
+ // default mode, only displaying 2 suggestions
+
+ adapter.onSuggestionDismissed(suggestions.get(1));
+
+ // verify operations that access the lists will not cause ConcurrentModificationException
+ assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(1);
+ adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+ // should not crash
+ }
+
+ @Test
public void testSuggestioDismissed_onlySuggestion_updateDashboardData() {
DashboardAdapter adapter =
spy(new DashboardAdapter(mContext, null, null, null, null));
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
index 07727c3..914cc2f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -86,7 +86,7 @@
assertThat(anomalyDetectionPolicy.wakeLockThreshold).isEqualTo(DateUtils.HOUR_IN_MILLIS);
assertThat(anomalyDetectionPolicy.wakeupAlarmDetectionEnabled).isFalse();
assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60);
- assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isFalse();
+ assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(
30 * DateUtils.MINUTE_IN_MILLIS);
}
@@ -114,7 +114,7 @@
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
AnomalyDetectionPolicy.KEY_WAKEUP_ALARM_DETECTION_ENABLED, false);
doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
- AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, false);
+ AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
return new AnomalyDetectionPolicy(mContext, mKeyValueListParserWrapper);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
new file mode 100644
index 0000000..234dd12
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.anomaly.action;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowPermissionChecker;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows =
+ ShadowPermissionChecker.class)
+public class LocationCheckActionTest {
+ private static final String PACKAGE_NAME = "com.android.app";
+ private static final int UID = 12345;
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+ private Anomaly mAnomaly;
+ private LocationCheckAction mLocationCheckAction;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest(mContext);
+ mLocationCheckAction = new LocationCheckAction(mContext, null);
+ mAnomaly = new Anomaly.Builder()
+ .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
+ .setPackageName(PACKAGE_NAME)
+ .setUid(UID)
+ .build();
+ ShadowPermissionChecker.clear();
+ }
+
+ @Test
+ public void testIsActionActive_coarseLocationGranted_returnTrue() {
+ ShadowPermissionChecker.addPermission(Manifest.permission.ACCESS_COARSE_LOCATION, -1, UID,
+ PACKAGE_NAME, PackageManager.PERMISSION_GRANTED);
+
+ assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isTrue();
+ }
+
+ @Test
+ public void testIsActionActive_fineLocationGranted_returnTrue() {
+ ShadowPermissionChecker.addPermission(Manifest.permission.ACCESS_FINE_LOCATION, -1, UID,
+ PACKAGE_NAME, PackageManager.PERMISSION_GRANTED);
+
+ assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isTrue();
+ }
+
+ @Test
+ public void testIsActionActive_noLocationGranted_returnFalse() {
+ assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isFalse();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
new file mode 100644
index 0000000..4f15642
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
+import android.support.v4.content.PermissionChecker;
+import android.text.TextUtils;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * This class provides shadow for API that is not supported in current roboletric
+ */
+@Implements(PermissionChecker.class)
+public class ShadowPermissionChecker {
+
+ private static Map<PermissionInfo, Integer> sPermissions = new HashMap<>();
+
+ public static void clear() {
+ sPermissions.clear();
+ }
+
+ public static void addPermission(String permission, int pid, int uid, String packageName,
+ int permissionValue) {
+ sPermissions.put(new PermissionInfo(permission, pid, uid, packageName), permissionValue);
+ }
+
+ @Implementation
+ public static int checkPermission(@NonNull Context context, @NonNull String permission,
+ int pid, int uid, String packageName) {
+ return sPermissions.getOrDefault(new PermissionInfo(permission, pid, uid, packageName),
+ PackageManager.PERMISSION_DENIED);
+ }
+
+ private static class PermissionInfo {
+ private final int mPid;
+ private final int mUid;
+ private final String mPackageName;
+ private final String mPermission;
+
+ public PermissionInfo(String permission, int pid, int uid, String packageName) {
+ mPid = pid;
+ mUid = uid;
+ mPackageName = packageName;
+ mPermission = permission;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof PermissionInfo)) {
+ return false;
+ }
+
+ final PermissionInfo other = (PermissionInfo) obj;
+ return mPid == other.mPid
+ && mUid == other.mUid
+ && TextUtils.equals(mPackageName, other.mPackageName)
+ && TextUtils.equals(mPermission, other.mPermission);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mPid, mUid, mPackageName, mPermission);
+ }
+ }
+}