From bed011ab78242f8d408d92a47fc3fc6fc281096e Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Fri, 13 Nov 2015 09:36:18 +0100
Subject: settings: Fix merge collision

Change-Id: I6cfb35e3d2b58a0ea7f79f2d400544d3baec6178
---
 src/com/android/settings/SecuritySettings.java | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 742f113..308bea5 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -206,8 +206,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         }
         addPreferencesFromResource(R.xml.security_settings);
         root = getPreferenceScreen();
-        // Add package manager to check if features are available
-        PackageManager pm = getActivity().getPackageManager();
 
         // Add package manager to check if features are available
         PackageManager pm = getPackageManager();
-- 
cgit v1.1