clean up

TODO: adb uninstall sometimes hang

app/src/control_msg.c

@@ -37,7 +37,7 @@ static const char *const android_motionevent_action_labels[] = {
     "move",
     "cancel",
     "outside",
-    "pointer-down",
+    "ponter-down",
     "pointer-up",
     "hover-move",
     "scroll",

server/src/main/java/com/genymobile/scrcpy/CleanUp.java

@@ -1,5 +1,7 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.wrappers.ServiceManager;
+
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Base64;
@@ -118,8 +120,8 @@ public final class CleanUp {
         // not instantiable
     }
 
-    public static void configure(boolean installed, int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode,
-            boolean powerOffScreen) throws IOException {
+    public static void configure(boolean installed, int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode, boolean powerOffScreen)
+            throws IOException {
         Config config = new Config();
         config.installed = installed;
         config.displayId = displayId;
@@ -140,9 +142,9 @@ public final class CleanUp {
     private static void startProcess(Config config) throws IOException {
         String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};
 
+        // TODO if scrcpy is "installed", then we must find the install path!
         ProcessBuilder builder = new ProcessBuilder(cmd);
-        String serverPath = config.installed ? Device.getInstalledApkPath() : SERVER_PATH;
-        builder.environment().put("CLASSPATH", serverPath);
+        builder.environment().put("CLASSPATH", SERVER_PATH);
         builder.start();
     }
 
@@ -172,10 +174,12 @@ public final class CleanUp {
         Ln.i("Cleaning up");
 
         if (config.disableShowTouches || config.restoreStayOn != -1) {
+            ServiceManager serviceManager = new ServiceManager();
+            Settings settings = new Settings(serviceManager);
             if (config.disableShowTouches) {
                 Ln.i("Disabling \"show touches\"");
                 try {
-                    Settings.putValue(Settings.TABLE_SYSTEM, "show_touches", "0");
+                    settings.putValue(Settings.TABLE_SYSTEM, "show_touches", "0");
                 } catch (SettingsException e) {
                     Ln.e("Could not restore \"show_touches\"", e);
                 }
@@ -183,7 +187,7 @@ public final class CleanUp {
             if (config.restoreStayOn != -1) {
                 Ln.i("Restoring \"stay awake\"");
                 try {
-                    Settings.putValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
+                    settings.putValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
                 } catch (SettingsException e) {
                     Ln.e("Could not restore \"stay_on_while_plugged_in\"", e);
                 }

server/src/main/java/com/genymobile/scrcpy/Command.java

@@ -30,14 +30,4 @@ public final class Command {
         }
         return result;
     }
-
-    public static String execReadOutput(String... cmd) throws IOException, InterruptedException {
-        Process process = Runtime.getRuntime().exec(cmd);
-        String output = IO.toString(process.getInputStream());
-        int exitCode = process.waitFor();
-        if (exitCode != 0) {
-            throw new IOException("Command " + Arrays.toString(cmd) + " returned with value " + exitCode);
-        }
-        return output;
-    }
 }

server/src/main/java/com/genymobile/scrcpy/Device.java

@@ -7,7 +7,6 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import com.genymobile.scrcpy.wrappers.WindowManager;
 
 import android.content.IOnPrimaryClipChangedListener;
-import android.content.pm.ApplicationInfo;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
@@ -22,8 +21,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class Device {
 
-    private static final String SCRCPY_PACKAGE_NAME = "com.genymobile.scrcpy";
-
     public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF;
     public static final int POWER_MODE_NORMAL = SurfaceControl.POWER_MODE_NORMAL;
 
@@ -34,6 +31,9 @@ public final class Device {
     public static final int LOCK_VIDEO_ORIENTATION_UNLOCKED = -1;
     public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;
 
+    private static final ServiceManager SERVICE_MANAGER = new ServiceManager();
+    private static final Settings SETTINGS = new Settings(SERVICE_MANAGER);
+
     public interface RotationListener {
         void onRotationChanged(int rotation);
     }
@@ -66,9 +66,9 @@ public final class Device {
 
     public Device(Options options) {
         displayId = options.getDisplayId();
-        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+        DisplayInfo displayInfo = SERVICE_MANAGER.getDisplayManager().getDisplayInfo(displayId);
         if (displayInfo == null) {
-            int[] displayIds = ServiceManager.getDisplayManager().getDisplayIds();
+            int[] displayIds = SERVICE_MANAGER.getDisplayManager().getDisplayIds();
             throw new InvalidDisplayIdException(displayId, displayIds);
         }
 
@@ -82,7 +82,7 @@ public final class Device {
         screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
         layerStack = displayInfo.getLayerStack();
 
-        ServiceManager.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
+        SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
             @Override
             public void onRotationChanged(int rotation) {
                 synchronized (Device.this) {
@@ -98,7 +98,7 @@ public final class Device {
 
         if (options.getControl() && options.getClipboardAutosync()) {
             // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
-            ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+            ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
             if (clipboardManager != null) {
                 clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
                     @Override
@@ -192,7 +192,7 @@ public final class Device {
             return false;
         }
 
-        return ServiceManager.getInputManager().injectInputEvent(inputEvent, injectMode);
+        return SERVICE_MANAGER.getInputManager().injectInputEvent(inputEvent, injectMode);
     }
 
     public boolean injectEvent(InputEvent event, int injectMode) {
@@ -220,7 +220,7 @@ public final class Device {
     }
 
     public static boolean isScreenOn() {
-        return ServiceManager.getPowerManager().isScreenOn();
+        return SERVICE_MANAGER.getPowerManager().isScreenOn();
     }
 
     public synchronized void setRotationListener(RotationListener rotationListener) {
@@ -232,19 +232,19 @@ public final class Device {
     }
 
     public static void expandNotificationPanel() {
-        ServiceManager.getStatusBarManager().expandNotificationsPanel();
+        SERVICE_MANAGER.getStatusBarManager().expandNotificationsPanel();
     }
 
     public static void expandSettingsPanel() {
-        ServiceManager.getStatusBarManager().expandSettingsPanel();
+        SERVICE_MANAGER.getStatusBarManager().expandSettingsPanel();
     }
 
     public static void collapsePanels() {
-        ServiceManager.getStatusBarManager().collapsePanels();
+        SERVICE_MANAGER.getStatusBarManager().collapsePanels();
     }
 
     public static String getClipboardText() {
-        ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+        ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
         if (clipboardManager == null) {
             return null;
         }
@@ -256,7 +256,7 @@ public final class Device {
     }
 
     public boolean setClipboardText(String text) {
-        ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+        ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
         if (clipboardManager == null) {
             return false;
         }
@@ -299,7 +299,7 @@ public final class Device {
      * Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
      */
     public static void rotateDevice() {
-        WindowManager wm = ServiceManager.getWindowManager();
+        WindowManager wm = SERVICE_MANAGER.getWindowManager();
 
         boolean accelerometerRotation = !wm.isRotationFrozen();
 
@@ -316,11 +316,7 @@ public final class Device {
         }
     }
 
-    public static String getInstalledApkPath() {
-        ApplicationInfo info = ServiceManager.getPackageManager().getApplicationInfo(SCRCPY_PACKAGE_NAME);
-        if (info == null) {
-            return null;
-        }
-        return info.sourceDir;
+    public static Settings getSettings() {
+        return SETTINGS;
     }
 }

server/src/main/java/com/genymobile/scrcpy/IO.java

@@ -6,9 +6,7 @@ import android.system.OsConstants;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.Scanner;
 
 public final class IO {
     private IO() {
@@ -39,13 +37,4 @@ public final class IO {
     public static void writeFully(FileDescriptor fd, byte[] buffer, int offset, int len) throws IOException {
         writeFully(fd, ByteBuffer.wrap(buffer, offset, len));
     }
-
-    public static String toString(InputStream inputStream) {
-        StringBuilder builder = new StringBuilder();
-        Scanner scanner = new Scanner(inputStream);
-        while (scanner.hasNextLine()) {
-            builder.append(scanner.nextLine()).append('\n');
-        }
-        return builder.toString();
-    }
 }

server/src/main/java/com/genymobile/scrcpy/Server.java

@@ -20,9 +20,10 @@ public final class Server {
         int restoreStayOn = -1;
         boolean restoreNormalPowerMode = options.getControl(); // only restore power mode if control is enabled
         if (options.getShowTouches() || options.getStayAwake()) {
+            Settings settings = Device.getSettings();
             if (options.getShowTouches()) {
                 try {
-                    String oldValue = Settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
+                    String oldValue = settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
                     // If "show touches" was disabled, it must be disabled back on clean up
                     mustDisableShowTouchesOnCleanUp = !"1".equals(oldValue);
                 } catch (SettingsException e) {
@@ -33,7 +34,7 @@ public final class Server {
             if (options.getStayAwake()) {
                 int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
                 try {
-                    String oldValue = Settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
+                    String oldValue = settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
                     try {
                         restoreStayOn = Integer.parseInt(oldValue);
                         if (restoreStayOn == stayOn) {

server/src/main/java/com/genymobile/scrcpy/Settings.java

@@ -7,14 +7,16 @@ import android.os.Build;
 
 import java.io.IOException;
 
-public final class Settings {
+public class Settings {
 
     public static final String TABLE_SYSTEM = ContentProvider.TABLE_SYSTEM;
     public static final String TABLE_SECURE = ContentProvider.TABLE_SECURE;
     public static final String TABLE_GLOBAL = ContentProvider.TABLE_GLOBAL;
 
-    private Settings() {
-        /* not instantiable */
+    private final ServiceManager serviceManager;
+
+    public Settings(ServiceManager serviceManager) {
+        this.serviceManager = serviceManager;
     }
 
     private static void execSettingsPut(String table, String key, String value) throws SettingsException {
@@ -33,10 +35,10 @@ public final class Settings {
         }
     }
 
-    public static String getValue(String table, String key) throws SettingsException {
+    public String getValue(String table, String key) throws SettingsException {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
                 return provider.getValue(table, key);
             } catch (SettingsException e) {
                 Ln.w("Could not get settings value via ContentProvider, fallback to settings process", e);
@@ -46,10 +48,10 @@ public final class Settings {
         return execSettingsGet(table, key);
     }
 
-    public static void putValue(String table, String key, String value) throws SettingsException {
+    public void putValue(String table, String key, String value) throws SettingsException {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
                 provider.putValue(table, key, value);
             } catch (SettingsException e) {
                 Ln.w("Could not put settings value via ContentProvider, fallback to settings process", e);
@@ -59,10 +61,10 @@ public final class Settings {
         execSettingsPut(table, key, value);
     }
 
-    public static String getAndPutValue(String table, String key, String value) throws SettingsException {
+    public String getAndPutValue(String table, String key, String value) throws SettingsException {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
             // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = ServiceManager.getActivityManager().createSettingsProvider()) {
+            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
                 String oldValue = provider.getValue(table, key);
                 if (!value.equals(oldValue)) {
                     provider.putValue(table, key, value);

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java

@@ -1,16 +1,8 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Command;
 import com.genymobile.scrcpy.DisplayInfo;
-import com.genymobile.scrcpy.Ln;
 import com.genymobile.scrcpy.Size;
 
-import android.view.Display;
-
-import java.lang.reflect.Field;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 public final class DisplayManager {
     private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal
 
@@ -18,61 +10,11 @@ public final class DisplayManager {
         this.manager = manager;
     }
 
-    // public to call it from unit tests
-    public static DisplayInfo parseDisplayInfo(String dumpsysDisplayOutput, int displayId) {
-        Pattern regex = Pattern.compile(
-                "^    mOverrideDisplayInfo=DisplayInfo\\{\".*?\", displayId " + displayId + ".*?(, FLAG_.*)?, real ([0-9]+) x ([0-9]+).*?, "
-                        + "rotation ([0-9]+).*?, layerStack ([0-9]+)",
-                Pattern.MULTILINE);
-        Matcher m = regex.matcher(dumpsysDisplayOutput);
-        if (!m.find()) {
-            return null;
-        }
-        int flags = parseDisplayFlags(m.group(1));
-        int width = Integer.parseInt(m.group(2));
-        int height = Integer.parseInt(m.group(3));
-        int rotation = Integer.parseInt(m.group(4));
-        int layerStack = Integer.parseInt(m.group(5));
-
-        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
-    }
-
-    private static DisplayInfo getDisplayInfoFromDumpsysDisplay(int displayId) {
-        try {
-            String dumpsysDisplayOutput = Command.execReadOutput("dumpsys", "display");
-            return parseDisplayInfo(dumpsysDisplayOutput, displayId);
-        } catch (Exception e) {
-            Ln.e("Could not get display info from \"dumpsys display\" output", e);
-            return null;
-        }
-    }
-
-    private static int parseDisplayFlags(String text) {
-        Pattern regex = Pattern.compile("FLAG_[A-Z_]+");
-        if (text == null) {
-            return 0;
-        }
-
-        int flags = 0;
-        Matcher m = regex.matcher(text);
-        while (m.find()) {
-            String flagString = m.group();
-            try {
-                Field filed = Display.class.getDeclaredField(flagString);
-                flags |= filed.getInt(null);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                // Silently ignore, some flags reported by "dumpsys display" are @TestApi
-            }
-        }
-        return flags;
-    }
-
     public DisplayInfo getDisplayInfo(int displayId) {
         try {
             Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, displayId);
             if (displayInfo == null) {
-                // fallback when displayInfo is null
-                return getDisplayInfoFromDumpsysDisplay(displayId);
+                return null;
             }
             Class<?> cls = displayInfo.getClass();
             // width and height already take the rotation into account

server/src/main/java/com/genymobile/scrcpy/wrappers/PackageManager.java

@@ -1,36 +0,0 @@
-package com.genymobile.scrcpy.wrappers;
-
-import com.genymobile.scrcpy.Ln;
-
-import android.content.pm.ApplicationInfo;
-import android.os.IInterface;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class PackageManager {
-
-    private IInterface manager;
-    private Method getApplicationInfoMethod;
-
-    public PackageManager(IInterface manager) {
-        this.manager = manager;
-    }
-
-    private Method getGetApplicationInfoMethod() throws NoSuchMethodException {
-        if (getApplicationInfoMethod == null) {
-            getApplicationInfoMethod = manager.getClass().getDeclaredMethod("getApplicationInfo", String.class, int.class, int.class);
-        }
-        return getApplicationInfoMethod;
-    }
-
-    public ApplicationInfo getApplicationInfo(String packageName) {
-        try {
-            Method method = getGetApplicationInfoMethod();
-            return (ApplicationInfo) method.invoke(manager, packageName, 0, ServiceManager.USER_ID);
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-            Ln.e("Cannot get application info", e);
-            return null;
-        }
-    }
-}

server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java

@@ -13,31 +13,27 @@ public final class ServiceManager {
     public static final String PACKAGE_NAME = "com.android.shell";
     public static final int USER_ID = 0;
 
-    private static final Method GET_SERVICE_METHOD;
-    static {
+    private final Method getServiceMethod;
+
+    private WindowManager windowManager;
+    private DisplayManager displayManager;
+    private InputManager inputManager;
+    private PowerManager powerManager;
+    private StatusBarManager statusBarManager;
+    private ClipboardManager clipboardManager;
+    private ActivityManager activityManager;
+
+    public ServiceManager() {
         try {
-            GET_SERVICE_METHOD = Class.forName("android.os.ServiceManager").getDeclaredMethod("getService", String.class);
+            getServiceMethod = Class.forName("android.os.ServiceManager").getDeclaredMethod("getService", String.class);
         } catch (Exception e) {
             throw new AssertionError(e);
         }
     }
 
-    private static WindowManager windowManager;
-    private static DisplayManager displayManager;
-    private static InputManager inputManager;
-    private static PowerManager powerManager;
-    private static StatusBarManager statusBarManager;
-    private static ClipboardManager clipboardManager;
-    private static ActivityManager activityManager;
-    private static PackageManager packageManager;
-
-    private ServiceManager() {
-        /* not instantiable */
-    }
-
-    private static IInterface getService(String service, String type) {
+    private IInterface getService(String service, String type) {
         try {
-            IBinder binder = (IBinder) GET_SERVICE_METHOD.invoke(null, service);
+            IBinder binder = (IBinder) getServiceMethod.invoke(null, service);
             Method asInterfaceMethod = Class.forName(type + "$Stub").getMethod("asInterface", IBinder.class);
             return (IInterface) asInterfaceMethod.invoke(null, binder);
         } catch (Exception e) {
@@ -45,14 +41,14 @@ public final class ServiceManager {
         }
     }
 
-    public static WindowManager getWindowManager() {
+    public WindowManager getWindowManager() {
         if (windowManager == null) {
             windowManager = new WindowManager(getService("window", "android.view.IWindowManager"));
         }
         return windowManager;
     }
 
-    public static DisplayManager getDisplayManager() {
+    public DisplayManager getDisplayManager() {
         if (displayManager == null) {
             try {
                 Class<?> clazz = Class.forName("android.hardware.display.DisplayManagerGlobal");
@@ -66,7 +62,7 @@ public final class ServiceManager {
         return displayManager;
     }
 
-    public static InputManager getInputManager() {
+    public InputManager getInputManager() {
         if (inputManager == null) {
             try {
                 Method getInstanceMethod = android.hardware.input.InputManager.class.getDeclaredMethod("getInstance");
@@ -79,21 +75,21 @@ public final class ServiceManager {
         return inputManager;
     }
 
-    public static PowerManager getPowerManager() {
+    public PowerManager getPowerManager() {
         if (powerManager == null) {
             powerManager = new PowerManager(getService("power", "android.os.IPowerManager"));
         }
         return powerManager;
     }
 
-    public static StatusBarManager getStatusBarManager() {
+    public StatusBarManager getStatusBarManager() {
         if (statusBarManager == null) {
             statusBarManager = new StatusBarManager(getService("statusbar", "com.android.internal.statusbar.IStatusBarService"));
         }
         return statusBarManager;
     }
 
-    public static ClipboardManager getClipboardManager() {
+    public ClipboardManager getClipboardManager() {
         if (clipboardManager == null) {
             IInterface clipboard = getService("clipboard", "android.content.IClipboard");
             if (clipboard == null) {
@@ -107,7 +103,7 @@ public final class ServiceManager {
         return clipboardManager;
     }
 
-    public static ActivityManager getActivityManager() {
+    public ActivityManager getActivityManager() {
         if (activityManager == null) {
             try {
                 // On old Android versions, the ActivityManager is not exposed via AIDL,
@@ -123,20 +119,4 @@ public final class ServiceManager {
 
         return activityManager;
     }
-
-    public static PackageManager getPackageManager() {
-        if (packageManager == null) {
-            try {
-                //IInterface manager = getService("package", "android.content.pm.IPackageManager");
-                Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
-                Method getPackageManager = activityThreadClass.getDeclaredMethod("getPackageManager");
-                IInterface manager = (IInterface) getPackageManager.invoke(null);
-                return new PackageManager(manager);
-            } catch (Exception e) {
-                throw new AssertionError(e);
-            }
-        }
-
-        return packageManager;
-    }
 }

server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java

@@ -1,186 +0,0 @@
-package com.genymobile.scrcpy;
-
-import com.genymobile.scrcpy.wrappers.DisplayManager;
-
-import android.view.Display;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class CommandParserTest {
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplay() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "mDisplayId=0\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=2 primaryRefreshRateRange=[90 90] appRequestRefreshRateRange=[90 90]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, "
-                + "real 1440 x 3120, largest app 1440 x 3120, smallest app 1440 x 3120, appVsyncOff 2000000, presDeadline 11111111, mode 2, "
-                + "defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, width=1080, "
-                + "height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], "
-                + "mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, minimalPostProcessingSupported false, rotation 0, state OFF, "
-                + "type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 (515.154 x 514.597) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo DeviceProductInfo{name=, manufacturerPnpId=QCM, "
-                + "productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, relativeAddress=null}, removeMode 0}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
-                + "FLAG_TRUSTED, real 1440 x 3120, largest app 3120 x 2983, smallest app 1440 x 1303, appVsyncOff 2000000, presDeadline 11111111, "
-                + "mode 2, defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, "
-                + "width=1080, height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities "
-                + "HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, "
-                + "minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 "
-                + "(515.154 x 514.597) dpi, layerStack 0, colorMode 0, supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo "
-                + "DeviceProductInfo{name=, manufacturerPnpId=QCM, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, "
-                + "relativeAddress=null}, removeMode 0}\n"
-                + "    mRequestedMinimalPostProcessing=false\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
-        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
-        Assert.assertEquals(1440, displayInfo.getSize().getWidth());
-        Assert.assertEquals(3120, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayWithRotation() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "mDisplayId=0\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=2 primaryRefreshRateRange=[90 90] appRequestRefreshRateRange=[90 90]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, "
-                + "real 1440 x 3120, largest app 1440 x 3120, smallest app 1440 x 3120, appVsyncOff 2000000, presDeadline 11111111, mode 2, "
-                + "defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, width=1080, "
-                + "height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], "
-                + "mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, minimalPostProcessingSupported false, rotation 0, state ON, "
-                + "type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 (515.154 x 514.597) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo DeviceProductInfo{name=, manufacturerPnpId=QCM, "
-                + "productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, relativeAddress=null}, removeMode 0}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
-                + "FLAG_TRUSTED, real 3120 x 1440, largest app 3120 x 2983, smallest app 1440 x 1303, appVsyncOff 2000000, presDeadline 11111111, "
-                + "mode 2, defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, "
-                + "width=1080, height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities "
-                + "HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, "
-                + "minimalPostProcessingSupported false, rotation 3, state ON, type INTERNAL, uniqueId \"local:0\", app 3120 x 1440, density 600 "
-                + "(515.154 x 514.597) dpi, layerStack 0, colorMode 0, supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo "
-                + "DeviceProductInfo{name=, manufacturerPnpId=QCM, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, "
-                + "relativeAddress=null}, removeMode 0}\n"
-                + "    mRequestedMinimalPostProcessing=false";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(3, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
-        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
-        Assert.assertEquals(3120, displayInfo.getSize().getWidth());
-        Assert.assertEquals(1440, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayAPI31() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "    mDisplayId=0\n"
-                + "    mPhase=1\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
-                + "Infinity]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
-                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
-                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mRequestedMinimalPostProcessing=false\n"
-                + "    mFrameRateOverrides=[]\n"
-                + "    mPendingFrameRateOverrideUids={}\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
-        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
-        Assert.assertEquals(1080, displayInfo.getSize().getWidth());
-        Assert.assertEquals(2280, displayInfo.getSize().getHeight());
-    }
-
-    @Test
-    public void testParseDisplayInfoFromDumpsysDisplayAPI31NoFlags() {
-        /* @formatter:off */
-        String partialOutput = "Logical Displays: size=1\n"
-                + "  Display 0:\n"
-                + "    mDisplayId=0\n"
-                + "    mPhase=1\n"
-                + "    mLayerStack=0\n"
-                + "    mHasContent=true\n"
-                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
-                + "Infinity]}\n"
-                + "    mRequestedColorMode=0\n"
-                + "    mDisplayOffset=(0, 0)\n"
-                + "    mDisplayScalingDisabled=false\n"
-                + "    mPrimaryDisplayDevice=Built-in Screen\n"
-                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
-                + "real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
-                + "real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
-                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
-                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
-                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
-                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
-                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
-                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
-                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
-                + "    mRequestedMinimalPostProcessing=false\n"
-                + "    mFrameRateOverrides=[]\n"
-                + "    mPendingFrameRateOverrideUids={}\n";
-        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
-        Assert.assertNotNull(displayInfo);
-        Assert.assertEquals(0, displayInfo.getDisplayId());
-        Assert.assertEquals(0, displayInfo.getRotation());
-        Assert.assertEquals(0, displayInfo.getLayerStack());
-        Assert.assertEquals(0, displayInfo.getFlags());
-        Assert.assertEquals(1080, displayInfo.getSize().getWidth());
-        Assert.assertEquals(2280, displayInfo.getSize().getHeight());
-    }
-}