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

Commit 3a624f81 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent crash when display is already removed by the time we get... 

Merge "Prevent crash when display is already removed by the time we get displayAdded" into ub-launcher3-master
parents fb720b6f 43ad0c2e

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

+19 −8
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ public class DisplayController implements DisplayListener { 
    private final ArrayList<DisplayListChangeListener> mListListeners = new ArrayList<>();

    private final ArrayList<DisplayListChangeListener> mListListeners = new ArrayList<>();





    private DisplayController(Context context) {

    private DisplayController(Context context) {

        mDefaultDisplay = new DisplayHolder(context, DEFAULT_DISPLAY);

        mDefaultDisplay = DisplayHolder.create(context, DEFAULT_DISPLAY);





        DisplayManager dm = context.getSystemService(DisplayManager.class);

        DisplayManager dm = context.getSystemService(DisplayManager.class);

        dm.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());

        dm.registerDisplayListener(this, UI_HELPER_EXECUTOR.getHandler());
@@ -58,7 +58,11 @@ public class DisplayController implements DisplayListener { 




    @Override

    @Override

    public final void onDisplayAdded(int displayId) {

    public final void onDisplayAdded(int displayId) {

        DisplayHolder holder = new DisplayHolder(mDefaultDisplay.mDisplayContext, displayId);

        DisplayHolder holder = DisplayHolder.create(mDefaultDisplay.mDisplayContext, displayId);

        if (holder == null) {

            // Display is already removed by the time we dot this.

            return;

        }

        synchronized (mOtherDisplays) {

        synchronized (mOtherDisplays) {

            mOtherDisplays.put(displayId, holder);

            mOtherDisplays.put(displayId, holder);

        }

        }
@@ -153,12 +157,8 @@ public class DisplayController implements DisplayListener { 
        private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();

        private final ArrayList<DisplayInfoChangeListener> mListeners = new ArrayList<>();

        private DisplayController.Info mInfo;

        private DisplayController.Info mInfo;





        public DisplayHolder(Context context, int id) {

        private DisplayHolder(Context displayContext) {

            DisplayManager dm = context.getSystemService(DisplayManager.class);

            mDisplayContext = displayContext;

            // Use application context to create display context so that it can have its own

            // Resources.

            mDisplayContext = context.getApplicationContext()

                    .createDisplayContext(dm.getDisplay(id));

            // Note that the Display object must be obtained from DisplayManager which is

            // Note that the Display object must be obtained from DisplayManager which is

            // associated to the display context, so the Display is isolated from Activity and

            // associated to the display context, so the Display is isolated from Activity and

            // Application to provide the actual state of device that excludes the additional

            // Application to provide the actual state of device that excludes the additional
@@ -207,6 +207,17 @@ public class DisplayController implements DisplayListener { 
            }

            }

        }

        }





        private static DisplayHolder create(Context context, int id) {

            DisplayManager dm = context.getSystemService(DisplayManager.class);

            Display display = dm.getDisplay(id);

            if (display == null) {

                return null;

            }

            // Use application context to create display context so that it can have its own

            // Resources.

            Context displayContext = context.getApplicationContext().createDisplayContext(display);

            return new DisplayHolder(displayContext);

        }

    }

    }





    public static class Info {

    public static class Info {