diff options
| author | Peiyong Lin <lpy@google.com> | 2020-12-15 20:38:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-15 20:38:00 +0000 |
| commit | 181ff65039995ce09fc3caec2de1c3ec5e2916fe (patch) | |
| tree | 5df7b26a0e6ffa95d7661ded0e87756707a817e7 /core/java/android | |
| parent | 7a0acb4d348de40e1019be9661ffe023f15e6b3d (diff) | |
| parent | 393215e245903242c7f08228a99fe1415d816511 (diff) | |
Merge "[GraphicsEnvironment] Avoid null access." am: 393215e245
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530839
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5af8bb8a0d5f1b6d4bb9b26e8e049720135b5109
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/GraphicsEnvironment.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index df1f1b21eba3..e77b163743fe 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -249,6 +249,7 @@ public class GraphicsEnvironment { } if (appInfo == null) { Log.w(TAG, "Debug layer app '" + packageName + "' not installed"); + return ""; } final String abi = chooseAbi(appInfo); |