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

Commit d1ed82b9 authored by Tim Kilbourn's avatar Tim Kilbourn
Browse files

Remove duplicate initialization from bad merge. 

Change-Id: I8059074202d0c8838a13f99095c2e8c2ff0b15e7
parent a85e6a44

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(