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

Commit d9f25409 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Do not reuse DisplayAdjustment in Display."

parents c36fe2fc 1abaa53d

core/java/android/view/Display.java

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ public final class Display { 
        mGlobal = global;

        mDisplayId = displayId;

        mDisplayInfo = displayInfo;

        mDisplayAdjustments = daj;

        mDisplayAdjustments = new DisplayAdjustments(daj);

        mIsValid = true;



        // Cache properties that cannot change as long as the display is valid.

core/java/android/view/DisplayAdjustments.java

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ public class DisplayAdjustments { 
        mActivityToken = token;

    }



    public DisplayAdjustments(DisplayAdjustments daj) {

        this (daj.getCompatibilityInfo(), daj.getActivityToken());

    }



    public DisplayAdjustments(CompatibilityInfo compatInfo, IBinder token) {

        setCompatibilityInfo(compatInfo);

        mActivityToken = token;