commit 9e4c07a92f1c39a7e6d87f7d9451e6810ec87bfb
author shinwang <shinwang@google.com> Mon Dec 24 15:41:04 2018 +0800
committer Albal Tai <albaltai@google.com> Tue Dec 25 03:36:37 2018 +0000
tree 8aca4fb8dfb854db25fa02847c1487664b4a1ae9
parent dfefa44bdb0104e6f7e6b61e98cb9d07074ec63d

In java/java.go, enhance the checking logic for Dependency interface implementation

Add nil checking for Dependency interface implementation

Bug: 121985695

Test: 1. m aidegen
      2. $ANDROID_HOST_OUT/bin/aidegen framework
      3. check import static android.Manifest.permission.BIND_VOICE_INTERACTION;
	 denpendency should be resolved in frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: Ibac280ce3de2537f453c4ca7e8f79f55667f1fa0

java/java.go

diff --git a/java/java.go b/java/java.go
index 6eae05c..094fbff 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1427,6 +1427,9 @@
 }
 
 func (j *Module) ImplementationJars() android.Paths {
+	if j.implementationJarFile == nil {
+		return nil
+	}
 	return android.Paths{j.implementationJarFile}
 }
 
@@ -1809,6 +1812,9 @@
 }
 
 func (j *Import) ImplementationJars() android.Paths {
+	if j.combinedClasspathFile == nil {
+		return nil
+	}
 	return android.Paths{j.combinedClasspathFile}
 }