55c8c9b86c
This change updates the Memory use UI in developer settings to hide
memory fields by default if the AppProfiler PSS deprecation flag is
enabled. A toggle is provided to resume PSS profiling and reinstate the
memory fields, and shows a dialog to reboot if the toggle is updated.
The summary for the "Memory" button in developer settings will show
"Memory profiling disabled" instead of "Avg X GB of Y memory used" if
PSS profiling is not enabled.
Test: With the flag enabled, flash and verify that:
- The memory fields are hidden by default, and the summary shows
the expected "Memory profiling disabled" text
- Clicking the toggle shows the reboot dialog, which will
correctly change the setting and reboot if accepted, and keep
the setting and not reboot if denied
- Check that AppProfiler correctly profiles PSS or RSS based on
the state of the toggle, which persists across reboots
- Included UI test for Memory page elements based on flag value.
Bug: 296454553
Change-Id: Ie21791502445a321446cb8110e5800089f47ac58
90 lines
3.3 KiB
Java
90 lines
3.3 KiB
Java
/*
|
|
* 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.os.Flags;
|
|
import android.provider.Settings;
|
|
import android.text.format.Formatter;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
import androidx.preference.Preference;
|
|
import androidx.preference.PreferenceScreen;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.applications.ProcStatsData;
|
|
import com.android.settings.applications.ProcessStatsBase;
|
|
import com.android.settings.core.PreferenceControllerMixin;
|
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
|
import com.android.settingslib.utils.ThreadUtils;
|
|
|
|
public class MemoryUsagePreferenceController extends DeveloperOptionsPreferenceController implements
|
|
PreferenceControllerMixin {
|
|
|
|
private static final String MEMORY_USAGE_KEY = "memory";
|
|
|
|
private ProcStatsData mProcStatsData;
|
|
|
|
public MemoryUsagePreferenceController(Context context) {
|
|
super(context);
|
|
}
|
|
|
|
@Override
|
|
public String getPreferenceKey() {
|
|
return MEMORY_USAGE_KEY;
|
|
}
|
|
|
|
@Override
|
|
public void displayPreference(PreferenceScreen screen) {
|
|
super.displayPreference(screen);
|
|
|
|
mProcStatsData = getProcStatsData();
|
|
setDuration();
|
|
}
|
|
|
|
@Override
|
|
public void updateState(Preference preference) {
|
|
// This is posted on the background thread to speed up fragment launch time for dev options
|
|
// mProcStasData.refreshStats(true) takes ~20ms to run.
|
|
ThreadUtils.postOnBackgroundThread(() -> {
|
|
mProcStatsData.refreshStats(true);
|
|
final ProcStatsData.MemInfo memInfo = mProcStatsData.getMemInfo();
|
|
final String usedResult = Formatter.formatShortFileSize(mContext,
|
|
(long) memInfo.realUsedRam);
|
|
final String totalResult = Formatter.formatShortFileSize(mContext,
|
|
(long) memInfo.realTotalRam);
|
|
boolean displayMemorySummary = !Flags.removeAppProfilerPssCollection();
|
|
displayMemorySummary |= Settings.Global.getInt(mContext.getContentResolver(),
|
|
Settings.Global.FORCE_ENABLE_PSS_PROFILING, 0) == 1;
|
|
String summary = displayMemorySummary
|
|
? mContext.getString(R.string.memory_summary, usedResult, totalResult)
|
|
: mContext.getString(R.string.pss_profiling_disabled);
|
|
ThreadUtils.postOnMainThread(() -> mPreference.setSummary(summary));
|
|
});
|
|
}
|
|
|
|
@VisibleForTesting
|
|
void setDuration() {
|
|
mProcStatsData.setDuration(ProcessStatsBase.sDurations[0] /* 3 hours */);
|
|
}
|
|
|
|
@VisibleForTesting
|
|
ProcStatsData getProcStatsData() {
|
|
return new ProcStatsData(mContext, false);
|
|
}
|
|
}
|