Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b56f5773 authored by Luca Stefani's avatar Luca Stefani Committed by Bruno Martins
Browse files

Add toggle to enable ADB root 

Author: dianlujitao <dianlujitao@lineageos.org>
Date:   Sun Nov 24 14:33:05 2019 +0800

    Settings: Mark adb root toggle as non-persistent

     * It's always read from the binder API

    Change-Id: I88234450a2dcfbea985eb3c48114d869db331cd0

Author: dianlujitao <dianlujitao@lineageos.org>
Date:   Sun Nov 24 14:34:51 2019 +0800

    Settings: Remove ADBROOT permission from manifest

    Change-Id: I2a458cda22b3d370734adb89ff8e0303ca1c8374

Change-Id: I0d9d69bc05034b4308450baca531305221665966
parent 0f4d5b97

res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
     limitations under the License.

-->

<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>



    <!-- Device Info screen. LineageOS legal. -->

    <string name="lineagelicense_title">LineageOS legal</string>

res/xml/development_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ 
            android:title="@string/enable_adb"

            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"

                    android:title="@string/clear_adb_keys" />

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

0 → 100644
+81 −0
Original line number 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;



import lineageos.providers.LineageSettings;



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 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 Diff line number Diff line
@@ -448,6 +448,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new DisableAutomaticUpdatesPreferenceController(context));

        controllers.add(new SelectDSUPreferenceController(context));

        controllers.add(new AdbPreferenceController(context, fragment));

        controllers.add(new AdbRootPreferenceController(context, fragment));

        controllers.add(new ClearAdbKeysPreferenceController(context, fragment));

        controllers.add(new WirelessDebuggingPreferenceController(context, lifecycle));

        controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));