commit 04a2693407110815a43999abb9954d343975a686
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 23 03:53:18 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 23 03:53:18 2021 +0000
tree f69b2134c33aa7bad041c3c8afe7aaf64cc06bf1
parent 4a1d451405b427e1001f4f7630d126b23f94d76a
parent 0c4eec85fa14ca43a4dd64da8871551f5e96f4cf

Merge "Fix default value of BoardSepolicyVers"

android/config.go

diff --git a/android/config.go b/android/config.go
index 19706f5..0de8928 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1389,7 +1389,10 @@
 }
 
 func (c *deviceConfig) BoardSepolicyVers() string {
-	return String(c.config.productVariables.BoardSepolicyVers)
+	if ver := String(c.config.productVariables.BoardSepolicyVers); ver != "" {
+		return ver
+	}
+	return c.PlatformSepolicyVersion()
 }
 
 func (c *deviceConfig) BoardReqdMaskPolicy() []string {