Skip to content

Commit 542b15b

Browse files
committed
Settings: Fix selinux status after About Phone revamp
* convert to BasePreferenceController
1 parent 75a26e1 commit 542b15b

2 files changed

Lines changed: 15 additions & 28 deletions

File tree

res/xml/firmware_version.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Preference
7676
android:key="selinux_status"
7777
android:title="@string/selinux_status"
78-
android:summary="@string/selinux_status_enforcing"
78+
android:summary="@string/unknown"
7979
settings:enableCopying="false"
8080
settings:controller="com.android.settings.deviceinfo.firmwareversion.SELinuxStatusPreferenceController"/>
8181

src/com/android/settings/deviceinfo/firmwareversion/SELinuxStatusPreferenceController.java

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,48 +17,35 @@
1717

1818
import android.content.Context;
1919
import android.os.SELinux;
20-
import android.os.SystemProperties;
2120
import androidx.preference.Preference;
2221
import androidx.preference.PreferenceScreen;
23-
import android.text.TextUtils;
2422

2523
import com.android.settings.R;
26-
import com.android.settings.core.PreferenceControllerMixin;
27-
import com.android.settingslib.core.AbstractPreferenceController;
24+
import com.android.settings.core.BasePreferenceController;
2825

29-
public class SELinuxStatusPreferenceController extends AbstractPreferenceController implements
30-
PreferenceControllerMixin {
26+
public class SELinuxStatusPreferenceController extends BasePreferenceController {
3127

3228
private static final String KEY_SELINUX_STATUS = "selinux_status";
29+
private static final String TAG = "SELinuxStatusPreferenceController";
3330

34-
public SELinuxStatusPreferenceController(Context context) {
35-
super(context);
31+
public SELinuxStatusPreferenceController(Context context, String key) {
32+
super(context, key);
3633
}
3734

3835
@Override
39-
public boolean isAvailable() {
40-
return true;
36+
public int getAvailabilityStatus() {
37+
return AVAILABLE;
4138
}
4239

4340
@Override
44-
public String getPreferenceKey() {
45-
return KEY_SELINUX_STATUS;
46-
}
47-
48-
@Override
49-
public void displayPreference(PreferenceScreen screen) {
50-
super.displayPreference(screen);
51-
final Preference pref = screen.findPreference(KEY_SELINUX_STATUS);
52-
if (pref == null) {
53-
return;
54-
}
41+
public CharSequence getSummary() {
5542
if (!SELinux.isSELinuxEnabled()) {
56-
String status = mContext.getResources().getString(R.string.selinux_status_disabled);
57-
pref.setSummary(status);
58-
} else if (!SELinux.isSELinuxEnforced()) {
59-
String status = mContext.getResources().getString(R.string.selinux_status_permissive);
60-
pref.setSummary(status);
43+
return mContext.getResources().getString(R.string.selinux_status_disabled);
44+
} else if (SELinux.isSELinuxEnforced()) {
45+
return mContext.getResources().getString(R.string.selinux_status_enforcing);
46+
} else {
47+
return mContext.getResources().getString(R.string.selinux_status_permissive);
6148
}
6249
}
63-
}
6450

51+
}

0 commit comments

Comments
 (0)