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

Commit ca53bda6 authored by Matthew Sedam's avatar Matthew Sedam Committed by Android (Google) Code Review
Browse files

Merge "Fix null exception in ContextHubService.java" into main

parents 41a04c24 9b7da727

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

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

            private void finishCallback() {

                try {

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

                        IContextHubClient client = mDefaultClientMap.get(contextHubId);

                        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) {

                    Log.e(

                            TAG,