Skip connectivity change when not resumed
am: 5d8ac6462b
Change-Id: Ieddbaf49d919921448dab6acdc1bf22fa9f586e8
diff --git a/Settings/res/values-b+sr+Latn/strings.xml b/Settings/res/values-b+sr+Latn/strings.xml
index 32ccf50..d8eb4d3 100644
--- a/Settings/res/values-b+sr+Latn/strings.xml
+++ b/Settings/res/values-b+sr+Latn/strings.xml
@@ -46,7 +46,7 @@
<string name="wifi_setting_always_scan" msgid="8883713018717323351">"Skeniranje je uvek dostupno"</string>
<string name="wifi_setting_always_scan_context" msgid="5588180043357910712">"Dozvolite Google-ovoj usluzi lokacije i drugim aplikacijama da skeniraju mreže, čak i kada je Wi-Fi isključen"</string>
<string name="wifi_setting_enable_wifi" msgid="9214100840401870408">"Wi-Fi"</string>
- <string name="device_daydream" msgid="3354366974209179614">"Čuvar ekrana"</string>
+ <string name="device_daydream" msgid="4933581408059561077">"Sanjarenje"</string>
<string name="device_display" msgid="101455384386372747">"Prikaz"</string>
<string name="device_sound" msgid="9214182566287657481">"Zvuk"</string>
<string name="device_surround_sound" msgid="6272196310566546860">"Zvučni sistem"</string>
@@ -625,12 +625,12 @@
<string name="settings_on" msgid="6892236264945435013">"Uključeno"</string>
<string name="settings_off" msgid="449272161738237637">"Isključeno"</string>
<string name="device_daydreams_none" msgid="2767107052779579259">"Isključite ekran"</string>
- <string name="device_daydreams_select" msgid="2112338101206187695">"Čuvar ekrana"</string>
+ <string name="device_daydreams_select" msgid="3691552535056569158">"Sanjarenje"</string>
<string name="device_daydreams_test" msgid="9038920213402659591">"Pokreni odmah"</string>
- <string name="device_daydreams_sleep" msgid="7676938708373592766">"Kada se pokreće"</string>
- <string name="device_daydreams_sleep_description" msgid="7655223016581708511">"Čuvar ekrana se pokreće posle ovog perioda neaktivnosti. Ako nikakav čuvar ekrana nije izabran, ekran se isključuje."</string>
+ <string name="device_daydreams_sleep" msgid="8766795993034660366">"Kada treba aktivirati Sanjarenje"</string>
+ <string name="device_daydreams_sleep_description" msgid="5269460120567642259">"Sanjarenje počinje posle ovog perioda neaktivnosti. Ako nikakvo Sanjarenje nije izabrano, ekran se isključuje."</string>
<string name="device_daydreams_sleep_summary" msgid="7361113408939289262">"Posle <xliff:g id="SLEEP_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
- <string name="device_daydreams_screen_off" msgid="1765925964376076171">"Prebaci uređaj u režim spavanja"</string>
+ <string name="device_daydreams_screen_off" msgid="5002473979169042970">"Kada treba aktivirati spavanje"</string>
<string name="device_daydreams_screen_off_description" msgid="4181262365345306243">"Ekran se isključuje posle ovog perioda neaktivnosti."</string>
<string name="backup_configure_account_default_summary" msgid="5619226302157702967">"Trenutno nijedan nalog ne čuva rezervne kopije podataka"</string>
<string name="backup_erase_dialog_title" msgid="3720907811680819429"></string>
diff --git a/Settings/res/values-be-rBY/strings.xml b/Settings/res/values-be-rBY/strings.xml
index 9404d68..0fe30ef 100644
--- a/Settings/res/values-be-rBY/strings.xml
+++ b/Settings/res/values-be-rBY/strings.xml
@@ -67,15 +67,14 @@
<skip />
<!-- no translation found for wifi_setting_enable_wifi (9214100840401870408) -->
<skip />
- <!-- no translation found for device_daydream (3354366974209179614) -->
- <skip />
+ <string name="device_daydream" msgid="4933581408059561077">"Мара"</string>
<string name="device_display" msgid="101455384386372747">"Экран"</string>
<string name="device_sound" msgid="9214182566287657481">"Гук"</string>
<!-- no translation found for device_surround_sound (6272196310566546860) -->
<skip />
<!-- no translation found for device_sound_effects (7793281745920228622) -->
<skip />
- <string name="device_apps" msgid="9180435229638772838">"Праграмы"</string>
+ <string name="device_apps" msgid="9180435229638772838">"Прыкладанні"</string>
<!-- no translation found for device_storage_reset (1425978936501134425) -->
<skip />
<!-- no translation found for device_backup_restore (5627523987587511884) -->
@@ -404,7 +403,7 @@
<string name="storage_available" msgid="1241005580092138871">"Даступна"</string>
<string name="storage_size" msgid="8958530823208352781">"Усяго месца: <xliff:g id="TOTAL_SPACE">%1$s</xliff:g>"</string>
<string name="storage_calculating_size" msgid="2644732407412520565">"Вядзецца падлік..."</string>
- <string name="storage_apps_usage" msgid="4366049071039081219">"Праграмы"</string>
+ <string name="storage_apps_usage" msgid="4366049071039081219">"Прыкладанні"</string>
<string name="storage_downloads_usage" msgid="6172975879962599380">"Спампоўкі"</string>
<!-- no translation found for storage_dcim_usage (2977564696540645452) -->
<skip />
@@ -565,15 +564,15 @@
<skip />
<string name="system_date" msgid="2767108116769558081">"Дата"</string>
<string name="system_time" msgid="6726022312605226285">"Час"</string>
- <string name="system_set_date" msgid="2437586307768561116">"Задаць дату"</string>
- <string name="system_set_time" msgid="4661804115501057452">"Задаць час"</string>
+ <string name="system_set_date" msgid="2437586307768561116">"Усталяваць дату"</string>
+ <string name="system_set_time" msgid="4661804115501057452">"Усталяваць час"</string>
<string name="system_set_time_zone" msgid="8239601932757697259">"Усталяваць часавы пояc"</string>
<!-- no translation found for desc_set_time_zone (2948629174438460709) -->
<skip />
<string name="system_set_time_format" msgid="4447882066895090612">"Выкарыстоўваць 24-гадзінны фармат"</string>
<!-- no translation found for desc_set_time_format (3131006238681763219) -->
<skip />
- <string name="system_auto_date_time" msgid="3629668599205033272">"Аўтавызначэнне даты і часу"</string>
+ <string name="system_auto_date_time" msgid="3629668599205033272">"Аўтаматычныя дата і час"</string>
<!-- no translation found for auto_date_time_entries:0 (4590792581242018007) -->
<!-- no translation found for auto_date_time_entries:1 (3807025813081244357) -->
<!-- no translation found for auto_date_time_ts_entries:0 (8463479794795616025) -->
@@ -618,7 +617,7 @@
<skip />
<!-- no translation found for delete_location_history_desc (4142806827237093397) -->
<skip />
- <string name="system_services" msgid="7230571820151215779">"Сэрвісы"</string>
+ <string name="system_services" msgid="7230571820151215779">"Службы"</string>
<string name="accessibility_service_settings" msgid="322888335240595695">"Налады службы"</string>
<!-- no translation found for accessibility_toggle_high_text_contrast_preference_title (4970438261747914408) -->
<skip />
@@ -714,7 +713,7 @@
<string name="system_input" msgid="6164987320529039626">"Увод"</string>
<string name="system_drawing" msgid="6573389872154957039">"Чарцёж"</string>
<string name="system_monitoring" msgid="8424072546138094053">"Маніторынг"</string>
- <string name="system_apps" msgid="6293850468968494924">"Праграмы"</string>
+ <string name="system_apps" msgid="6293850468968494924">"Прыкладанні"</string>
<string name="system_stay_awake" msgid="1212296404230848490">"Прадухіляць ад пераходу ў рэжым сну"</string>
<string name="system_hdcp_checking" msgid="8470793875143334320">"Праверка HDCP"</string>
<!-- no translation found for system_hdmi_optimization (9120919064234265144) -->
@@ -741,7 +740,7 @@
<skip />
<string name="system_show_touches" msgid="2179121368437801757">"Паказваць дакрананні"</string>
<string name="system_pointer_location" msgid="2673764026490179227">"Пазіцыя паказальніка"</string>
- <string name="system_show_layout_bounds" msgid="645732439882291943">"Паказаць межы макета"</string>
+ <string name="system_show_layout_bounds" msgid="645732439882291943">"Паказаць межы размяшчэння"</string>
<string name="system_show_gpu_view_updates" msgid="7936280271091152459">"Паказ. абн. выгляду GPU"</string>
<string name="system_show_hardware_layer" msgid="7301942527058509453">"Паказаць апаратны слой"</string>
<string name="system_show_gpu_overdraw" msgid="707861254106800199">"Паказаць перарасход GPU"</string>
@@ -751,7 +750,7 @@
<string name="system_animator_duration_scale" msgid="7413512458963984521">"Шкала працягласці анiматара"</string>
<string name="system_strict_mode_enabled" msgid="5728680397806673270">"Уключаны строгі рэжым"</string>
<string name="system_show_cpu_usage" msgid="4797599582027671138">"Паказаць выкарыстанне ЦП"</string>
- <string name="system_profile_gpu_rendering" msgid="3438771015102629799">"Профіль рэндэрынгу GPU"</string>
+ <string name="system_profile_gpu_rendering" msgid="3438771015102629799">"Апрацоўка профілю GPU"</string>
<string name="system_enable_traces" msgid="4038210655699986482">"Уключыць сляды"</string>
<string name="system_dont_keep_activities" msgid="7906911077198718958">"Не трымаць дзеянні"</string>
<string name="system_background_process_limit" msgid="7921766877363771436">"Ліміт фонавага працэсу"</string>
@@ -1023,17 +1022,17 @@
<skip />
<!-- no translation found for device_daydreams_none (2767107052779579259) -->
<skip />
- <!-- no translation found for device_daydreams_select (2112338101206187695) -->
+ <!-- no translation found for device_daydreams_select (3691552535056569158) -->
<skip />
<!-- no translation found for device_daydreams_test (9038920213402659591) -->
<skip />
- <!-- no translation found for device_daydreams_sleep (7676938708373592766) -->
+ <!-- no translation found for device_daydreams_sleep (8766795993034660366) -->
<skip />
- <!-- no translation found for device_daydreams_sleep_description (7655223016581708511) -->
+ <!-- no translation found for device_daydreams_sleep_description (5269460120567642259) -->
<skip />
<!-- no translation found for device_daydreams_sleep_summary (7361113408939289262) -->
<skip />
- <!-- no translation found for device_daydreams_screen_off (1765925964376076171) -->
+ <!-- no translation found for device_daydreams_screen_off (5002473979169042970) -->
<skip />
<!-- no translation found for device_daydreams_screen_off_description (4181262365345306243) -->
<skip />
diff --git a/Settings/res/values-ml-rIN/strings.xml b/Settings/res/values-ml-rIN/strings.xml
index 5b0c6bf..157699e 100644
--- a/Settings/res/values-ml-rIN/strings.xml
+++ b/Settings/res/values-ml-rIN/strings.xml
@@ -95,7 +95,7 @@
<string name="system_speech" msgid="8128688499687306982">"സംഭാഷണം"</string>
<string name="system_inputs" msgid="2413907183796651102">"ഇൻപുട്ടുകൾ"</string>
<string name="system_accessibility" msgid="6215431399759498005">"പ്രവേശനക്ഷമത"</string>
- <string name="system_developer_options" msgid="3237985523474863638">"ഡെവലപ്പർ ഓപ്ഷനുകൾ"</string>
+ <string name="system_developer_options" msgid="3237985523474863638">"ഡവലപ്പർ ഓപ്ഷനുകൾ"</string>
<string name="accessibility_none" msgid="3441648940134070004">"ഒന്നുമില്ല"</string>
<string name="system_diagnostic" msgid="7269638365915225701">"ഉപയോഗവും പ്രശ്നനിർണ്ണയവും"</string>
<string name="about_system_update" msgid="7282772247661356586">"സിസ്റ്റം അപ്ഡേറ്റ്"</string>
diff --git a/Settings/res/values-pa-rIN/strings.xml b/Settings/res/values-pa-rIN/strings.xml
index ee69b49..469c39e 100644
--- a/Settings/res/values-pa-rIN/strings.xml
+++ b/Settings/res/values-pa-rIN/strings.xml
@@ -72,7 +72,8 @@
<skip />
<!-- no translation found for wifi_setting_enable_wifi (9214100840401870408) -->
<skip />
- <string name="device_daydream" msgid="3354366974209179614">"ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
+ <!-- no translation found for device_daydream (3354366974209179614) -->
+ <skip />
<!-- no translation found for device_display (101455384386372747) -->
<skip />
<!-- no translation found for device_sound (9214182566287657481) -->
@@ -638,7 +639,8 @@
<skip />
<!-- no translation found for location_mode_title (6573195849329396150) -->
<skip />
- <string name="location_category_recent_location_requests" msgid="3437903422445812245">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
+ <!-- no translation found for location_category_recent_location_requests (3437903422445812245) -->
+ <skip />
<!-- no translation found for location_no_recent_apps (4218851908476344030) -->
<skip />
<!-- no translation found for location_high_battery_use (576143332793626088) -->
@@ -649,7 +651,8 @@
<skip />
<!-- no translation found for location_status (3456414279428237558) -->
<skip />
- <string name="location_services" msgid="5441085185119797200">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
+ <!-- no translation found for location_services (5441085185119797200) -->
+ <skip />
<!-- no translation found for on (6683600681314500652) -->
<skip />
<!-- no translation found for off (5264189545064767245) -->
@@ -898,10 +901,12 @@
<skip />
<!-- no translation found for security_unknown_sources_title (769762478057744545) -->
<skip />
- <string name="security_unknown_sources_desc" msgid="7197053279914817124">"Play ਸਟੋਰ ਤੋਂ ਇਲਾਵਾ ਹੋਰ ਸਰੋਤਾਂ ਤੋਂ ਐਪਾਂ ਦੀ ਸਥਾਪਨਾ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+ <!-- no translation found for security_unknown_sources_desc (7197053279914817124) -->
+ <skip />
<!-- no translation found for security_unknown_sources_confirm_title (1249752174105198821) -->
<skip />
- <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਸਰੋਤਾਂ ਤੋਂ ਲਈਆਂ ਐਪਾਂ ਵੱਲੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਤੁਸੀਂ ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਅਤੇ ਡੈਟੇ ਦੇ ਨਸ਼ਟ ਹੋਣ ਲਈ ਕੇਵਲ ਖੁਦ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਸਿੱਟੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+ <!-- no translation found for security_unknown_sources_confirm_desc (7167350583097191925) -->
+ <skip />
<!-- no translation found for security_verify_apps_title (5787946958632254988) -->
<skip />
<!-- no translation found for security_verify_apps_desc (1456317893117818733) -->
@@ -1147,7 +1152,8 @@
<skip />
<!-- no translation found for device_daydreams_none (2767107052779579259) -->
<skip />
- <string name="device_daydreams_select" msgid="2112338101206187695">"ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
+ <!-- no translation found for device_daydreams_select (2112338101206187695) -->
+ <skip />
<!-- no translation found for device_daydreams_test (9038920213402659591) -->
<skip />
<!-- no translation found for device_daydreams_sleep (7676938708373592766) -->
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
index 395b0fc..40e577e 100644
--- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -582,6 +582,7 @@
Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
if (mEnableOemUnlock != null) {
updateSwitchPreference(mEnableOemUnlock, isOemUnlockEnabled(getActivity()));
+ mEnableOemUnlock.setEnabled(isOemUnlockAllowed());
}
updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr,
Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0);
@@ -841,6 +842,11 @@
return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
}
+ private boolean isOemUnlockAllowed() {
+ return Settings.Global.getInt(getActivity().getContentResolver(),
+ Settings.Global.OEM_UNLOCK_DISALLOWED, 0) == 0;
+ }
+
private void updateBugreportOptions() {
if (mBugreport != null) {
mBugreport.setEnabled(true);
@@ -1748,8 +1754,12 @@
* devices allow users to flash other OSes to them.
*/
static void setOemUnlockEnabled(Context context, boolean enabled) {
- PersistentDataBlockManager manager =(PersistentDataBlockManager)
- context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
- manager.setOemUnlockEnabled(enabled);
+ try {
+ PersistentDataBlockManager manager = (PersistentDataBlockManager)
+ context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+ manager.setOemUnlockEnabled(enabled);
+ } catch (SecurityException e) {
+ Log.e(TAG, "Fail to set oem unlock.", e);
+ }
}
}
