From bc4b584446e43b03647569a9f21460561582584a Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Thu, 26 Jul 2018 12:06:48 -0700 Subject: [PATCH 1/5] Add a boolean flag to show or hide Private DNS in Network & internet. The following boolean flag is added: config_show_private_dns_settings When set to false, Private DNS will not be shown in Network & internet. Bug: 111398942 Test: make RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest Change-Id: I62911930680355b7fc109b295d8526bdb7eac0b3 --- res/values/bools.xml | 3 +++ .../network/PrivateDnsPreferenceController.java | 4 +++- tests/robotests/res/values-mcc999/config.xml | 1 + .../PrivateDnsPreferenceControllerTest.java | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/res/values/bools.xml b/res/values/bools.xml index b4066059aa8..ef8c5b61383 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -57,6 +57,9 @@ true + + true + false diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index ce3a9c0b963..1c62f811072 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -80,7 +80,9 @@ public class PrivateDnsPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { - return AVAILABLE; + return mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings) + ? AVAILABLE + : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index 2d95b657905..1228a06eba8 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -23,6 +23,7 @@ true false false + false true false false diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index 47354c747ea..eb17bcbbee2 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -24,6 +24,8 @@ import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyString; @@ -57,6 +59,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; @@ -143,6 +146,17 @@ public class PrivateDnsPreferenceControllerTest { nc.onLinkPropertiesChanged(mNetwork, lp); } + @Test + public void getAvailibilityStatus_availableByDefault() { + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + @Config(qualifiers = "mcc999") + public void getAvailabilityStatus_unsupportedWhenSet() { + assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); + } + @Test public void goThroughLifecycle_shouldRegisterUnregisterSettingsObserver() { mLifecycle.handleLifecycleEvent(ON_START); From 20002d0309422e69c915836e8aca904a351b74bb Mon Sep 17 00:00:00 2001 From: Chienyuan Date: Mon, 30 Jul 2018 20:16:52 +0800 Subject: [PATCH 2/5] Remove obsolete parameter from addDevice Bug: 111966655 Test: build pass Change-Id: I2f9475ad6b7588946421e852f0724ae616b107ba --- .../android/settings/bluetooth/BluetoothPermissionActivity.java | 1 - .../android/settings/bluetooth/BluetoothPermissionRequest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 4467362e35f..74a5f246fce 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -208,7 +208,6 @@ public class BluetoothPermissionActivity extends AlertActivity implements CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); if (cachedDevice == null) { cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(), - bluetoothManager.getProfileManager(), mDevice); } always = cachedDevice.checkAndIncreaseMessageRejectionCount(); diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java index 85c5e45ec00..bbf3fffc6c7 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java @@ -232,7 +232,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); if (cachedDevice == null) { cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(), - bluetoothManager.getProfileManager(), mDevice); + mDevice); } String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY; From 6fe0330bf7dbd7139d79cdac5ccda2ea69f48678 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Wed, 1 Aug 2018 17:30:13 +0800 Subject: [PATCH 3/5] Icon color of spinner updated Change-Id: Iea7f5d5ec43360cf6114caf368fa8c93ce4cf95c Fixes: 109843982 Test: manual --- res/layout/apps_filter_spinner.xml | 1 - src/com/android/settings/datausage/DataUsageList.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml index 3faff507a2b..e468a4bb8d0 100644 --- a/res/layout/apps_filter_spinner.xml +++ b/res/layout/apps_filter_spinner.xml @@ -21,7 +21,6 @@ android:layout_height="?android:attr/actionBarSize" android:background="?android:attr/colorAccent" android:gravity="center_vertical" - android:paddingEnd="@dimen/switchbar_subsettings_margin_end" android:orientation="horizontal"> Date: Mon, 6 Aug 2018 14:37:57 +0800 Subject: [PATCH 4/5] remove unnecessary mock in ConnectedBluetoothDeviceUpdaterTest Bug: 111848213 Test: make -j50 RunSettingsRoboTests Change-Id: I6a2a25ff80d7d3cd9bcf2b4223afb6a80de7eb7c --- .../ConnectedBluetoothDeviceUpdaterTest.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index bf882456af9..d94a8a7cf0a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -34,9 +34,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; -import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import org.junit.Before; import org.junit.Test; @@ -63,16 +61,10 @@ public class ConnectedBluetoothDeviceUpdaterTest { @Mock private LocalBluetoothManager mLocalManager; @Mock - private LocalBluetoothProfileManager mLocalBluetoothProfileManager; - @Mock - private HeadsetProfile mHeadsetProfile; + private CachedBluetoothDeviceManager mCachedDeviceManager; private Context mContext; private ConnectedBluetoothDeviceUpdater mBluetoothDeviceUpdater; - - @Mock - private CachedBluetoothDeviceManager mCachedDeviceManager; - private Collection cachedDevices; private ShadowAudioManager mShadowAudioManager; @@ -87,8 +79,6 @@ public class ConnectedBluetoothDeviceUpdaterTest { new ArrayList(new ArrayList()); when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice); - when(mLocalManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager); - when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile); when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(cachedDevices); From 6c6239bc96e3a07f3041ad0d194117524424ef26 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 6 Aug 2018 10:17:13 -0700 Subject: [PATCH 5/5] Clean up task affinity Bug: 112254258 Test: manual Change-Id: Ifd9321f5d0532f01db2f6c0b97c914418e3a15e7 --- AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bb43bbf51c6..e2e89bd0915 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2452,7 +2452,6 @@