Snap for 6657150 from 05ae65b7b00e1abff004fef72927692282f74861 to rvc-release
Change-Id: I28fabafbaf44278aee895450ab934036f697c273
diff --git a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index 091ae32..10cab1c 100644
--- a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -27,7 +27,6 @@
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
@@ -45,7 +44,6 @@
@VisibleForTesting float mPeakRefreshRate;
private static final String TAG = "RefreshRatePrefCtr";
- private static final String KEY_PEAK_REFRESH_RATE_DEFAULT = "peak_refresh_rate_default";
private static final float INVALIDATE_REFRESH_RATE = -1f;
private final Handler mHandler;
@@ -59,7 +57,7 @@
public PeakRefreshRatePreferenceController(Context context, String key) {
super(context, key);
- mHandler = new Handler();
+ mHandler = new Handler(context.getMainLooper());
mDeviceConfigDisplaySettings = new DeviceConfigDisplaySettings();
mOnDeviceConfigChange =
new IDeviceConfigChange() {
diff --git a/src/com/android/settings/network/AllInOneTetherPreferenceController.java b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
index 8180d5a..75453b4 100644
--- a/src/com/android/settings/network/AllInOneTetherPreferenceController.java
+++ b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
@@ -37,6 +37,7 @@
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -94,6 +95,12 @@
}
@Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(mPreferenceKey);
+ }
+
+ @Override
public int getAvailabilityStatus() {
if (!TetherUtil.isTetherAvailable(mContext)
|| !FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)) {
diff --git a/src/com/android/settings/slices/SliceBackgroundWorker.java b/src/com/android/settings/slices/SliceBackgroundWorker.java
index 6eb154e..2b02999 100644
--- a/src/com/android/settings/slices/SliceBackgroundWorker.java
+++ b/src/com/android/settings/slices/SliceBackgroundWorker.java
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -190,7 +191,8 @@
private static NotifySliceChangeHandler sHandler;
- private final Map<Uri, Long> mLastUpdateTimeLookup = new ArrayMap<>();
+ private final Map<Uri, Long> mLastUpdateTimeLookup = Collections.synchronizedMap(
+ new ArrayMap<>());
private static NotifySliceChangeHandler getInstance() {
if (sHandler == null) {
diff --git a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
index 12e687d..f37b0e4 100644
--- a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
@@ -24,6 +24,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -35,6 +36,9 @@
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
import com.android.settings.R;
import com.android.settings.widget.MasterSwitchPreference;
@@ -109,13 +113,13 @@
});
}
- @Mock
private Context mContext;
@Mock
private BluetoothAdapter mBluetoothAdapter;
@Mock
private MasterSwitchPreference mPreference;
+ private static final String PREF_KEY = "tether";
private AllInOneTetherPreferenceController mController;
private final int mTetherState;
private final int mSummaryResId;
@@ -127,11 +131,16 @@
@Before
public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
MockitoAnnotations.initMocks(this);
mController = spy(AllInOneTetherPreferenceController.class);
ReflectionHelpers.setField(mController, "mContext", mContext);
ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
- ReflectionHelpers.setField(mController, "mPreference", mPreference);
+ ReflectionHelpers.setField(mController, "mPreferenceKey", PREF_KEY);
+ PreferenceScreen screen = mock(PreferenceScreen.class);
+ when(screen.findPreference(PREF_KEY)).thenReturn(mPreference);
+ doReturn(mController.AVAILABLE).when(mController).getAvailabilityStatus();
+ mController.displayPreference(screen);
}
@Test
@@ -169,5 +178,8 @@
public void getSummary_afterTetherStateChanged() {
mController.onTetherStateUpdated(mTetherState);
assertThat(mController.getSummary()).isEqualTo(mContext.getString(mSummaryResId));
+
+ verify(mController).updateState(mPreference);
+ verify(mPreference).setSummary(mContext.getString(mSummaryResId));
}
}