tree c27e0bb8aae8990e9e7228912b68354ad739774f
parent f993a291ce1f78ed8d1a10a601f4893fc2f14c30
parent db6f00a27df0ee761fcada622c023714736bb6ab
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1726640256 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1726640256 +0000

Merge "am:fix NPE and potential infinite loop problem." into main am: 9a998417ab am: db6f00a27d

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

Change-Id: I014b1e15131a7c4624db234660d4f606966f57ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>