[DO NOT MERGE] Remove the server side flag of clockface blacklist
Bug: 136090066
Test: atest com.android.keyguard.clock.ClockManagerTest
Change-Id: I7aa2c2deb690a3c8a5648754eeb6ae10ed0af0d8
Merged-In: I7aa2c2deb690a3c8a5648754eeb6ae10ed0af0d8
diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
index 6e97076..55e21a4 100644
--- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
+++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java
@@ -146,14 +146,6 @@
public static final String ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS =
"assist_handles_shown_frequency_threshold_ms";
- // Flag related to clock face
-
- /**
- * (String) Contains the clock plugin service names that are not allow to be shown.
- * Each service name is seperated by a comma(",") in the string.
- */
- public static final String CLOCK_FACE_BLACKLIST = "clock_face_blacklist";
-
/**
* (long) How long, in milliseconds, for teaching behaviors to wait before considering the user
* taught.
diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
index 9edb54c..9e2464e 100644
--- a/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
@@ -15,8 +15,6 @@
*/
package com.android.keyguard.clock;
-import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.CLOCK_FACE_BLACKLIST;
-
import android.annotation.Nullable;
import android.content.ContentResolver;
import android.content.Context;
@@ -26,12 +24,9 @@
import android.os.Handler;
import android.os.Looper;
import android.os.UserHandle;
-import android.provider.DeviceConfig;
import android.provider.Settings;
import android.util.ArrayMap;
-import android.util.ArraySet;
import android.util.DisplayMetrics;
-import android.util.Log;
import android.view.LayoutInflater;
import androidx.annotation.VisibleForTesting;
@@ -47,12 +42,10 @@
import com.android.systemui.util.InjectionInflationController;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Supplier;
-import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -74,8 +67,6 @@
private final Handler mMainHandler = new Handler(Looper.getMainLooper());
private final CurrentUserObservable mCurrentUserObservable;
- private final ArraySet<String> mBlacklistedClockPlugins = new ArraySet<>();
-
/**
* Observe settings changes to know when to switch the clock face.
*/
@@ -164,41 +155,6 @@
DisplayMetrics dm = res.getDisplayMetrics();
mWidth = dm.widthPixels;
mHeight = dm.heightPixels;
-
- updateBlackList();
- registerDeviceConfigListener();
- }
-
- private void updateBlackList() {
- String blacklist = getBlackListFromConfig();
-
- mBlacklistedClockPlugins.clear();
- if (blacklist != null && !blacklist.isEmpty()) {
- mBlacklistedClockPlugins.addAll(Arrays.asList(blacklist.split(",")));
- }
- }
-
- String getBlackListFromConfig() {
- return DeviceConfig.getString(
- DeviceConfig.NAMESPACE_SYSTEMUI, CLOCK_FACE_BLACKLIST, null);
- }
-
- private void registerDeviceConfigListener() {
- DeviceConfig.addOnPropertiesChangedListener(
- DeviceConfig.NAMESPACE_SYSTEMUI,
- r -> mMainHandler.post(r),
- properties -> onDeviceConfigPropertiesChanged(properties.getNamespace()));
- }
-
- void onDeviceConfigPropertiesChanged(String namespace) {
- if (!DeviceConfig.NAMESPACE_SYSTEMUI.equals(namespace)) {
- Log.e(TAG, "Received update from DeviceConfig for unrelated namespace: "
- + namespace);
- return;
- }
-
- updateBlackList();
- reload();
}
/**
@@ -350,12 +306,10 @@
}
/**
- * Get information about clock faces which are available and not in blacklist.
+ * Get information about available clock faces.
*/
List<ClockInfo> getInfo() {
- return mClockInfo.stream()
- .filter(info -> !mBlacklistedClockPlugins.contains(info.getId()))
- .collect(Collectors.toList());
+ return mClockInfo;
}
/**
@@ -407,7 +361,7 @@
if (ClockManager.this.isDocked()) {
final String name = mSettingsWrapper.getDockedClockFace(
mCurrentUserObservable.getCurrentUser().getValue());
- if (name != null && !mBlacklistedClockPlugins.contains(name)) {
+ if (name != null) {
plugin = mClocks.get(name);
if (plugin != null) {
return plugin;
@@ -416,7 +370,7 @@
}
final String name = mSettingsWrapper.getLockScreenCustomClockFace(
mCurrentUserObservable.getCurrentUser().getValue());
- if (name != null && !mBlacklistedClockPlugins.contains(name)) {
+ if (name != null) {
plugin = mClocks.get(name);
}
return plugin;
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/clock/ClockManagerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/clock/ClockManagerTest.java
index 6891f56..3330d1e 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/clock/ClockManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/keyguard/clock/ClockManagerTest.java
@@ -20,14 +20,12 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.database.ContentObserver;
import android.net.Uri;
-import android.provider.DeviceConfig;
import android.test.suitebuilder.annotation.SmallTest;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper.RunWithLooper;
@@ -52,8 +50,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import java.util.List;
-
@SmallTest
@RunWith(AndroidTestingRunner.class)
// Need to run tests on main looper because LiveData operations such as setData, observe,
@@ -67,7 +63,7 @@
private static final int SECONDARY_USER_ID = 11;
private static final Uri SETTINGS_URI = null;
- ClockManager mClockManager;
+ private ClockManager mClockManager;
private ContentObserver mContentObserver;
private DockManagerFake mFakeDockManager;
private MutableLiveData<Integer> mCurrentUser;
@@ -144,33 +140,6 @@
}
@Test
- public void getCurrentClock_inBlackList() {
- mClockManager = spy(mClockManager);
- // GIVEN that settings is set to the bubble clock face
- when(mMockSettingsWrapper.getLockScreenCustomClockFace(anyInt())).thenReturn(BUBBLE_CLOCK);
- // WHEN settings change event is fired
- mContentObserver.onChange(false, SETTINGS_URI, MAIN_USER_ID);
- // GIVEN that bubble clock is in blacklist
- when(mClockManager.getBlackListFromConfig()).thenReturn(BUBBLE_CLOCK);
- // WHEN device config change of systemui is fired
- mClockManager.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);
- // THEN the result is null, indicated the current clock should be reset to the default one.
- assertThat(mClockManager.getCurrentClock()).isNull();
- }
-
- @Test
- public void getClockInfo_inBlackList() {
- mClockManager = spy(mClockManager);
- // GIVEN that bubble clock is in blacklist
- when(mClockManager.getBlackListFromConfig()).thenReturn(BUBBLE_CLOCK);
- // WHEN device config change of systemui is fired
- mClockManager.onDeviceConfigPropertiesChanged(DeviceConfig.NAMESPACE_SYSTEMUI);
- // THEN the ClockInfo should not contain bubble clock
- List<ClockInfo> clocks = mClockManager.getClockInfos();
- assertThat(clocks.stream().anyMatch(info -> BUBBLE_CLOCK.equals(info.getId()))).isFalse();
- }
-
- @Test
public void onClockChanged_customClock() {
// GIVEN that settings is set to the bubble clock face
when(mMockSettingsWrapper.getLockScreenCustomClockFace(anyInt())).thenReturn(BUBBLE_CLOCK);