Add toggle to enable ADB root (dc2af8b9) · Commits · e / os / android_packages_apps_Settings

res/values/cm_strings.xml

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,10 @@
	limitations under the License.		limitations under the License.
	-->		-->
	<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
			<!-- Android debugging as root -->
			<string name="adb_enable_root">Rooted debugging</string>
			<string name="adb_enable_summary_root">Allow running Android debugging as root</string>

	<!-- Backup Transport selection settings menu and activity title -->		<!-- Backup Transport selection settings menu and activity title -->
	<string name="backup_transport_setting_label">Change backup provider</string>		<string name="backup_transport_setting_label">Change backup provider</string>
	<string name="backup_transport_title">Select backup provider</string>		<string name="backup_transport_title">Select backup provider</string>

res/xml/development_settings.xml

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -158,6 +158,13 @@
	android:title="@string/enable_adb"		android:title="@string/enable_adb"
	android:summary="@string/enable_adb_summary" />		android:summary="@string/enable_adb_summary" />

			<SwitchPreference
			android:key="enable_adb_root"
			android:title="@string/adb_enable_root"
			android:summary="@string/adb_enable_summary_root"
			android:dependency="enable_adb"
			android:persistent="false" />

	<Preference android:key="clear_adb_keys"		<Preference android:key="clear_adb_keys"
	android:title="@string/clear_adb_keys" />		android:title="@string/clear_adb_keys" />

src/com/android/settings/development/AdbRootPreferenceController.java

0 → 100644

+84 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2018 The LineageOS 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;

			import android.adb.ADBRootService;
			import android.content.Context;
			import android.os.UserManager;

			import androidx.preference.Preference;
			import androidx.preference.PreferenceScreen;
			import androidx.preference.SwitchPreference;

			import com.android.settings.R;
			import com.android.settings.core.PreferenceControllerMixin;
			import com.android.settingslib.development.DeveloperOptionsPreferenceController;

			public class AdbRootPreferenceController extends DeveloperOptionsPreferenceController
			implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

			private static final String TAG = "AdbRootPreferenceController";
			private static final String PREF_KEY = "enable_adb_root";

			private final ADBRootService mADBRootService;

			public AdbRootPreferenceController(Context context,
			DevelopmentSettingsDashboardFragment fragment) {
			super(context);

			mADBRootService = new ADBRootService();
			}

			@Override
			public String getPreferenceKey() {
			return PREF_KEY;
			}

			@Override
			public boolean isAvailable() {
			return mADBRootService.isSupported();
			}

			@Override
			public void displayPreference(PreferenceScreen screen) {
			super.displayPreference(screen);

			((SwitchPreference) mPreference).setChecked(mADBRootService.getEnabled());

			if (!isAdminUser()) {
			mPreference.setEnabled(false);
			}
			}

			@Override
			public boolean onPreferenceChange(Preference preference, Object newValue) {
			final boolean rootEnabled = (Boolean) newValue;
			mADBRootService.setEnabled(rootEnabled);
			return true;
			}

			@Override
			protected void onDeveloperOptionsSwitchEnabled() {
			if (isAdminUser()) {
			mPreference.setEnabled(true);
			}
			}

			boolean isAdminUser() {
			return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser();
			}
			}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -634,6 +634,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
	controllers.add(new DisableAutomaticUpdatesPreferenceController(context));		controllers.add(new DisableAutomaticUpdatesPreferenceController(context));
	controllers.add(new SelectDSUPreferenceController(context));		controllers.add(new SelectDSUPreferenceController(context));
	controllers.add(new AdbPreferenceController(context, fragment));		controllers.add(new AdbPreferenceController(context, fragment));
			controllers.add(new AdbRootPreferenceController(context, fragment));
	controllers.add(new ClearAdbKeysPreferenceController(context, fragment));		controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
	controllers.add(new WirelessDebuggingPreferenceController(context, lifecycle));		controllers.add(new WirelessDebuggingPreferenceController(context, lifecycle));
	controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));		controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));