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

Commit 9b7da727 authored by Matthew Sedam's avatar Matthew Sedam
Browse files

Fix null exception in ContextHubService.java 

Bug: 353841377
Change-Id: I92bfc94effa853cf943dde5c3b5bd2ac7d4ecb56
Flag: EXEMPT bugfix
Test: Presubmits
parent 40e2250f

services/core/java/com/android/server/location/contexthub/ContextHubService.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -333,8 +333,14 @@ public class ContextHubService extends IContextHubService.Stub { 
        return new IContextHubClientCallback.Stub() {

        return new IContextHubClientCallback.Stub() {

            private void finishCallback() {

            private void finishCallback() {

                try {

                try {

                    if (mDefaultClientMap != null && mDefaultClientMap.containsKey(contextHubId)) {

                        IContextHubClient client = mDefaultClientMap.get(contextHubId);

                        IContextHubClient client = mDefaultClientMap.get(contextHubId);

                        client.callbackFinished();

                        client.callbackFinished();

                    } else {

                        Log.e(TAG, "Default client not found for hub (ID = " + contextHubId + "): "

                                + mDefaultClientMap == null ? "map was null"

                                                            : "map did not contain the hub");

                    }

                } catch (RemoteException e) {

                } catch (RemoteException e) {

                    Log.e(

                    Log.e(

                            TAG,

                            TAG,