Clarified logic in DeveloperOptionsEntryController
Modified comment to clairfy reason why the developer option setting is
enabled while the module is not
Bug: 137797266
Test: manual
Change-Id: Iad2aaf5cff60796cb442731417427f5f3c3548a9
diff --git a/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java b/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
index c8a1146..ef112ec 100644
--- a/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
+++ b/src/com/android/car/settings/system/DeveloperOptionsEntryPreferenceController.java
@@ -18,19 +18,18 @@
import android.car.drivingstate.CarUxRestrictions;
import android.content.Context;
+import android.os.Build;
import android.os.UserManager;
import androidx.preference.Preference;
import com.android.car.settings.common.FragmentController;
-import com.android.car.settings.common.Logger;
import com.android.car.settings.common.PreferenceController;
import com.android.car.settings.development.DevelopmentSettingsUtil;
/** Controls the visibility of the developer options setting. */
public class DeveloperOptionsEntryPreferenceController extends PreferenceController<Preference> {
- private static final Logger LOG = new Logger(DeveloperOptionsEntryPreferenceController.class);
private UserManager mUserManager;
public DeveloperOptionsEntryPreferenceController(Context context, String preferenceKey,
@@ -52,14 +51,18 @@
@Override
protected boolean handlePreferenceClicked(Preference preference) {
- // TODO(b/137797266): This should be removed when the root cause of the inconsistency is
- // discovered and fixed.
+ // Needed to allow developer options to be enabled by default on eng builds
+ // On first launch, the developer options module is disabled while the setting is enabled,
+ // so we need to enable the module
if (!DevelopmentSettingsUtil.isDeveloperOptionsModuleEnabled(getContext())) {
- LOG.e("Inconsistent state: developer options enabled, but developer options module "
- + "disabled. Retry enabling...");
- DevelopmentSettingsUtil.setDevelopmentSettingsEnabled(getContext(), /* enable= */ true);
+ if (Build.IS_ENG) {
+ DevelopmentSettingsUtil.setDevelopmentSettingsEnabled(getContext(), /* enable= */
+ true);
+ } else {
+ throw new IllegalStateException("Inconsistent state: developer options enabled, but"
+ + " developer options module disabled.");
+ }
}
-
getContext().startActivity(preference.getIntent());
return true;
}