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

Commit 0f3a4f94 authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android (Google) Code Review
Browse files

Merge "Remove duplicate initialization from bad merge."

parents a2d44ea0 d1ed82b9

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mDreamManagerInternal = LocalServices.getService(DreamManagerInternal.class);

        mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);

        mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);

        mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);



        // Init display burn-in protection

        boolean burnInProtectionEnabled = context.getResources().getBoolean(