Merge "[GraphicsEnvironment] Avoid null access." into rvc-qpr-dev

lpy · Android (Google) Code Review · commit 23ace73ac413 · 2020-12-15T19:02:54.000Z
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java
@@ -248,6 +248,7 @@ private static String getDebugLayerAppPaths(IPackageManager pm, String packageNa
         }
         if (appInfo == null) {
             Log.w(TAG, "Debug layer app '" + packageName + "' not installed");
+            return "";
         }
 
         final String abi = chooseAbi(appInfo);

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ private static String getDebugLayerAppPaths(IPackageManager pm, String packageNa`
`248`	`248`	`}`
`249`	`249`	`if (appInfo == null) {`
`250`	`250`	`Log.w(TAG, "Debug layer app '" + packageName + "' not installed");`
	`251`	`+ return "";`
`251`	`252`	`}`
`252`	`253`
`253`	`254`	`final String abi = chooseAbi(appInfo);`