Merge "Delete "background process limit" debug option" into main
This commit is contained in:
Treehugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
39e9aede9a
@@ -675,12 +675,6 @@
|
|||||||
android:title="@string/immediately_destroy_activities"
|
android:title="@string/immediately_destroy_activities"
|
||||||
android:summary="@string/immediately_destroy_activities_summary" />
|
android:summary="@string/immediately_destroy_activities_summary" />
|
||||||
|
|
||||||
<ListPreference
|
|
||||||
android:key="app_process_limit"
|
|
||||||
android:title="@string/app_process_limit_title"
|
|
||||||
android:entries="@array/app_process_limit_entries"
|
|
||||||
android:entryValues="@array/app_process_limit_values" />
|
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="background_check"
|
android:key="background_check"
|
||||||
android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
|
android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
|
||||||
|
|||||||
@@ -1,104 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.app.ActivityManager;
|
|
||||||
import android.app.IActivityManager;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.os.RemoteException;
|
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
|
||||||
import androidx.preference.ListPreference;
|
|
||||||
import androidx.preference.Preference;
|
|
||||||
|
|
||||||
import com.android.settings.core.PreferenceControllerMixin;
|
|
||||||
import com.android.settingslib.R;
|
|
||||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
|
||||||
|
|
||||||
public class BackgroundProcessLimitPreferenceController extends
|
|
||||||
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
|
|
||||||
PreferenceControllerMixin {
|
|
||||||
|
|
||||||
private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
|
|
||||||
|
|
||||||
private final String[] mListValues;
|
|
||||||
private final String[] mListSummaries;
|
|
||||||
|
|
||||||
public BackgroundProcessLimitPreferenceController(Context context) {
|
|
||||||
super(context);
|
|
||||||
|
|
||||||
mListValues = context.getResources().getStringArray(R.array.app_process_limit_values);
|
|
||||||
mListSummaries = context.getResources().getStringArray(R.array.app_process_limit_entries);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPreferenceKey() {
|
|
||||||
return APP_PROCESS_LIMIT_KEY;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
||||||
writeAppProcessLimitOptions(newValue);
|
|
||||||
updateAppProcessLimitOptions();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateState(Preference preference) {
|
|
||||||
updateAppProcessLimitOptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void onDeveloperOptionsSwitchDisabled() {
|
|
||||||
super.onDeveloperOptionsSwitchDisabled();
|
|
||||||
writeAppProcessLimitOptions(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateAppProcessLimitOptions() {
|
|
||||||
try {
|
|
||||||
final int limit = getActivityManagerService().getProcessLimit();
|
|
||||||
int index = 0; // default
|
|
||||||
for (int i = 0; i < mListValues.length; i++) {
|
|
||||||
int val = Integer.parseInt(mListValues[i]);
|
|
||||||
if (val >= 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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -740,7 +740,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new StrictModePreferenceController(context));
|
controllers.add(new StrictModePreferenceController(context));
|
||||||
controllers.add(new ProfileGpuRenderingPreferenceController(context));
|
controllers.add(new ProfileGpuRenderingPreferenceController(context));
|
||||||
controllers.add(new KeepActivitiesPreferenceController(context));
|
controllers.add(new KeepActivitiesPreferenceController(context));
|
||||||
controllers.add(new BackgroundProcessLimitPreferenceController(context));
|
|
||||||
controllers.add(new CachedAppsFreezerPreferenceController(context));
|
controllers.add(new CachedAppsFreezerPreferenceController(context));
|
||||||
controllers.add(new ShowFirstCrashDialogPreferenceController(context));
|
controllers.add(new ShowFirstCrashDialogPreferenceController(context));
|
||||||
controllers.add(new AppsNotRespondingPreferenceController(context));
|
controllers.add(new AppsNotRespondingPreferenceController(context));
|
||||||
|
|||||||
@@ -1,132 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user