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

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

Merge "profcollet: Fix possible NPE" am: b57c42cb am: 699159ee am: 76472b2e am: cbb8587c 

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

Change-Id: Ia7cabc6982e56ceb4fcbabdfcd3b2333c5ee02b9
parents e3894700 cbb8587c

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

+6 −5
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public final class ProfcollectForwardingService extends SystemService { 
        try {

            mIProfcollect.registerProviderStatusCallback(mProviderStatusCallback);

        } catch (RemoteException e) {

            Log.e(LOG_TAG, e.getMessage());

            Log.e(LOG_TAG, "Failed to register provider status callback: " + e.getMessage());

        }

    }
@@ -123,7 +123,7 @@ public final class ProfcollectForwardingService extends SystemService { 
        try {

            return !mIProfcollect.get_supported_provider().isEmpty();

        } catch (RemoteException e) {

            Log.e(LOG_TAG, e.getMessage());

            Log.e(LOG_TAG, "Failed to get supported provider: " + e.getMessage());

            return false;

        }

    }
@@ -219,7 +219,8 @@ public final class ProfcollectForwardingService extends SystemService { 
                        try {

                            sSelfService.mIProfcollect.process();

                        } catch (RemoteException e) {

                            Log.e(LOG_TAG, e.getMessage());

                            Log.e(LOG_TAG, "Failed to process profiles in background: "

                                    + e.getMessage());

                        }

                    });

            return true;
@@ -264,7 +265,7 @@ public final class ProfcollectForwardingService extends SystemService { 
                try {

                    mIProfcollect.trace_once("applaunch");

                } catch (RemoteException e) {

                    Log.e(LOG_TAG, e.getMessage());

                    Log.e(LOG_TAG, "Failed to initiate trace: " + e.getMessage());

                }

            });

        }
@@ -348,7 +349,7 @@ public final class ProfcollectForwardingService extends SystemService { 
                        .putExtra("filename", reportName);

                context.sendBroadcast(intent);

            } catch (RemoteException e) {

                Log.e(LOG_TAG, e.getMessage());

                Log.e(LOG_TAG, "Failed to upload report: " + e.getMessage());

            }

        });

    }