commit 337c1a8c28e7eb9b3b1fee2f1c9b82c595c39cf5
author Zekan Qian <pierreqian@google.com> Fri Oct 14 15:45:14 2022 +0800
committer Zekan Qian <pierreqian@google.com> Fri Oct 14 16:24:37 2022 +0800
tree 0c97896f36f307d087910b8a810e7bcd7b6c32aa
parent 5e8d4040e18710042c78cfc687366c074eebf7de

Do not throw exception when Spa environment is set, ignore the latter one.

Bug: 252671269
Test: m RunSettingsRoboTests
Change-Id: Ibf2721e2bb8d94a50f79e1d86d28490f298d0aad

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt

diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
index 3885025..f762f6e 100644
--- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
+++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/common/SpaEnvironment.kt
@@ -17,6 +17,9 @@
 package com.android.settingslib.spa.framework.common
 
 import android.app.Activity
+import android.util.Log
+
+private const val TAG = "SpaEnvironment"
 
 object SpaEnvironmentFactory {
     private var spaEnvironment: SpaEnvironment? = null
@@ -28,8 +31,10 @@
             return spaEnvironment!!
         }
         set(env: SpaEnvironment) {
-            if (spaEnvironment != null)
-                throw UnsupportedOperationException("Spa environment is already set")
+            if (spaEnvironment != null) {
+                Log.w(TAG, "Spa environment is already set, ignore the latter one.")
+                return
+            }
             spaEnvironment = env
         }
 }