Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.
- default implementation has been added in the super class to handle enabling/disabling the preference when the master developer options switch it turned on/off. Removing all subclass that originally implemented the methods that only contains the default behavior. Bug: 73955632 Test: make RunSettingsRoboTests Change-Id: I13c372c2ab498a5786b40cdc1ad3b5f3424abb5a
This commit is contained in:
@@ -23,15 +23,14 @@ import android.os.SystemProperties;
|
||||
import android.os.storage.IStorageManager;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
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.development.DeveloperOptionsPreferenceController;
|
||||
|
||||
public class FileEncryptionPreferenceController extends
|
||||
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
|
||||
public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController
|
||||
implements PreferenceControllerMixin {
|
||||
|
||||
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
|
||||
private static final String KEY_STORAGE_MANAGER = "mount";
|
||||
@@ -41,8 +40,6 @@ public class FileEncryptionPreferenceController extends
|
||||
|
||||
private final IStorageManager mStorageManager;
|
||||
|
||||
private Preference mPreference;
|
||||
|
||||
public FileEncryptionPreferenceController(Context context) {
|
||||
super(context);
|
||||
|
||||
@@ -67,13 +64,6 @@ public class FileEncryptionPreferenceController extends
|
||||
return KEY_CONVERT_FBE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
if (!TextUtils.equals("file",
|
||||
|
Reference in New Issue
Block a user