Add toggle to enable ADB root
Co-authored-by: Bruno Martins <bgcngm@gmail.com> Co-authored-by: dianlujitao <dianlujitao@lineageos.org> Co-authored-by: Luca Stefani <luca.stefani.ge1@gmail.com> Co-authored-by: LuK1337 <priv.luk@gmail.com> Change-Id: Ic80dbf79265c0fe7113f42299479873befb05004
This commit is contained in:
committed by
Michael Bestas
parent
e1b61b66ce
commit
581089a2ef
@@ -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>
|
||||||
|
|||||||
@@ -191,6 +191,12 @@
|
|||||||
android:summary="@string/enable_adb_wireless_summary"
|
android:summary="@string/enable_adb_wireless_summary"
|
||||||
settings:keywords="@string/keywords_adb_wireless" />
|
settings:keywords="@string/keywords_adb_wireless" />
|
||||||
|
|
||||||
|
<SwitchPreferenceCompat
|
||||||
|
android:key="enable_adb_root"
|
||||||
|
android:title="@string/adb_enable_root"
|
||||||
|
android:summary="@string/adb_enable_summary_root"
|
||||||
|
android:persistent="false" />
|
||||||
|
|
||||||
<SwitchPreferenceCompat
|
<SwitchPreferenceCompat
|
||||||
android:key="adb_authorization_timeout"
|
android:key="adb_authorization_timeout"
|
||||||
android:title="@string/adb_authorization_timeout_title"
|
android:title="@string/adb_authorization_timeout_title"
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018-2024 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.SwitchPreferenceCompat;
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
((SwitchPreferenceCompat) 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 onDeveloperOptionsSwitchDisabled() {
|
||||||
|
super.onDeveloperOptionsSwitchDisabled();
|
||||||
|
|
||||||
|
mADBRootService.setEnabled(false);
|
||||||
|
((SwitchPreferenceCompat) mPreference).setChecked(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchEnabled() {
|
||||||
|
if (isAdminUser()) {
|
||||||
|
mPreference.setEnabled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean isAdminUser() {
|
||||||
|
return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -731,6 +731,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new AdbPreferenceController(context, fragment));
|
controllers.add(new AdbPreferenceController(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 AdbRootPreferenceController(context, fragment));
|
||||||
controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));
|
controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));
|
||||||
controllers.add(new LocalTerminalPreferenceController(context));
|
controllers.add(new LocalTerminalPreferenceController(context));
|
||||||
controllers.add(new LinuxTerminalPreferenceController(context));
|
controllers.add(new LinuxTerminalPreferenceController(context));
|
||||||
|
|||||||
Reference in New Issue
Block a user