From 1f4ebfe41ec68f322cd01195bedca8237b94ebae Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Tue, 3 Oct 2017 12:28:41 -0700 Subject: [PATCH] Introduce ShortcutManagerThrottlingPreferenceCtrl - Create new ShortcutManagerThrottlingPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: I5409b40b4ed7d350af34498da9a3d7d79200f69b --- .../DevelopmentSettingsDashboardFragment.java | 2 +- ...ManagerThrottlingPreferenceController.java | 91 +++++++++++++++++++ ...gerThrottlingPreferenceControllerTest.java | 84 +++++++++++++++++ 3 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 2d9c5f37935..559c6c51f59 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -320,7 +320,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // inactive apps controllers.add(new AllowAppsOnExternalPreferenceController(context)); controllers.add(new ResizableActivityPreferenceController(context)); - // reset shortcutmanager rate-limiting + controllers.add(new ShortcutManagerThrottlingPreferenceController(context)); return controllers; } diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java new file mode 100644 index 00000000000..c8fdaecc4b6 --- /dev/null +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -0,0 +1,91 @@ +/* + * 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 android.content.Context; +import android.content.pm.IShortcutService; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.support.v7.preference.Preference; +import android.text.TextUtils; +import android.util.Log; +import android.widget.Toast; + +import com.android.settings.R; + +public class ShortcutManagerThrottlingPreferenceController extends + DeveloperOptionsPreferenceController { + + private static final String TAG = "ShortcutMgrPrefCtrl"; + + private static final String SHORTCUT_MANAGER_RESET_KEY = "reset_shortcut_manager_throttling"; + + private final IShortcutService mShortcutService; + + public ShortcutManagerThrottlingPreferenceController(Context context) { + super(context); + + mShortcutService = getShortCutService(); + } + + @Override + public String getPreferenceKey() { + return SHORTCUT_MANAGER_RESET_KEY; + } + + @Override + public boolean handlePreferenceTreeClick(Preference preference) { + if (!TextUtils.equals(SHORTCUT_MANAGER_RESET_KEY, preference.getKey())) { + return false; + } + resetShortcutManagerThrottling(); + return true; + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + // intentional no-op + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + // intentional no-op + } + + private void resetShortcutManagerThrottling() { + if (mShortcutService == null) { + return; + } + try { + mShortcutService.resetThrottling(); + Toast.makeText(mContext, R.string.reset_shortcut_manager_throttling_complete, + Toast.LENGTH_SHORT).show(); + } catch (RemoteException e) { + Log.e(TAG, "Failed to reset rate limiting", e); + } + } + + private IShortcutService getShortCutService() { + try { + return IShortcutService.Stub.asInterface( + ServiceManager.getService(Context.SHORTCUT_SERVICE)); + } catch (VerifyError e) { + // Used for tests since Robolectric cannot initialize this class. + return null; + } + } +} diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java new file mode 100644 index 00000000000..0a189cb007b --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -0,0 +1,84 @@ +/* + * 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.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.pm.IShortcutService; +import android.os.RemoteException; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class ShortcutManagerThrottlingPreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + @Mock + private IShortcutService mShortcutService; + + private Context mContext; + private ShortcutManagerThrottlingPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new ShortcutManagerThrottlingPreferenceController(mContext); + ReflectionHelpers.setField(mController, "mShortcutService", mShortcutService); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( + mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void handlePreferenceTreeClick_differentPreferenceKey_shouldReturnFalse() { + when(mPreference.getKey()).thenReturn("SomeRandomKey"); + + assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse(); + } + + @Test + public void handlePreferenceTreeClick_correctPreferenceKey_shouldResetThrottling() + throws RemoteException { + when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); + + final boolean handled = mController.handlePreferenceTreeClick(mPreference); + + assertThat(handled).isTrue(); + verify(mShortcutService).resetThrottling(); + } +}