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

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

Change-Id: I8c669b7ca902c2c6d5f292d91172477d81a49b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hui Wu
2022-04-08 17:57:27 +00:00
committed by Automerger Merge Worker

View File

@@ -197,7 +197,9 @@ public class CloudSearchPerUserService extends
Slog.d(TAG, "onDestroyLocked(): requestId=" + requestId);
}
final CloudSearchCallbackInfo sessionInfo = mCallbackQueue.removeElement(requestId);
sessionInfo.destroy();
if (sessionInfo != null) {
sessionInfo.destroy();
}
}
@Override