Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a78ab819 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27519523'] into 24Q3-release. 

Change-Id: I58d31ebbce585b2944c11c229bf14928ac6d0874
parents 22b0a10b 682f24d2

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+11 −11
Original line number Original line Diff line number Diff line
@@ -370,6 +370,7 @@ public final class ProfcollectForwardingService extends SystemService { 
    }

    }





    private static void createAndUploadReport(ProfcollectForwardingService pfs) {

    private static void createAndUploadReport(ProfcollectForwardingService pfs) {

        BackgroundThread.get().getThreadHandler().post(() -> {

            String reportName;

            String reportName;

            try {

            try {

                reportName = pfs.mIProfcollect.report(pfs.mUsageSetting) + ".zip";

                reportName = pfs.mIProfcollect.report(pfs.mUsageSetting) + ".zip";
@@ -381,7 +382,6 @@ public final class ProfcollectForwardingService extends SystemService { 
                Log.i(LOG_TAG, "Upload is not enabled.");

                Log.i(LOG_TAG, "Upload is not enabled.");

                return;

                return;

            }

            }

        BackgroundThread.get().getThreadHandler().post(() -> {

            Intent intent = new Intent()

            Intent intent = new Intent()

                    .setPackage("com.android.shell")

                    .setPackage("com.android.shell")

                    .setAction("com.android.shell.action.PROFCOLLECT_UPLOAD")

                    .setAction("com.android.shell.action.PROFCOLLECT_UPLOAD")