summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrey Epin <ayepin@google.com> 2022-12-20 10:17:36 -0800
committer Andrey Epin <ayepin@google.com> 2023-01-27 15:46:31 -0800
commit33bb96bf4da9ad037d1184c644fd9c26db569ded (patch)
tree83e6eede497737cee942c40f4376b38156bb0eeb
parent9719ba1fde7db0e507208bb88a2626eed16a72ce (diff)
Feature flags support in Chooser
A minimalistic replica of the SysUI feature flag infrastructure so the app could both reuse some of the existing flag infrastructure (local flag flipping) and have features controlled remotely (through DeviceConfig). Bug: 262578843 Test: Manual tests with some injected debug code and local flag flipping Change-Id: If4be0cfce17e98b978966ea5172f85c5d406f833
-rw-r--r--Android.bp24
-rw-r--r--java/src-debug/com/android/intentresolver/flags/DebugFeatureFlagRepository.kt85
-rw-r--r--java/src-debug/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt30
-rw-r--r--java/src-release/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt24
-rw-r--r--java/src-release/com/android/intentresolver/flags/ReleaseFeatureFlagRepository.kt31
-rw-r--r--java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt28
-rw-r--r--java/src/com/android/intentresolver/flags/FeatureFlagRepository.kt25
-rw-r--r--java/src/com/android/intentresolver/flags/Flags.kt28
8 files changed, 274 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 31d7d6d0..19d2a825 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,13 +31,34 @@ license {
],
}
+filegroup {
+ name: "ReleaseSources",
+ srcs: [
+ "java/src-release/**/*.kt",
+ ],
+}
+
+filegroup {
+ name: "DebugSources",
+ srcs: [
+ "java/src-debug/**/*.kt",
+ ],
+}
+
android_library {
name: "IntentResolver-core",
min_sdk_version: "current",
srcs: [
"java/src/**/*.java",
"java/src/**/*.kt",
+ ":ReleaseSources",
],
+ product_variables: {
+ debuggable: {
+ srcs: [":DebugSources"],
+ exclude_srcs: [":ReleaseSources"],
+ }
+ },
resource_dirs: [
"java/res",
],
@@ -58,11 +79,12 @@ android_library {
"kotlinx-coroutines-android",
"//external/kotlinc:kotlin-annotations",
"guava",
+ "SystemUIFlagsLib",
],
plugins: ["java_api_finder"],
lint: {
- strict_updatability_linting: true,
+ strict_updatability_linting: false,
},
}
diff --git a/java/src-debug/com/android/intentresolver/flags/DebugFeatureFlagRepository.kt b/java/src-debug/com/android/intentresolver/flags/DebugFeatureFlagRepository.kt
new file mode 100644
index 00000000..a85e0971
--- /dev/null
+++ b/java/src-debug/com/android/intentresolver/flags/DebugFeatureFlagRepository.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import android.util.SparseBooleanArray
+import androidx.annotation.GuardedBy
+import com.android.systemui.flags.BooleanFlag
+import com.android.systemui.flags.FlagManager
+import com.android.systemui.flags.ReleasedFlag
+import com.android.systemui.flags.UnreleasedFlag
+import javax.annotation.concurrent.ThreadSafe
+
+@ThreadSafe
+internal class DebugFeatureFlagRepository(
+ private val flagManager: FlagManager,
+ private val deviceConfig: DeviceConfigProxy,
+) : FeatureFlagRepository {
+ @GuardedBy("self")
+ private val cache = SparseBooleanArray()
+
+ override fun isEnabled(flag: UnreleasedFlag): Boolean = isFlagEnabled(flag)
+
+ override fun isEnabled(flag: ReleasedFlag): Boolean = isFlagEnabled(flag)
+
+ private fun isFlagEnabled(flag: BooleanFlag): Boolean {
+ synchronized(cache) {
+ val idx = cache.indexOfKey(flag.id)
+ if (idx >= 0) return cache.valueAt(idx)
+ }
+ val flagValue = readFlagValue(flag)
+ synchronized(cache) {
+ val idx = cache.indexOfKey(flag.id)
+ // the first read saved in the cache wins
+ if (idx >= 0) return cache.valueAt(idx)
+ cache.put(flag.id, flagValue)
+ }
+ return flagValue
+ }
+
+ private fun readFlagValue(flag: BooleanFlag): Boolean {
+ val localOverride = runCatching {
+ flagManager.isEnabled(flag.id)
+ }.getOrDefault(null)
+ val remoteOverride = deviceConfig.isEnabled(flag)
+
+ // Only check for teamfood if the default is false
+ // and there is no server override.
+ if (remoteOverride == null
+ && !flag.default
+ && localOverride == null
+ && !flag.isTeamfoodFlag
+ && flag.teamfood
+ ) {
+ return flagManager.isTeamfoodEnabled
+ }
+ return localOverride ?: remoteOverride ?: flag.default
+ }
+
+ companion object {
+ // keep in sync with com.android.systemui.flags.Flags
+ private const val TEAMFOOD_FLAG_ID = 1
+
+ private val BooleanFlag.isTeamfoodFlag: Boolean
+ get() = id == TEAMFOOD_FLAG_ID
+
+ private val FlagManager.isTeamfoodEnabled: Boolean
+ get() = runCatching {
+ isEnabled(TEAMFOOD_FLAG_ID) ?: false
+ }.getOrDefault(false)
+ }
+}
diff --git a/java/src-debug/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt b/java/src-debug/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt
new file mode 100644
index 00000000..4ddb0447
--- /dev/null
+++ b/java/src-debug/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import com.android.systemui.flags.FlagManager
+
+class FeatureFlagRepositoryFactory {
+ fun create(context: Context): FeatureFlagRepository =
+ DebugFeatureFlagRepository(
+ FlagManager(context, Handler(Looper.getMainLooper())),
+ DeviceConfigProxy(),
+ )
+}
diff --git a/java/src-release/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt b/java/src-release/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt
new file mode 100644
index 00000000..6bf7579e
--- /dev/null
+++ b/java/src-release/com/android/intentresolver/flags/FeatureFlagRepositoryFactory.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import android.content.Context
+
+class FeatureFlagRepositoryFactory {
+ fun create(context: Context): FeatureFlagRepository =
+ ReleaseFeatureFlagRepository(DeviceConfigProxy())
+}
diff --git a/java/src-release/com/android/intentresolver/flags/ReleaseFeatureFlagRepository.kt b/java/src-release/com/android/intentresolver/flags/ReleaseFeatureFlagRepository.kt
new file mode 100644
index 00000000..a513e46f
--- /dev/null
+++ b/java/src-release/com/android/intentresolver/flags/ReleaseFeatureFlagRepository.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import com.android.systemui.flags.ReleasedFlag
+import com.android.systemui.flags.UnreleasedFlag
+import javax.annotation.concurrent.ThreadSafe
+
+@ThreadSafe
+internal class ReleaseFeatureFlagRepository(
+ private val deviceConfig: DeviceConfigProxy,
+) : FeatureFlagRepository {
+ override fun isEnabled(flag: UnreleasedFlag): Boolean = flag.default
+
+ override fun isEnabled(flag: ReleasedFlag): Boolean =
+ deviceConfig.isEnabled(flag.namespace, flag.name) ?: flag.default
+}
diff --git a/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt b/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt
new file mode 100644
index 00000000..e23616f2
--- /dev/null
+++ b/java/src/com/android/intentresolver/flags/DeviceConfigProxy.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import android.provider.DeviceConfig
+import com.android.systemui.flags.BooleanFlag
+
+internal class DeviceConfigProxy {
+ fun isEnabled(flag: BooleanFlag): Boolean? {
+ return runCatching {
+ DeviceConfig.getBoolean(flag.namespace, flag.name, flag.default)
+ }.getOrDefault(null)
+ }
+}
diff --git a/java/src/com/android/intentresolver/flags/FeatureFlagRepository.kt b/java/src/com/android/intentresolver/flags/FeatureFlagRepository.kt
new file mode 100644
index 00000000..5b5d769c
--- /dev/null
+++ b/java/src/com/android/intentresolver/flags/FeatureFlagRepository.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import com.android.systemui.flags.ReleasedFlag
+import com.android.systemui.flags.UnreleasedFlag
+
+interface FeatureFlagRepository {
+ fun isEnabled(flag: UnreleasedFlag): Boolean
+ fun isEnabled(flag: ReleasedFlag): Boolean
+}
diff --git a/java/src/com/android/intentresolver/flags/Flags.kt b/java/src/com/android/intentresolver/flags/Flags.kt
new file mode 100644
index 00000000..7c23f7de
--- /dev/null
+++ b/java/src/com/android/intentresolver/flags/Flags.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.flags
+
+import com.android.systemui.flags.UnreleasedFlag
+
+// keep in sync with com.android.systemui.flags.Flags to make the flags available in the
+// flag flipper app (see go/sysui-flags)
+object Flags {
+ @JvmField
+ val CHOOSER_CUSTOM_ACTIONS = UnreleasedFlag(
+ id = 1501, name = "chooser_custom_actions", namespace = "systemui", teamfood = false
+ )
+}