diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-08-18 12:21:34 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-10-24 18:01:04 -0700 |
| commit | 1bb18c435dbf967f3a9bc9d680411471b8bab4ac (patch) | |
| tree | 3759f0ca856610ea7b9479d7fa120aa4455fff73 /core/java/android/content/res | |
| parent | cc66a236f90cbef7f9562b4179c3aec517f4f082 (diff) | |
| download | frameworks_base-1bb18c435dbf967f3a9bc9d680411471b8bab4ac.zip frameworks_base-1bb18c435dbf967f3a9bc9d680411471b8bab4ac.tar.gz frameworks_base-1bb18c435dbf967f3a9bc9d680411471b8bab4ac.tar.bz2 | |
Add dumpsys output to UsageStatsService, along with --checkin support
Bug:17814138
Change-Id: If414ae5f4b8e4a2838f63f52d80e764915cee934
Diffstat (limited to 'core/java/android/content/res')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index acdd87e..14af584 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -1371,7 +1371,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration } } - if (!config.locale.getLanguage().isEmpty()) { + if (config.locale != null && !config.locale.getLanguage().isEmpty()) { parts.add(localeToResourceQualifier(config.locale)); } |