Add developer option to disable automatic adb grant revocation

Android 10 introduced a security feature to automatically revoke
adb authorizations for systems that have not reconnected to the device
within 7 days. While this is helpful for consumers that enable adb for
a one time task and mistakenly select the 'always allow' option,
feedback has indicated having a developer option to disable this feature
would be beneficial.

Bug: 119510647
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AdbAuthorizationTimeoutPreferenceControllerTest
Change-Id: I7eb123e8c69956aa02bb679784ac79650baf5dcb
This commit is contained in:
Michael Groover
2020-03-17 00:06:20 -07:00
parent b94605c378
commit 3d8974723a
5 changed files with 224 additions and 0 deletions

View File

@@ -0,0 +1,79 @@
/*
* Copyright (C) 2020 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;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
/**
* Preference controller for the developer option to disable the automatic revocation of adb
* authorizations.
*/
public class AdbAuthorizationTimeoutPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
private static final String ADB_AUTHORIZATION_TIMEOUT_KEY = "adb_authorization_timeout";
private final Context mContext;
public AdbAuthorizationTimeoutPreferenceController(Context context) {
super(context);
mContext = context;
}
@Override
public String getPreferenceKey() {
return ADB_AUTHORIZATION_TIMEOUT_KEY;
}
@Override
public void updateState(Preference preference) {
final long authTimeout = Settings.Global.getLong(mContext.getContentResolver(),
Settings.Global.ADB_ALLOWED_CONNECTION_TIME,
Settings.Global.DEFAULT_ADB_ALLOWED_CONNECTION_TIME);
// An authTimeout of 0 indicates this preference is enabled and adb authorizations will not
// be automatically revoked.
((SwitchPreference) mPreference).setChecked(authTimeout == 0);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
writeSetting((boolean) newValue);
return true;
}
@Override
public void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
writeSetting(false);
((SwitchPreference) mPreference).setChecked(false);
}
private void writeSetting(boolean isEnabled) {
long authTimeout = 0;
if (!isEnabled) {
authTimeout = Settings.Global.DEFAULT_ADB_ALLOWED_CONNECTION_TIME;
}
Settings.Global.putLong(mContext.getContentResolver(),
Settings.Global.ADB_ALLOWED_CONNECTION_TIME,
authTimeout);
}
}

View File

@@ -444,6 +444,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new AdbPreferenceController(context, fragment));
controllers.add(new ClearAdbKeysPreferenceController(context, fragment));
controllers.add(new WirelessDebuggingPreferenceController(context, lifecycle));
controllers.add(new AdbAuthorizationTimeoutPreferenceController(context));
controllers.add(new LocalTerminalPreferenceController(context));
controllers.add(new BugReportInPowerPreferenceController(context));
controllers.add(new AutomaticSystemServerHeapDumpPreferenceController(context));