From b255b3a6ed4dbda26eb649767134e038045254a3 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Wed, 27 Sep 2017 13:33:54 -0700 Subject: [PATCH] delete obsolete SELinux code. This settings field only shows up on devices which have the ro.build.selinux property, which is never something we added. This code is dead. Change-Id: I20349b4e8fea5be761047e47d4551c1a4f087a37 Test: code compiles and setting app works. --- res/values/strings.xml | 7 -- res/xml/device_info_settings.xml | 6 -- .../android/settings/DeviceInfoSettings.java | 2 - .../SELinuxStatusPreferenceController.java | 65 ------------------- 4 files changed, 80 deletions(-) delete mode 100644 src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 51da73db4af..e92755ee364 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2634,8 +2634,6 @@ Kernel version Build number - - SELinux status Not available @@ -5974,11 +5972,6 @@ from their cell phone carrier. The use of the string is similar to the string "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] --> Additional system updates - - Disabled - Permissive - Enforcing diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index b0941750d3e..1771799edb1 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -103,10 +103,4 @@ android:title="@string/build_number" android:summary="@string/summary_placeholder"/> - - - diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 7ca52e27bcc..abf68f2762a 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -35,7 +35,6 @@ import com.android.settings.deviceinfo.FirmwareVersionPreferenceController; import com.android.settings.deviceinfo.KernelVersionPreferenceController; import com.android.settings.deviceinfo.ManualPreferenceController; import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController; -import com.android.settings.deviceinfo.SELinuxStatusPreferenceController; import com.android.settings.deviceinfo.SafetyInfoPreferenceController; import com.android.settings.deviceinfo.SecurityPatchPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; @@ -129,7 +128,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { controllers.add(new DeviceModelPreferenceController(context, fragment)); controllers.add(new SecurityPatchPreferenceController(context)); controllers.add(new FccEquipmentIdPreferenceController(context)); - controllers.add(new SELinuxStatusPreferenceController(context)); controllers.add(new SafetyInfoPreferenceController(context)); return controllers; } diff --git a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java b/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java deleted file mode 100644 index 058992fa083..00000000000 --- a/src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.deviceinfo; - -import android.content.Context; -import android.os.SELinux; -import android.os.SystemProperties; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.text.TextUtils; - -import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; - -public class SELinuxStatusPreferenceController extends AbstractPreferenceController implements - PreferenceControllerMixin { - - private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux"; - private static final String KEY_SELINUX_STATUS = "selinux_status"; - - public SELinuxStatusPreferenceController(Context context) { - super(context); - } - - @Override - public boolean isAvailable() { - return !TextUtils.isEmpty(SystemProperties.get(PROPERTY_SELINUX_STATUS)); - } - - @Override - public String getPreferenceKey() { - return KEY_SELINUX_STATUS; - } - - @Override - public void displayPreference(PreferenceScreen screen) { - super.displayPreference(screen); - final Preference pref = screen.findPreference(KEY_SELINUX_STATUS); - if (pref == null) { - return; - } - if (!SELinux.isSELinuxEnabled()) { - String status = mContext.getResources().getString(R.string.selinux_status_disabled); - pref.setSummary(status); - } else if (!SELinux.isSELinuxEnforced()) { - String status = mContext.getResources().getString(R.string.selinux_status_permissive); - pref.setSummary(status); - } - } -} -