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

Commit c4c9f3a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "profcollect: Guard binder calls with null checks" into main am: d12ae130 am: 5240818b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3189973



Change-Id: I7fa0761f56396e9c05e18450b635c0d89b62e38b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74122663 5240818b

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -354,6 +354,9 @@ public final class ProfcollectForwardingService extends SystemService { 




    private static void createAndUploadReport(ProfcollectForwardingService pfs) {

    private static void createAndUploadReport(ProfcollectForwardingService pfs) {

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

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

            if (pfs.mIProfcollect == null) {

                return;

            }

            String reportName;

            String reportName;

            try {

            try {

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

                reportName = pfs.mIProfcollect.report(pfs.mUsageSetting) + ".zip";
@@ -401,6 +404,9 @@ public final class ProfcollectForwardingService extends SystemService { 
                final int traceDuration = 5000;

                final int traceDuration = 5000;

                final String traceTag = "camera";

                final String traceTag = "camera";

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

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

                    if (mIProfcollect == null) {

                        return;

                    }

                    try {

                    try {

                        mIProfcollect.trace_process(traceTag, "android.hardware.camera.provider",

                        mIProfcollect.trace_process(traceTag, "android.hardware.camera.provider",

                                traceDuration);

                                traceDuration);