PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete obsolete SELinux code.

Browse Source 
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.
This commit is contained in:
Nick Kralevich
2017-09-27 13:33:54 -07:00
parent 2d479598f0
commit b255b3a6ed
4 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -2634,8 +2634,6 @@
<string name="kernel_version">Kernel version</string>
<!-- About phone screen, setting option name [CHAR LIMIT=40] -->
<string name="build_number">Build number</string>
<!-- About phone screen, setting option name [CHAR LIMIT=40] -->
<string name="selinux_status">SELinux status</string>
<!-- About phone screen, show when a value of some status item is unavailable. -->
<string name="device_info_not_available">Not available</string>
@@ -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] -->
<string name="additional_system_update_settings_list_item_title">Additional system updates</string>
<!-- These statuses are displayed when a device was built with SE Android supoprt.
These are displayed by the settings app in the about section. -->
<string name="selinux_status_disabled">Disabled</string>
<string name="selinux_status_permissive">Permissive</string>
<string name="selinux_status_enforcing">Enforcing</string>
<!-- Notification of installed CA Certs --> <skip/>

6
res/xml/device_info_settings.xml
View File

@@ -103,10 +103,4 @@
android:title="@string/build_number"
android:summary="@string/summary_placeholder"/>
<!-- SELinux status information -->
<Preference
android:key="selinux_status"
android:title="@string/selinux_status"
android:summary="@string/selinux_status_enforcing"/>
</PreferenceScreen>

2
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -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;
}

65
src/com/android/settings/deviceinfo/SELinuxStatusPreferenceController.java
View File

@@ -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);
}
}
}