From d1ed82b902f383970810f4445d01f7e2f0ab4358 Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Thu, 17 Sep 2015 14:05:37 -0700 Subject: [PATCH] Remove duplicate initialization from bad merge. Change-Id: I8059074202d0c8838a13f99095c2e8c2ff0b15e7 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 8e1c34f95b8e9..33ecd0944f258 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -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(