Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ef69661 authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Add additional logs when DisplayController detects unexpected bounds"... 

Merge "Add additional logs when DisplayController detects unexpected bounds" into udc-dev am: 4f160279

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23389699



Change-Id: I3996ae564e4c319663e95f8454e28adf3e32a234
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98b3fe1a 4f160279

src/com/android/launcher3/logging/FileLog.java

+20 −0
Original line number Diff line number Diff line
@@ -67,6 +67,26 @@ public final class FileLog { 
        print(tag, msg);

    }



    public static void i(String tag, String msg, Exception e) {

        Log.i(tag, msg, e);

        print(tag, msg, e);

    }



    public static void i(String tag, String msg) {

        Log.i(tag, msg);

        print(tag, msg);

    }



    public static void w(String tag, String msg, Exception e) {

        Log.w(tag, msg, e);

        print(tag, msg, e);

    }



    public static void w(String tag, String msg) {

        Log.w(tag, msg);

        print(tag, msg);

    }



    public static void e(String tag, String msg, Exception e) {

        Log.e(tag, msg, e);

        print(tag, msg, e);

src/com/android/launcher3/util/DisplayController.java

+12 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import androidx.annotation.VisibleForTesting; 


import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.Utilities;

import com.android.launcher3.logging.FileLog;

import com.android.launcher3.util.window.CachedDisplayInfo;

import com.android.launcher3.util.window.WindowManagerProxy;
@@ -126,6 +127,8 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { 
        Context displayInfoContext = getDisplayInfoContext(display);

        mInfo = new Info(displayInfoContext, wmProxy,

                wmProxy.estimateInternalDisplayBounds(displayInfoContext));

        mInfo.mPerDisplayBounds.forEach((key, value) -> FileLog.i(TAG,

                "(CTOR) perDisplayBounds - " + key + ": " + Arrays.deepToString(value)));

    }



    /**
@@ -283,6 +286,9 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { 
        if (!newInfo.supportedBounds.equals(oldInfo.supportedBounds)

                || !newInfo.mPerDisplayBounds.equals(oldInfo.mPerDisplayBounds)) {

            change |= CHANGE_SUPPORTED_BOUNDS;

            newInfo.mPerDisplayBounds.forEach((key, value) -> FileLog.w(TAG,

                    "(CHANGE_SUPPORTED_BOUNDS) perDisplayBounds - " + key + ": "

                            + Arrays.deepToString(value)));

        }

        if (DEBUG) {

            Log.d(TAG, "handleInfoChange - change: " + getChangeFlagsString(change));
@@ -353,12 +359,16 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { 
            realBounds = wmProxy.getRealBounds(displayInfoContext, displayInfo);

            if (cachedValue == null) {

                // Unexpected normalizedDisplayInfo is found, recreate the cache

                Log.e(TAG, "Unexpected normalizedDisplayInfo found, invalidating cache");

                FileLog.e(TAG, "Unexpected normalizedDisplayInfo found, invalidating cache: "

                        + normalizedDisplayInfo);

                mPerDisplayBounds.forEach((key, value) -> FileLog.e(TAG,

                        "(Invalid Cache) perDisplayBounds - " + key + ": " + Arrays.deepToString(

                                value)));

                mPerDisplayBounds.clear();

                mPerDisplayBounds.putAll(wmProxy.estimateInternalDisplayBounds(displayInfoContext));

                cachedValue = mPerDisplayBounds.get(normalizedDisplayInfo);

                if (cachedValue == null) {

                    Log.e(TAG, "normalizedDisplayInfo not found in estimation: "

                    FileLog.e(TAG, "normalizedDisplayInfo not found in estimation: "

                            + normalizedDisplayInfo);

                    supportedBounds.add(realBounds);

                }