Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zekan Qian
2022-10-14 23:15:01 +00:00
committed by Android (Google) Code Review
parent b6e7ac6ea1 337c1a8c28
commit 5b0cabd95b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 @@ object SpaEnvironmentFactory {
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
}
}