Merge "Use `ro.boot.qemu` to check if the device is an emulator" am: 351f7e2afb am: 80d8cf709f am: d8ca9849f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1626885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I528d7ff844ad0ac1dab13cf649f3fdc9da529e50
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index b85e139..dc4aea5 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1831,8 +1831,7 @@
 //static
 void MediaPlayerService::AudioOutput::setMinBufferCount()
 {
-    char value[PROPERTY_VALUE_MAX];
-    if (property_get("ro.kernel.qemu", value, 0)) {
+    if (property_get_bool("ro.boot.qemu", false)) {
         mIsOnEmulator = true;
         mMinBufferCount = 12;  // to prevent systematic buffer underrun for emulator
     }