summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peiyong Lin <lpy@google.com> 2020-12-15 20:10:47 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-12-15 20:10:47 +0000
commit393215e245903242c7f08228a99fe1415d816511 (patch)
tree5df7b26a0e6ffa95d7661ded0e87756707a817e7
parent3a76c4c9aaf799b559ebff5be64a18866fc2dcfb (diff)
parent3cb225dc74b9f0faf0858fd4602ceaadb3e9d30c (diff)
Merge "[GraphicsEnvironment] Avoid null access."
-rw-r--r--core/java/android/os/GraphicsEnvironment.java1
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);