Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ProfcollectForwardingService: Pass usage setting when reporting" into udc-dev am: 57145b116b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23181876

Change-Id: Ibccd29b99ad9c69c5ee7d0748cfff89cb50851b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yabin Cui
2023-05-12 21:48:29 +00:00
committed by Automerger Merge Worker
parent 25fe9840ec 57145b116b
commit 0587a9e009
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java
View File

@@ -34,6 +34,8 @@ import android.os.SystemProperties;
import android.os.UpdateEngine;
import android.os.UpdateEngineCallback;
import android.provider.DeviceConfig;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.util.Log;
import com.android.internal.R;
@@ -332,8 +334,17 @@ public final class ProfcollectForwardingService extends SystemService {
Context context = getContext();
BackgroundThread.get().getThreadHandler().post(() -> {
try {
int usageSetting = -1;
try {
// Get "Usage & diagnostics" checkbox status. 1 is for enabled, 0 is for
// disabled.
usageSetting = Settings.Global.getInt(context.getContentResolver(), "multi_cb");
} catch (SettingNotFoundException e) {
Log.i(LOG_TAG, "Usage setting not found: " + e.getMessage());
}
// Prepare profile report
String reportName = mIProfcollect.report() + ".zip";
String reportName = mIProfcollect.report(usageSetting) + ".zip";
if (!context.getResources().getBoolean(
R.bool.config_profcollectReportUploaderEnabled)) {