Fix below bugs: 1) When developer option switch is turned off, "Enable ANGLE" switch is not disabled. Fixed it in GraphicsDriverEnableAngleAsSystemDriverController::update(). 2) When user turns off developer option switch, a restart is not always mandatory. However, we should ask user to restart the device is "Enable ANGLE" is forced to change due to developer option switch turning off. Fixed it in DevelopmentSettingsDashboardFragment::onSwitchChanged(). 3) When user turns off developer option switch and the reboot dialog pops up, user can dismiss the dialog by not clicking either POSITIVE_BUTTON or NEGATIVE_BUTTON. We should enforce user to click the button and disallow the option to dimiss the dialog by touching screen areas outside the window's bounds. Fixed it in DisableDevSettingsDialogFragment.java. Did a few clean-up and in GraphicsDriverEnableAngleAsSystemDriverController.java, and updated unit test to reflect new code behavior. Bug: b/270994705 Test: m; flash and device can boot. Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest Test: atest GraphicsDriverEnableAngleAsSystemDriverControllerTest Test: atest SettingsRoboTests:FreeformWindowsPreferenceControllerTest Test: atest SettingsRoboTests:DesktopModePreferenceControllerTest Change-Id: I199b2fe59b6ad948b753793254c822a293d8b40d
225 lines
8.5 KiB
Java
225 lines
8.5 KiB
Java
/*
|
|
* Copyright (C) 2023 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.development.graphicsdriver;
|
|
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.os.GraphicsEnvironment;
|
|
import android.os.SystemProperties;
|
|
import android.text.TextUtils;
|
|
import android.util.Log;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
import androidx.preference.Preference;
|
|
import androidx.preference.SwitchPreference;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.core.PreferenceControllerMixin;
|
|
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
|
|
import com.android.settings.development.RebootConfirmationDialogFragment;
|
|
import com.android.settings.development.RebootConfirmationDialogHost;
|
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
|
|
|
/** Controller to handle the events when user toggles this developer option switch: Enable ANGLE */
|
|
public class GraphicsDriverEnableAngleAsSystemDriverController
|
|
extends DeveloperOptionsPreferenceController
|
|
implements Preference.OnPreferenceChangeListener,
|
|
PreferenceControllerMixin,
|
|
RebootConfirmationDialogHost {
|
|
|
|
private static final String TAG = "GraphicsEnableAngleCtrl";
|
|
|
|
private static final String ENABLE_ANELE_AS_SYSTEM_DRIVER_KEY = "enable_angle_as_system_driver";
|
|
|
|
private final DevelopmentSettingsDashboardFragment mFragment;
|
|
|
|
private final GraphicsDriverSystemPropertiesWrapper mSystemProperties;
|
|
|
|
private boolean mShouldToggleSwitchBackOnRebootDialogDismiss;
|
|
|
|
@VisibleForTesting
|
|
static final String PROPERTY_RO_GFX_ANGLE_SUPPORTED = "ro.gfx.angle.supported";
|
|
|
|
@VisibleForTesting
|
|
static final String PROPERTY_PERSISTENT_GRAPHICS_EGL = "persist.graphics.egl";
|
|
|
|
@VisibleForTesting static final String ANGLE_DRIVER_SUFFIX = "angle";
|
|
|
|
@VisibleForTesting
|
|
static class Injector {
|
|
public GraphicsDriverSystemPropertiesWrapper createSystemPropertiesWrapper() {
|
|
return new GraphicsDriverSystemPropertiesWrapper() {
|
|
@Override
|
|
public String get(String key, String def) {
|
|
return SystemProperties.get(key, def);
|
|
}
|
|
|
|
@Override
|
|
public void set(String key, String val) {
|
|
SystemProperties.set(key, val);
|
|
}
|
|
};
|
|
}
|
|
}
|
|
|
|
public GraphicsDriverEnableAngleAsSystemDriverController(
|
|
Context context, DevelopmentSettingsDashboardFragment fragment) {
|
|
this(context, fragment, new Injector());
|
|
}
|
|
|
|
private boolean isAngleSupported() {
|
|
return TextUtils.equals(
|
|
mSystemProperties.get(PROPERTY_RO_GFX_ANGLE_SUPPORTED, ""), "true");
|
|
}
|
|
|
|
@VisibleForTesting
|
|
GraphicsDriverEnableAngleAsSystemDriverController(
|
|
Context context, DevelopmentSettingsDashboardFragment fragment, Injector injector) {
|
|
super(context);
|
|
mFragment = fragment;
|
|
mSystemProperties = injector.createSystemPropertiesWrapper();
|
|
// By default, when the reboot dialog is dismissed we want to toggle the switch back.
|
|
// Exception is when user chooses to reboot now, the switch should keep its current value
|
|
// and persist its' state over reboot.
|
|
mShouldToggleSwitchBackOnRebootDialogDismiss = true;
|
|
}
|
|
|
|
@Override
|
|
public String getPreferenceKey() {
|
|
return ENABLE_ANELE_AS_SYSTEM_DRIVER_KEY;
|
|
}
|
|
|
|
@Override
|
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
final boolean enableAngleAsSystemDriver = (Boolean) newValue;
|
|
// set "persist.graphics.egl" to "angle" if enableAngleAsSystemDriver is true
|
|
// set "persist.graphics.egl" to "" if enableAngleAsSystemDriver is false
|
|
GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(enableAngleAsSystemDriver);
|
|
// pop up a window asking user to reboot to make the new "persist.graphics.egl" take effect
|
|
showRebootDialog();
|
|
return true;
|
|
}
|
|
|
|
@VisibleForTesting
|
|
void showRebootDialog() {
|
|
RebootConfirmationDialogFragment.show(
|
|
mFragment,
|
|
R.string.reboot_dialog_enable_angle_as_system_driver,
|
|
R.string.cancel,
|
|
this);
|
|
}
|
|
|
|
/** Return the default value of "persist.graphics.egl" */
|
|
public boolean isDefaultValue() {
|
|
if (!isAngleSupported()) {
|
|
return true;
|
|
}
|
|
|
|
final String currentGlesDriver =
|
|
mSystemProperties.get(PROPERTY_PERSISTENT_GRAPHICS_EGL, "");
|
|
// default value of "persist.graphics.egl" is ""
|
|
return TextUtils.isEmpty(currentGlesDriver);
|
|
}
|
|
|
|
@Override
|
|
public void updateState(Preference preference) {
|
|
super.updateState(preference);
|
|
if (isAngleSupported()) {
|
|
// set switch on if "persist.graphics.egl" is "angle" and angle is built in /vendor
|
|
// set switch off otherwise.
|
|
final String currentGlesDriver =
|
|
mSystemProperties.get(PROPERTY_PERSISTENT_GRAPHICS_EGL, "");
|
|
final boolean isAngle = TextUtils.equals(ANGLE_DRIVER_SUFFIX, currentGlesDriver);
|
|
((SwitchPreference) mPreference).setChecked(isAngle);
|
|
} else {
|
|
mPreference.setEnabled(false);
|
|
((SwitchPreference) mPreference).setChecked(false);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onDeveloperOptionsSwitchDisabled() {
|
|
// 1) disable the switch
|
|
super.onDeveloperOptionsSwitchDisabled();
|
|
if (isAngleSupported()) {
|
|
// 2) set the persist.graphics.egl empty string
|
|
GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(false);
|
|
// 3) reset the switch
|
|
((SwitchPreference) mPreference).setChecked(false);
|
|
}
|
|
}
|
|
|
|
void toggleSwitchBack() {
|
|
final String currentGlesDriver =
|
|
mSystemProperties.get(PROPERTY_PERSISTENT_GRAPHICS_EGL, "");
|
|
if (TextUtils.equals(ANGLE_DRIVER_SUFFIX, currentGlesDriver)) {
|
|
// if persist.graphics.egl = "angle", set the property value back to ""
|
|
GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(false);
|
|
// toggle switch off
|
|
((SwitchPreference) mPreference).setChecked(false);
|
|
return;
|
|
}
|
|
|
|
if (TextUtils.isEmpty(currentGlesDriver)) {
|
|
// if persist.graphicx.egl = "", set the persist.graphics.egl back to "angle"
|
|
GraphicsEnvironment.getInstance().toggleAngleAsSystemDriver(true);
|
|
// toggle switch on
|
|
((SwitchPreference) mPreference).setChecked(true);
|
|
return;
|
|
}
|
|
|
|
// if persist.graphics.egl holds values other than the above two, log error message
|
|
Log.e(TAG, "Invalid persist.graphics.egl property value");
|
|
}
|
|
|
|
@VisibleForTesting
|
|
void rebootDevice(Context context) {
|
|
final Intent intent = new Intent(Intent.ACTION_REBOOT);
|
|
context.startActivity(intent);
|
|
}
|
|
|
|
@Override
|
|
public void onRebootConfirmed(Context context) {
|
|
// User chooses to reboot now, do not toggle switch back
|
|
mShouldToggleSwitchBackOnRebootDialogDismiss = false;
|
|
|
|
// Reboot the device
|
|
rebootDevice(context);
|
|
}
|
|
|
|
@Override
|
|
public void onRebootCancelled() {
|
|
// User chooses to cancel reboot, toggle switch back
|
|
mShouldToggleSwitchBackOnRebootDialogDismiss = true;
|
|
}
|
|
|
|
@Override
|
|
public void onRebootDialogDismissed() {
|
|
// If reboot dialog is dismissed either from
|
|
// 1) User clicks cancel
|
|
// 2) User taps phone screen area outside of reboot dialog
|
|
// do not reboot the device, and toggles switch back.
|
|
if (mShouldToggleSwitchBackOnRebootDialogDismiss) {
|
|
toggleSwitchBack();
|
|
}
|
|
|
|
// Reset the flag so that the default option is to toggle switch back
|
|
// on reboot dialog dismissed.
|
|
mShouldToggleSwitchBackOnRebootDialogDismiss = true;
|
|
}
|
|
}
|