From 2ebb0dd1d6c416561005a05a124605ad123b763c Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 21 Sep 2017 15:37:14 -0700 Subject: [PATCH] Introduce LocalTerminalPreferenceController - Create new LocalTerminalPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: Ib4a375181af9367a4aef74fd9889de2de1c8652d --- .../DevelopmentSettingsDashboardFragment.java | 2 +- .../LocalTerminalPreferenceController.java | 100 +++++++++++++ ...LocalTerminalPreferenceControllerTest.java | 141 ++++++++++++++++++ 3 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/LocalTerminalPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index d334bd05185..8324152115e 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -189,7 +189,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // quick settings developer tiles // usb debugging // revoke usb debugging authorizations - // local terminal + controllers.add(new LocalTerminalPreferenceController(context)); // bug report shortcut // select mock location app // enable view attribute inspection diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java new file mode 100644 index 00000000000..cda6e27d222 --- /dev/null +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -0,0 +1,100 @@ +package com.android.settings.development; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.UserManager; +import android.support.annotation.VisibleForTesting; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settingslib.wrapper.PackageManagerWrapper; + +public class LocalTerminalPreferenceController extends + DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener { + + private static final String ENABLE_TERMINAL_KEY = "enable_terminal"; + + @VisibleForTesting + static final String TERMINAL_APP_PACKAGE = "com.android.terminal"; + + private PackageManagerWrapper mPackageManager; + private SwitchPreference mPreference; + private UserManager mUserManager; + + public LocalTerminalPreferenceController(Context context) { + super(context); + + mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); + } + + @Override + public boolean isAvailable() { + return isPackageInstalled(TERMINAL_APP_PACKAGE); + } + + @Override + public String getPreferenceKey() { + return ENABLE_TERMINAL_KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey()); + mPackageManager = getPackageManagerWrapper(); + + if (isAvailable() && !isEnabled()) { + mPreference.setEnabled(false); + } + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + final boolean terminalEnabled = (Boolean) newValue; + mPackageManager.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE, + terminalEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED + : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */); + return true; + } + + @Override + public void updateState(Preference preference) { + final boolean isTerminalEnabled = mPackageManager.getApplicationEnabledSetting( + TERMINAL_APP_PACKAGE) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + mPreference.setChecked(isTerminalEnabled); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + if (isEnabled()) { + mPreference.setEnabled(true); + } + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + mPackageManager.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE, + PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */); + mPreference.setEnabled(false); + mPreference.setChecked(false); + } + + @VisibleForTesting + PackageManagerWrapper getPackageManagerWrapper() { + return new PackageManagerWrapper(mContext.getPackageManager()); + } + + private boolean isPackageInstalled(String packageName) { + try { + return mContext.getPackageManager().getPackageInfo(packageName, 0 /* flags */) != null; + } catch (PackageManager.NameNotFoundException e) { + return false; + } + } + + private boolean isEnabled() { + return mUserManager.isAdminUser(); + } +} diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java new file mode 100644 index 00000000000..bd33319bd19 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2017 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 static com.android.settings.development.LocalTerminalPreferenceController + .TERMINAL_APP_PACKAGE; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.UserManager; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settingslib.wrapper.PackageManagerWrapper; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class LocalTerminalPreferenceControllerTest { + + @Mock + private Context mContext; + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + @Mock + private UserManager mUserManager; + @Mock + private PackageManagerWrapper mPackageManagerWrapper; + + private LocalTerminalPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(mUserManager.isAdminUser()).thenReturn(true); + mController = spy(new LocalTerminalPreferenceController(mContext)); + doReturn(true).when(mController).isAvailable(); + doReturn(mPackageManagerWrapper).when(mController).getPackageManagerWrapper(); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void displayPreference_shouldDisablePreferenceWhenNotAdmin() { + when(mUserManager.isAdminUser()).thenReturn(false); + mController.displayPreference(mPreferenceScreen); + + verify(mPreference).setEnabled(false); + } + + @Test + public void onPreferenceChanged_turnOnTerminal() { + mController.onPreferenceChange(null, true); + + verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE, + PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0); + } + + @Test + public void onPreferenceChanged_turnOffTerminal() { + mController.onPreferenceChange(null, false); + + verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE, + PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0); + } + + @Test + public void updateState_preferenceShouldBeChecked() { + when(mPackageManagerWrapper.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn( + PackageManager.COMPONENT_ENABLED_STATE_ENABLED); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_preferenceShouldNotBeChecked() { + when(mPackageManagerWrapper.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn( + PackageManager.COMPONENT_ENABLED_STATE_DEFAULT); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsSwitchDisabled(); + + verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE, + PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0); + verify(mPreference).setChecked(false); + verify(mPreference).setEnabled(false); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_shouldDoNothingWhenNotAdmin() { + when(mUserManager.isAdminUser()).thenReturn(false); + mController.onDeveloperOptionsSwitchDisabled(); + + verify(mPreference, never()).setEnabled(true); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabledWhenAdmin() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } +}