summaryrefslogtreecommitdiffstats
path: root/minui
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-01-19 20:28:37 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-01-19 20:28:37 +0100
commit444732f7a0b52373fdc4b9fc180b7f0805437474 (patch)
tree69907361452505ee46dd1b7c10f596537d6800e7 /minui
parentMerge "DO NOT MERGE: Add a checker for signature boundary in verifier am: f616da1726 am: 5346da0220 -s ours am: a41cc29447 -s ours am: 051dfa7ec3 -s ours am: 94c8b5e5a6 am: 2b1bcab427 -s ours am: 37a5941440 am: ddca75fb0a am: b21b92b386 am: 8a51334062 -s ours am: 67b69c05c6 am: 8f9e3c9bd9 am: 8953f919e4 am: d0bfa33c66 am: 4aa56ad477" into nyc-mr2-dev-plus-aosp (diff)
parentMerge "Add checkers and tests for empty locale in PNG file" am: 69e73ab7a9 am: a38224eadb (diff)
downloadandroid_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.tar
android_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.tar.gz
android_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.tar.bz2
android_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.tar.lz
android_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.tar.xz
android_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.tar.zst
android_bootable_recovery-444732f7a0b52373fdc4b9fc180b7f0805437474.zip
Diffstat (limited to 'minui')
-rw-r--r--minui/resources.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/minui/resources.cpp b/minui/resources.cpp
index e6909f269..726c627ed 100644
--- a/minui/resources.cpp
+++ b/minui/resources.cpp
@@ -374,7 +374,9 @@ int res_create_alpha_surface(const char* name, GRSurface** pSurface) {
// This function tests if a locale string stored in PNG (prefix) matches
// the locale string provided by the system (locale).
bool matches_locale(const char* prefix, const char* locale) {
- if (locale == NULL) return false;
+ if (locale == nullptr) {
+ return false;
+ }
// Return true if the whole string of prefix matches the top part of
// locale. For instance, prefix == "en" matches locale == "en_US";