Merge "Fix DND conditional null state" into nyc-dev
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index e71e3cc..d6c607f 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -2571,8 +2571,7 @@
<string name="emergency_tone_silent" msgid="1067515631635824291">"Ціхі рэжым"</string>
<string name="emergency_tone_alert" msgid="8941852695428130667">"Абвестка"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібрацыя"</string>
- <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
- <skip />
+ <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не турбаваць"</string>
<string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дазволены толькі прыярытэтныя"</string>
<string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аўтаматычныя правілы"</string>
<string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Задаць графік рэж. \"Не турб.\""</string>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index f1cd499..e0836cc 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -2550,8 +2550,7 @@
<string name="emergency_tone_silent" msgid="1067515631635824291">"Nečujno"</string>
<string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
- <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
- <skip />
+ <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne ometaj"</string>
<string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dopustiti samo prioritete"</string>
<string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
<string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesi funkciju Ne uznemiravajj"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 3571353..38b288a 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -2531,8 +2531,7 @@
<string name="emergency_tone_silent" msgid="1067515631635824291">"શાંત"</string>
<string name="emergency_tone_alert" msgid="8941852695428130667">"ચેતવણી"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"વાઇબ્રેટ"</string>
- <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
- <skip />
+ <string name="zen_mode_settings_title" msgid="2689740350895257590">"ખલેલ પાડશો નહીં"</string>
<string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
<string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"સ્વયંચાલિત નિયમો"</string>
<string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ખલેલ પાડશો નહીં સૂચિ સેટ કરો"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index a0d3fcf..919742e 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -2529,8 +2529,7 @@
<string name="emergency_tone_silent" msgid="1067515631635824291">"ਖਾਮੋਸ਼"</string>
<string name="emergency_tone_alert" msgid="8941852695428130667">"ਚਿਤਾਵਨੀ"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
- <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
- <skip />
+ <string name="zen_mode_settings_title" msgid="2689740350895257590">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
<string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ਕੇਵਲ ਤਰਜੀਹੀ ਦੀ ਆਗਿਆ ਹੈ"</string>
<string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ਸਵੈਚਲਿਤ ਨਿਯਮ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਮਾਂ-ਸੂਚੀ ਨੂੰ ਸੈੱਟ ਕਰੋ"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c5b7931..00fe0fc 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2729,8 +2729,8 @@
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadajte číslo PIN správcu"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
<string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
- <string name="screen_pinning_title" msgid="2292573232264116542">"Pripnutie k obrazovke"</string>
- <string name="screen_pinning_description" msgid="3360904523688769289">"Keď je toto nastavenie zapnuté, môžete pomocou pripnutia k obrazovke ponechať aktuálnu obrazovku zobrazenú, dokým ju neuvoľníte.\n\nAk chcete použiť pripnutie k obrazovke:\n\n1. Skontrolujte, či je pripnutie k obrazovke zapnuté.\n\n2. Otvorte obrazovku, ktorú chcete pripnúť.\n\n3. Klepnite na položku Prehľad.\n\n4. Prejdite prstom nahor a potom klepnite na ikonu špendlíka."</string>
+ <string name="screen_pinning_title" msgid="2292573232264116542">"Pripnutie obrazovky"</string>
+ <string name="screen_pinning_description" msgid="3360904523688769289">"Keď je toto nastavenie zapnuté, môžete pomocou pripnutia obrazovky ponechať aktuálnu obrazovku zobrazenú, dokým ju neuvoľníte.\n\nAk chcete použiť pripnutie obrazovky:\n\n1. Skontrolujte, či je pripnutie obrazovky zapnuté.\n\n2. Otvorte obrazovku, ktorú chcete pripnúť.\n\n3. Klepnite na položku Prehľad.\n\n4. Prejdite prstom nahor a potom klepnite na ikonu špendlíka."</string>
<string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pred uvoľnením žiadať bezpečnostný vzor"</string>
<string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pred uvoľnením požiadať o PIN"</string>
<string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred uvoľnením požiadať o heslo"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 597d621..cebf6f5 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -2529,8 +2529,7 @@
<string name="emergency_tone_silent" msgid="1067515631635824291">"Në heshtje"</string>
<string name="emergency_tone_alert" msgid="8941852695428130667">"Sinjalizimi"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dridhje"</string>
- <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
- <skip />
+ <string name="zen_mode_settings_title" msgid="2689740350895257590">"Mos shqetëso"</string>
<string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Vetëm njoftimet me prioritet"</string>
<string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Rregullat automatike"</string>
<string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Cakto planifikimin për \"Mos shqetëso\""</string>
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 0f67be9..d0823d4 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -138,7 +138,7 @@
mCycle = (SpinnerPreference) findPreference(KEY_CYCLE);
mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener, false);
- if (UserHandle.isApp(mAppItem.key) || mAppItem.key == Process.SYSTEM_UID) {
+ if (mAppItem.key > 0) {
if (mPackages.size() != 0) {
PackageManager pm = getPackageManager();
try {