From 85982c798fc8eaf8cba7501c7f811ef9e7d711c3 Mon Sep 17 00:00:00 2001 From: yomna Date: Fri, 7 Jun 2024 17:55:46 +0000 Subject: [PATCH 1/3] Specify correct location for Controllers in cellular_security.xml Bug: b/343754459 Test: m & manual Flag: exempt bug fix Change-Id: I42238a0d978b60758ce783c2fe6959536cd60eaa --- res/xml/cellular_security.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/xml/cellular_security.xml b/res/xml/cellular_security.xml index 8e96bbd5b85..dde152db071 100644 --- a/res/xml/cellular_security.xml +++ b/res/xml/cellular_security.xml @@ -25,17 +25,17 @@ + settings:controller="com.android.settings.network.telephony.CellularSecurityNotificationsDividerController"> + "com.android.settings.network.telephony.CellularSecurityNotificationsPreferenceController"/> + settings:controller="com.android.settings.network.telephony.CellularSecurityEncryptionDividerController"> Date: Fri, 7 Jun 2024 19:22:24 +0000 Subject: [PATCH 2/3] Revert "Delete "background process limit" debug option" This reverts commit c163eb07cea8b414c74d0784b9979dfd65786857. Reason for revert: we did a 180 on MCP deprecation, see b/345628418 Change-Id: I2bd2dd7b8fa5275fa81f75d47919ac70d721cd72 --- res/xml/development_settings.xml | 6 + ...roundProcessLimitPreferenceController.java | 104 ++++++++++++++ .../DevelopmentSettingsDashboardFragment.java | 1 + ...dProcessLimitPreferenceControllerTest.java | 132 ++++++++++++++++++ 4 files changed, 243 insertions(+) create mode 100644 src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 227f72dc720..866a529dd8b 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -675,6 +675,12 @@ android:title="@string/immediately_destroy_activities" android:summary="@string/immediately_destroy_activities_summary" /> + + = limit) { + index = i; + break; + } + } + final ListPreference listPreference = (ListPreference) mPreference; + listPreference.setValue(mListValues[index]); + listPreference.setSummary(mListSummaries[index]); + } catch (RemoteException e) { + // intentional no-op + } + } + + private void writeAppProcessLimitOptions(Object newValue) { + try { + final int limit = newValue != null ? Integer.parseInt(newValue.toString()) : -1; + getActivityManagerService().setProcessLimit(limit); + updateAppProcessLimitOptions(); + } catch (RemoteException e) { + // intentional no-op + } + } + + @VisibleForTesting + IActivityManager getActivityManagerService() { + return ActivityManager.getService(); + } +} diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index dd9a1f05f25..65a23eb399f 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -740,6 +740,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new StrictModePreferenceController(context)); controllers.add(new ProfileGpuRenderingPreferenceController(context)); controllers.add(new KeepActivitiesPreferenceController(context)); + controllers.add(new BackgroundProcessLimitPreferenceController(context)); controllers.add(new CachedAppsFreezerPreferenceController(context)); controllers.add(new ShowFirstCrashDialogPreferenceController(context)); controllers.add(new AppsNotRespondingPreferenceController(context)); diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java new file mode 100644 index 00000000000..d51547ebaac --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -0,0 +1,132 @@ +/* + * 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 org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.IActivityManager; +import android.content.Context; +import android.os.RemoteException; + +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class BackgroundProcessLimitPreferenceControllerTest { + + @Mock + private IActivityManager mActivityManager; + @Mock + private ListPreference mPreference; + @Mock + private PreferenceScreen mScreen; + + /** + * 0: Standard limit + * 1: No Background processes + * 2: At most 1 process + * 3: At most 2 processes + * 4: At most 3 processes + * 5: At most 4 processes + */ + private String[] mListValues; + private String[] mListSummaries; + private Context mContext; + private BackgroundProcessLimitPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mListValues = mContext.getResources() + .getStringArray(com.android.settingslib.R.array.app_process_limit_values); + mListSummaries = mContext.getResources() + .getStringArray(com.android.settingslib.R.array.app_process_limit_entries); + mController = spy(new BackgroundProcessLimitPreferenceController(mContext)); + doReturn(mActivityManager).when(mController).getActivityManagerService(); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @Test + public void onPreferenceChange_noBackgroundProcessSet_shouldSetToNoBackgroundProcess() + throws RemoteException { + mController.onPreferenceChange(mPreference, mListValues[1]); + + verify(mActivityManager).setProcessLimit(Integer.valueOf(mListValues[1])); + } + + @Test + public void onPreferenceChange_1ProcessSet_shouldSetTo1BackgroundProcess() + throws RemoteException { + mController.onPreferenceChange(mPreference, mListValues[2]); + + verify(mActivityManager).setProcessLimit(Integer.valueOf(mListValues[2])); + } + + @Test + public void updateState_noBackgroundProcessSet_shouldSetPreferenceToNoBackgroundProcess() + throws RemoteException { + when(mActivityManager.getProcessLimit()).thenReturn(Integer.valueOf(mListValues[1])); + + mController.updateState(mPreference); + + verify(mPreference).setValue(mListValues[1]); + verify(mPreference).setSummary(mListSummaries[1]); + } + + @Test + public void updateState_1ProcessSet_shouldSetPreference1BackgroundProcess() + throws RemoteException { + when(mActivityManager.getProcessLimit()).thenReturn(Integer.valueOf(mListValues[2])); + + mController.updateState(mPreference); + + verify(mPreference).setValue(mListValues[2]); + verify(mPreference).setSummary(mListSummaries[2]); + } + + @Test + public void updateState_veryHighLimit_shouldDefaultToStandardLimit() throws RemoteException { + when(mActivityManager.getProcessLimit()).thenReturn(Integer.MAX_VALUE); + + mController.updateState(mPreference); + + verify(mPreference).setValue(mListValues[0]); + verify(mPreference).setSummary(mListSummaries[0]); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisableAndResetPreference() + throws RemoteException { + mController.onDeveloperOptionsSwitchDisabled(); + + verify(mPreference).setEnabled(false); + verify(mActivityManager).setProcessLimit(-1); + } +} From 8298c15f53fa03255b10aa09332da6a37c416aa3 Mon Sep 17 00:00:00 2001 From: josephpv Date: Mon, 10 Jun 2024 05:08:47 +0000 Subject: [PATCH 3/3] Remove animation from private space settings page Screenshot : go/ss/5HeSbdABvUX3iw8.png Bug: 337866252 Test: Manual Change-Id: If54ff5f2e309b9ac4dd83ff3bbf53812031732c6 --- res/xml/private_space_settings.xml | 12 +++--------- .../privatespace/PrivateSpaceDashboardFragment.java | 10 ---------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/res/xml/private_space_settings.xml b/res/xml/private_space_settings.xml index eb89dd783cd..53bbc5727d4 100644 --- a/res/xml/private_space_settings.xml +++ b/res/xml/private_space_settings.xml @@ -22,16 +22,10 @@ android:title="@string/private_space_title" settings:searchable="false"> - - - + android:title="@string/private_space_description" + settings:searchable="false"/> diff --git a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java index ed70030c314..906b01b15d4 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java +++ b/src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java @@ -26,12 +26,10 @@ import android.widget.Toast; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; -import com.android.settingslib.widget.IllustrationPreference; /** Fragment representing the Private Space dashboard in Settings. */ public class PrivateSpaceDashboardFragment extends DashboardFragment { private static final String TAG = "PSDashboardFragment"; - private static final String PRIVATE_SPACE_ILLUSTRATION_KEY = "private_space_illustration"; @Override public void onCreate(Bundle icicle) { @@ -63,14 +61,6 @@ public class PrivateSpaceDashboardFragment extends DashboardFragment { } } - @Override - public void onResume() { - super.onResume(); - final IllustrationPreference illustrationPreference = - getPreferenceScreen().findPreference(PRIVATE_SPACE_ILLUSTRATION_KEY); - illustrationPreference.applyDynamicColor(); - } - @Override protected int getPreferenceScreenResId() { return R.xml.private_space_settings;