diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-17 15:29:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-17 15:29:17 +0000 |
| commit | 2b0238e00eade147ad03d63f7e49aa5b7805ee0e (patch) | |
| tree | 7d0d2a4c26edf0efe03ee3d5f3b2dfe05dab25d2 | |
| parent | ec6838df1620457b04d490d6bb782bc9c99b1f0a (diff) | |
| parent | 53c9772098574b2db11ac5eced40f19012d80e35 (diff) | |
| download | qemu-snap-temp-L23500000961245562.tar.gz | |
Merge "Merge cherrypicks of ['android-review.googlesource.com/2593526'] into emu-32-release." into emu-32-releasesnap-temp-L23500000961245562
| -rw-r--r-- | android/emu/avd/src/android/avd/info.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/android/emu/avd/src/android/avd/info.c b/android/emu/avd/src/android/avd/info.c index d814215a5c..d30f997035 100644 --- a/android/emu/avd/src/android/avd/info.c +++ b/android/emu/avd/src/android/avd/info.c @@ -1989,11 +1989,15 @@ bool avdInfo_skinHasOverlay(const char* skinName) { if (skinName == NULL || skinName[0] == '\0') { return false; } - if (!strcmp(skinName, "pixel_5") || !strcmp(skinName, "pixel_4") || - !strcmp(skinName, "pixel_4a") || !strcmp(skinName, "pixel_4_xl") || - !strcmp(skinName, "pixel_3") || !strcmp(skinName, "pixel_3a") || - !strcmp(skinName, "pixel_3_xl") || !strcmp(skinName, "pixel_3a_xl") || - !strcmp(skinName, "pixel_2_xl")) { + if (!strncmp(skinName, "pixel_7", + strlen("pixel_7")) || /* include pixel 7, pro etc */ + !strncmp(skinName, "pixel_6", + strlen("pixel_6")) || /* include pixel 6a, 6, pro etc */ + !strcmp(skinName, "pixel_5") || + !strcmp(skinName, "pixel_4") || !strcmp(skinName, "pixel_4a") || + !strcmp(skinName, "pixel_4_xl") || !strcmp(skinName, "pixel_3") || + !strcmp(skinName, "pixel_3a") || !strcmp(skinName, "pixel_3_xl") || + !strcmp(skinName, "pixel_3a_xl") || !strcmp(skinName, "pixel_2_xl")) { return true; } return false; @@ -2013,4 +2017,4 @@ const char* avdInfo_screen_off_timeout(int apiLevel) { } else { return "2147483647"; // 576 hours } -}
\ No newline at end of file +} |