5 files changed, 30 insertions, 40 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index fd785d3..742f113 100755..100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -52,7 +52,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.telephony.util.BlacklistUtils;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
 import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
@@ -61,7 +60,6 @@ import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
 import com.android.settings.search.Indexable;
 import com.android.settings.search.SearchIndexableRaw;
-import com.android.settings.R;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -105,11 +103,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
     private static final String KEY_TRUST_AGENT = "trust_agent";
     private static final String KEY_SCREEN_PINNING = "screen_pinning_settings";
-    private static final String KEY_TOGGLE_DM_AUTOBOOT = "toggle_dm_autoboot";
     private static final String KEY_SMS_SECURITY_CHECK_PREF = "sms_security_check_limit";
-    private static final String DM_AUTOBOOT_SETTING = "dm_selfregist_autoboot";
-    private static final int DM_AUTOBOOT_SETTING_ENABLE = 1;
-    private static final int DM_AUTOBOOT_SETTING_DISABLE = 0;
 
     // These switch preferences need special handling since they're not all stored in Settings.
     private static final String SWITCH_PREFERENCE_KEYS[] = { KEY_LOCK_AFTER_TIMEOUT,
@@ -121,10 +115,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
     private static final int MY_USER_ID = UserHandle.myUserId();
 
-    // CyanogenMod Additions
-    private static final String KEY_APP_SECURITY_CATEGORY = "app_security";
-    private static final String KEY_BLACKLIST = "blacklist";
-
     private PackageManager mPM;
     private DevicePolicyManager mDPM;
     private SubscriptionManager mSubscriptionManager;
@@ -157,9 +147,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         return MetricsLogger.SECURITY;
     }
 
-    // CyanogenMod Additions
-    private PreferenceScreen mBlacklist;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -180,7 +167,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
     private static int getResIdForLockUnlockScreen(Context context,
             LockPatternUtils lockPatternUtils) {
-        // Add options for lock/unlock screen
         int resid = 0;
         if (!lockPatternUtils.isSecure(MY_USER_ID)) {
             if (lockPatternUtils.isLockScreenDisabled(MY_USER_ID)) {
@@ -361,18 +347,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
             }
         }
 
-        // App security settings
-        addPreferencesFromResource(R.xml.security_settings_app_cyanogenmod);
-        mBlacklist = (PreferenceScreen) root.findPreference(KEY_BLACKLIST);
-
-        // Determine options based on device telephony support
-        if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            // No telephony, remove dependent options
-            PreferenceGroup appCategory = (PreferenceGroup)
-                    root.findPreference(KEY_APP_SECURITY_CATEGORY);
-            appCategory.removePreference(mBlacklist);
-        }
-
         // The above preferences come and go based on security state, so we need to update
         // the index. This call is expected to be fairly cheap, but we may want to do something
         // smarter in the future.
@@ -674,7 +648,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         }
 
         updateOwnerInfo();
-        updateBlacklistSummary();
     }
 
     public void updateOwnerInfo() {
@@ -928,13 +901,4 @@ public class SecuritySettings extends SettingsPreferenceFragment
         }
     }
 
-    private void updateBlacklistSummary() {
-        if (mBlacklist != null) {
-            if (BlacklistUtils.isBlacklistEnabled(getActivity())) {
-                mBlacklist.setSummary(R.string.blacklist_summary);
-            } else {
-                mBlacklist.setSummary(R.string.blacklist_summary_disabled);
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 06f0149..06f0149 100755..100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 74b8ff9..74b8ff9 100755..100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
index 13ead6e..13ead6e 100755..100644
--- a/src/com/android/settings/SubSettings.java
+++ b/src/com/android/settings/SubSettings.java
diff --git a/src/com/android/settings/cyanogenmod/PrivacySettings.java b/src/com/android/settings/cyanogenmod/PrivacySettings.java
index 76cb9cb..ced0832 100644
--- a/src/com/android/settings/cyanogenmod/PrivacySettings.java
+++ b/src/com/android/settings/cyanogenmod/PrivacySettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 The Android Open Source Project
+ * Copyright (C) 2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,25 +16,39 @@
 
 package com.android.settings.cyanogenmod;
 
-//import android.content.pm.PackageManager;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
-//import android.preference.PreferenceScreen;
-//import com.android.settings.Utils;
+import android.preference.PreferenceScreen;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.internal.telephony.util.BlacklistUtils;
 
 /**
  * Privacy settings
  */
 public class PrivacySettings extends SettingsPreferenceFragment {
 
+    private static final String KEY_BLACKLIST = "blacklist";
+
+    private PreferenceScreen mBlacklist;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.privacy_settings_cyanogenmod);
+
+        // Add package manager to check if features are available
+        PackageManager pm = getPackageManager();
+
+        // Determine options based on device telephony support
+        if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            // No telephony, remove dependent options
+        PreferenceScreen root = getPreferenceScreen();
+            root.removePreference(mBlacklist);
+        }
     }
 
     @Override
@@ -45,5 +59,17 @@ public class PrivacySettings extends SettingsPreferenceFragment {
     @Override
     public void onResume() {
         super.onResume();
+        updateBlacklistSummary();
     }
+
+    private void updateBlacklistSummary() {
+        if (mBlacklist != null) {
+            if (BlacklistUtils.isBlacklistEnabled(getActivity())) {
+                mBlacklist.setSummary(R.string.blacklist_summary);
+            } else {
+                mBlacklist.setSummary(R.string.blacklist_summary_disabled);
+            }
+        }
+    }
+
 }