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

Commit b3ec9ef5 authored by Hui Wu's avatar Hui Wu Committed by Automerger Merge Worker
Browse files

Merge "handle java.lang.NullPointerException" into tm-dev am: 56480c4b 

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



Change-Id: I8e8e80d4bb05526f820f1e49742b32ea9dba7c8d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7889aa0c 56480c4b

services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java

+3 −1
Original line number Diff line number Diff line
@@ -197,8 +197,10 @@ public class CloudSearchPerUserService extends 
            Slog.d(TAG, "onDestroyLocked(): requestId=" + requestId);

        }

        final CloudSearchCallbackInfo sessionInfo = mCallbackQueue.removeElement(requestId);

        if (sessionInfo != null) {

            sessionInfo.destroy();

        }

    }



    @Override

    public void onFailureOrTimeout(boolean timedOut) {