Merge "Updates to match prebuilts drop" into pi-dev
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index d9562c0..b172198 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -370,7 +370,7 @@
private Preference newManagedProfileSettings() {
Preference preference = new Preference(mParent.getPreferenceManager().getContext());
preference.setTitle(R.string.managed_profile_settings_title);
- preference.setIcon(R.drawable.ic_settings);
+ preference.setIcon(R.drawable.ic_settings_24dp);
preference.setOnPreferenceClickListener(this);
preference.setOrder(ORDER_NEXT_TO_LAST);
return preference;
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 3b09cc2..71a3e0d 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -18,6 +18,8 @@
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
+import static android.system.OsConstants.AF_INET;
+import static android.system.OsConstants.AF_INET6;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
@@ -27,6 +29,7 @@
import android.content.Intent;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
+import android.system.Os;
import android.text.Editable;
import android.text.TextWatcher;
import android.text.method.LinkMovementMethod;
@@ -45,6 +48,7 @@
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.HelpUtils;
+import java.net.InetAddress;
import java.util.HashMap;
import java.util.Map;
@@ -67,6 +71,8 @@
PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);
}
+ private static final int[] ADDRESS_FAMILIES = new int[]{AF_INET, AF_INET6};
+
@VisibleForTesting
static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;
@VisibleForTesting
@@ -180,12 +186,20 @@
}
private boolean isWeaklyValidatedHostname(String hostname) {
- // TODO(b/34953048): Find and use a better validation method. Specifically:
- // [1] this should reject IP string literals, and
- // [2] do the best, simplest, future-proof verification that
- // the input approximates a DNS hostname.
+ // TODO(b/34953048): Use a validation method that permits more accurate,
+ // but still inexpensive, checking of likely valid DNS hostnames.
final String WEAK_HOSTNAME_REGEX = "^[a-zA-Z0-9_.-]+$";
- return hostname.matches(WEAK_HOSTNAME_REGEX);
+ if (!hostname.matches(WEAK_HOSTNAME_REGEX)) {
+ return false;
+ }
+
+ for (int address_family : ADDRESS_FAMILIES) {
+ if (Os.inet_pton(address_family, hostname) != null) {
+ return false;
+ }
+ }
+
+ return true;
}
private Button getSaveButton() {
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index 06b1b62..2d6f83e 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -32,10 +32,13 @@
import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
import android.util.Log;
+import android.util.Pair;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
import androidx.slice.core.SliceHints;
@@ -92,7 +95,7 @@
}
if (!controller.isAvailable()) {
- Log.d(TAG, "Can't update " + key + " since the setting is unavailable");
+ Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
updateUri(context, key, isPlatformSlice);
}
@@ -100,7 +103,9 @@
// so that it's automatically broadcast to any slice.
final TogglePreferenceController toggleController = (TogglePreferenceController) controller;
final boolean currentValue = toggleController.isChecked();
- toggleController.setChecked(!currentValue);
+ final boolean newValue = !currentValue;
+ toggleController.setChecked(newValue);
+ logSliceValueChange(context, key, newValue ? 1 : 0);
updateUri(context, key, isPlatformSlice);
}
@@ -129,6 +134,20 @@
}
sliderController.setSliderPosition(newPosition);
+ logSliceValueChange(context, key, newPosition);
+ }
+
+ /**
+ * Log Slice value update events into MetricsFeatureProvider. The logging schema generally
+ * follows the pattern in SharedPreferenceLogger.
+ */
+ private void logSliceValueChange(Context context, String sliceKey, int newValue) {
+ final Pair<Integer, Object> namePair = Pair.create(
+ MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, sliceKey);
+ final Pair<Integer, Object> valuePair = Pair.create(
+ MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, newValue);
+ FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+ .action(context, MetricsEvent.ACTION_SETTINGS_SLICE_CHANGED, namePair, valuePair);
}
private BasePreferenceController getPreferenceController(Context context, String key) {
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 09a06d3..3e062c8 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -16,6 +16,7 @@
package com.android.settings.slices;
+import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
@@ -23,8 +24,6 @@
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED;
-import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
-
import android.app.PendingIntent;
import android.content.ContentResolver;
import android.content.Context;
@@ -37,18 +36,20 @@
import android.util.Pair;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import android.support.v4.graphics.drawable.IconCompat;
import androidx.slice.Slice;
-import androidx.slice.builders.SliceAction;
import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
/**
@@ -68,7 +69,12 @@
*/
public static Slice buildSlice(Context context, SliceData sliceData) {
final BasePreferenceController controller = getPreferenceController(context, sliceData);
-
+ final Pair<Integer, Object> sliceNamePair =
+ Pair.create(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, sliceData.getKey());
+ // Log Slice requests using the same schema as SharedPreferenceLogger (but with a different
+ // action name).
+ FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+ .action(context, MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED, sliceNamePair);
if (!controller.isAvailable()) {
return buildUnavailableSlice(context, sliceData, controller);
}
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 3751222..5a89072 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -58,7 +58,7 @@
com.android.settings.applications.appinfo.ExternalSourcesDetails
com.android.settings.applications.appinfo.PictureInPictureSettings
com.android.settings.applications.appinfo.PictureInPictureDetails
-com.android.settings.ApnSettings
+com.android.settings.network.ApnSettings
com.android.settings.PrivacySettings
com.android.settings.wifi.calling.WifiCallingSettingsForSub
com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
@@ -67,7 +67,7 @@
com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
com.android.settings.IccLockSettings
com.android.settings.TetherSettings
-com.android.settings.ApnEditor
+com.android.settings.network.ApnEditor
com.android.settings.UserCredentialsSettings
com.android.settings.TestingSettings
com.android.settings.applications.DirectoryAccessDetails
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index 8a60cf3..c5521be 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -37,16 +37,19 @@
import com.android.settings.R;
import com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment;
+import com.android.settings.testutils.shadow.ShadowOs;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowOs.class)
public class PrivateDnsModeDialogPreferenceTest {
private static final String HOST_NAME = "dns.example.com";
@@ -61,6 +64,9 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
+ ReflectionHelpers.setStaticField(android.system.OsConstants.class, "AF_INET", 2);
+ ReflectionHelpers.setStaticField(android.system.OsConstants.class, "AF_INET6", 10);
+
mContext = RuntimeEnvironment.application;
mSaveButton = new Button(mContext);
@@ -122,16 +128,24 @@
@Test
public void testOnCheckedChanged_switchMode_saveButtonHasCorrectState() {
- // Set invalid hostname
- mPreference.mEditText.setText(INVALID_HOST_NAME);
+ final String[] INVALID_HOST_NAMES = new String[] {
+ INVALID_HOST_NAME,
+ "2001:db8::53", // IPv6 string literal
+ "192.168.1.1", // IPv4 string literal
+ };
- mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
- assertThat(mSaveButton.isEnabled()).isTrue();
+ for (String invalid : INVALID_HOST_NAMES) {
+ // Set invalid hostname
+ mPreference.mEditText.setText(invalid);
- mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
- assertThat(mSaveButton.isEnabled()).isFalse();
+ mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
+ assertThat(mSaveButton.isEnabled()).named("off: " + invalid).isTrue();
- mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
- assertThat(mSaveButton.isEnabled()).isTrue();
+ mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
+ assertThat(mSaveButton.isEnabled()).named("opportunistic: " + invalid).isTrue();
+
+ mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
+ assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse();
+ }
}
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index 525ecc7..fdd77e8 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -18,12 +18,16 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
+import android.util.Pair;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.search.FakeIndexProvider;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.search.SearchFeatureProviderImpl;
@@ -37,6 +41,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.robolectric.RuntimeEnvironment;
import androidx.slice.core.SliceHints;
@@ -56,6 +61,8 @@
private SliceBroadcastReceiver mReceiver;
private SearchFeatureProvider mSearchFeatureProvider;
private FakeFeatureFactory mFakeFeatureFactory;
+ private ArgumentCaptor<Pair<Integer, Object>> mLoggingNameArgumentCatpor;
+ private ArgumentCaptor<Pair<Integer, Object>> mLoggingValueArgumentCatpor;
@Before
public void setUp() {
@@ -67,6 +74,8 @@
mSearchFeatureProvider = new SearchFeatureProviderImpl();
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mFakeFeatureFactory.searchFeatureProvider = mSearchFeatureProvider;
+ mLoggingNameArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
+ mLoggingValueArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
}
@After
@@ -75,8 +84,8 @@
}
@Test
- public void testOnReceive_toggleChanged() {
- String key = "key";
+ public void onReceive_toggleChanged() {
+ final String key = "key";
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
insertSpecialCase(key);
// Turn on toggle setting
@@ -91,11 +100,25 @@
mReceiver.onReceive(mContext, intent);
assertThat(fakeToggleController.isChecked()).isFalse();
+ verify(mFakeFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext),
+ eq(MetricsEvent.ACTION_SETTINGS_SLICE_CHANGED),
+ mLoggingNameArgumentCatpor.capture(),
+ mLoggingValueArgumentCatpor.capture());
+
+ final Pair<Integer, Object> namePair = mLoggingNameArgumentCatpor.getValue();
+ final Pair<Integer, Object> valuePair = mLoggingValueArgumentCatpor.getValue();
+ assertThat(namePair.first).isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(namePair.second).isEqualTo(fakeToggleController.getPreferenceKey());
+
+ assertThat(valuePair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE);
+ assertThat(valuePair.second).isEqualTo(0);
}
@Test
- public void testOnReceive_sliderChanged() {
- String key = "key";
+ public void onReceive_sliderChanged() {
+ final String key = "key";
final int position = FakeSliderController.MAX_STEPS - 1;
final int oldPosition = FakeSliderController.MAX_STEPS;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
@@ -115,11 +138,25 @@
mReceiver.onReceive(mContext, intent);
assertThat(fakeSliderController.getSliderPosition()).isEqualTo(position);
+ verify(mFakeFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext),
+ eq(MetricsEvent.ACTION_SETTINGS_SLICE_CHANGED),
+ mLoggingNameArgumentCatpor.capture(),
+ mLoggingValueArgumentCatpor.capture());
+
+ final Pair<Integer, Object> namePair = mLoggingNameArgumentCatpor.getValue();
+ final Pair<Integer, Object> valuePair = mLoggingValueArgumentCatpor.getValue();
+ assertThat(namePair.first).isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(namePair.second).isEqualTo(key);
+
+ assertThat(valuePair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE);
+ assertThat(valuePair.second).isEqualTo(position);
}
@Test(expected = IllegalArgumentException.class)
- public void testOnReceive_invalidController_throwsException() {
- String key = "key";
+ public void onReceive_invalidController_throwsException() {
+ final String key = "key";
final int position = 0;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
insertSpecialCase(FakeToggleController.class, key);
@@ -136,23 +173,23 @@
@Test(expected = IllegalArgumentException.class)
public void sliderOnReceive_noKey_throwsException() {
// Build action
- Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED);
- intent.putExtra(SliceHints.EXTRA_RANGE_VALUE, 0);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_SLIDER_CHANGED)
+ .putExtra(SliceHints.EXTRA_RANGE_VALUE, 0);
// Trigger the exception.
mReceiver.onReceive(mContext, intent);
}
- @Test(expected = IllegalStateException.class)
+ @Test(expected = IllegalStateException.class)
public void toggleOnReceive_noExtra_illegalStateException() {
- Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
mReceiver.onReceive(mContext, intent);
}
- @Test(expected = IllegalStateException.class)
+ @Test(expected = IllegalStateException.class)
public void toggleOnReceive_emptyKey_throwsIllegalStateException() {
- Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED);
- intent.putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, (String) null);
+ final Intent intent = new Intent(SettingsSliceProvider.ACTION_TOGGLE_CHANGED)
+ .putExtra(SettingsSliceProvider.EXTRA_SLICE_KEY, (String) null);
mReceiver.onReceive(mContext, intent);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index d21fc05..df6be44 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -17,9 +17,10 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import android.content.ContentResolver;
import android.content.Context;
@@ -28,8 +29,10 @@
import android.provider.SettingsSlicesContract;
import android.util.Pair;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.FakeSliderController;
import com.android.settings.testutils.FakeToggleController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,6 +40,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.robolectric.RuntimeEnvironment;
import androidx.slice.Slice;
@@ -58,10 +62,14 @@
private final String ACTION_PATH = SettingsSlicesContract.PATH_SETTING_ACTION + "/" + KEY;
private Context mContext;
+ private FakeFeatureFactory mFeatureFactory;
+ private ArgumentCaptor<Pair<Integer, Object>> mLoggingArgumentCatpor;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mLoggingArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
}
@Test
@@ -73,67 +81,76 @@
@Test
public void testSliderSlice_returnsSeekBarSlice() {
- final Slice slice = SliceBuilderUtils.buildSlice(mContext, getDummyData(
- FakeSliderController.class));
+ final SliceData data = getDummyData(FakeSliderController.class);
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
+ mLoggingArgumentCatpor.capture());
+ final Pair<Integer, Object> capturedLoggingPair = mLoggingArgumentCatpor.getValue();
+
+ assertThat(capturedLoggingPair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(capturedLoggingPair.second)
+ .isEqualTo(data.getKey());
assertThat(slice).isNotNull();
}
@Test
public void testUriBuilder_oemAuthority_intentPath_returnsValidSliceUri() {
- Uri expectedUri = new Uri.Builder()
+ final Uri expectedUri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(INTENT_PATH)
.build();
- Uri actualUri = SliceBuilderUtils.getUri(INTENT_PATH, false);
+ final Uri actualUri = SliceBuilderUtils.getUri(INTENT_PATH, false);
assertThat(actualUri).isEqualTo(expectedUri);
}
@Test
public void testUriBuilder_oemAuthority_actionPath_returnsValidSliceUri() {
- Uri expectedUri = new Uri.Builder()
+ final Uri expectedUri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(ACTION_PATH)
.build();
- Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, false);
+ final Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, false);
assertThat(actualUri).isEqualTo(expectedUri);
}
@Test
public void testUriBuilder_platformAuthority_intentPath_returnsValidSliceUri() {
- Uri expectedUri = new Uri.Builder()
+ final Uri expectedUri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
.appendPath(ACTION_PATH)
.build();
- Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, true);
+ final Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, true);
assertThat(actualUri).isEqualTo(expectedUri);
}
@Test
public void testUriBuilder_platformAuthority_actionPath_returnsValidSliceUri() {
- Uri expectedUri = new Uri.Builder()
+ final Uri expectedUri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(SettingsSlicesContract.AUTHORITY)
.appendPath(ACTION_PATH)
.build();
- Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, true);
+ final Uri actualUri = SliceBuilderUtils.getUri(ACTION_PATH, true);
assertThat(actualUri).isEqualTo(expectedUri);
}
@Test
public void testGetPreferenceController_buildsMatchingController() {
- BasePreferenceController controller =
+ final BasePreferenceController controller =
SliceBuilderUtils.getPreferenceController(mContext, getDummyData());
assertThat(controller).isInstanceOf(FakeToggleController.class);
@@ -141,7 +158,7 @@
@Test
public void testGetPreferenceController_contextOnly_buildsMatchingController() {
- BasePreferenceController controller =
+ final BasePreferenceController controller =
SliceBuilderUtils.getPreferenceController(mContext, getDummyData(PREF_CONTROLLER2));
assertThat(controller).isInstanceOf(FakeContextOnlyPreferenceController.class);
@@ -149,50 +166,52 @@
@Test
public void testDynamicSummary_returnsSliceSummary() {
- SliceData data = getDummyData();
- FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
+ final SliceData data = getDummyData();
+ final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
- CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+ final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(data.getSummary());
}
@Test
public void testDynamicSummary_returnsFragmentSummary() {
- SliceData data = getDummyData((String) null);
- FakePreferenceController controller = spy(new FakePreferenceController(mContext, KEY));
- String controllerSummary = "new_Summary";
+ final SliceData data = getDummyData((String) null);
+ final FakePreferenceController controller = spy(
+ new FakePreferenceController(mContext, KEY));
+ final String controllerSummary = "new_Summary";
doReturn(controllerSummary).when(controller).getSummary();
- CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+ final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(controllerSummary);
}
@Test
public void testDynamicSummary_returnsSliceScreenTitle() {
- SliceData data = getDummyData((String) null);
- FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
+ final SliceData data = getDummyData((String) null);
+ final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
- CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+ final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(data.getScreenTitle());
}
@Test
public void testDynamicSummary_placeHolderString_returnsScreenTitle() {
- SliceData data = getDummyData(mContext.getString(R.string.summary_placeholder));
- FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
- CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+ final SliceData data = getDummyData(mContext.getString(R.string.summary_placeholder));
+ final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
+ final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
assertThat(summary).isEqualTo(data.getScreenTitle());
}
@Test
public void testDynamicSummary_sliceDataAndFragmentPlaceholder_returnsSliceScreenTitle() {
- String summaryPlaceholder = mContext.getString(R.string.summary_placeholder);
- SliceData data = getDummyData(summaryPlaceholder);
- FakePreferenceController controller = spy(new FakePreferenceController(mContext, KEY));
+ final String summaryPlaceholder = mContext.getString(R.string.summary_placeholder);
+ final SliceData data = getDummyData(summaryPlaceholder);
+ final FakePreferenceController controller = spy(
+ new FakePreferenceController(mContext, KEY));
doReturn(summaryPlaceholder).when(controller).getSummary();
CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
@@ -202,13 +221,13 @@
@Test
public void getPathData_splitsIntentUri() {
- Uri uri = new Uri.Builder()
+ final Uri uri = new Uri.Builder()
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
.appendPath(KEY)
.build();
- Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
+ final Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
assertThat(pathPair.first).isFalse();
assertThat(pathPair.second).isEqualTo(KEY);
@@ -216,13 +235,13 @@
@Test
public void getPathData_splitsActionUri() {
- Uri uri = new Uri.Builder()
+ final Uri uri = new Uri.Builder()
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(KEY)
.build();
- Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
+ final Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
assertThat(pathPair.first).isTrue();
assertThat(pathPair.second).isEqualTo(KEY);
@@ -230,7 +249,7 @@
@Test(expected = IllegalArgumentException.class)
public void getPathData_noKey_returnsNull() {
- Uri uri = new Uri.Builder()
+ final Uri uri = new Uri.Builder()
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.build();
@@ -240,14 +259,14 @@
@Test
public void getPathData_extraArg_returnsNull() {
- Uri uri = new Uri.Builder()
+ final Uri uri = new Uri.Builder()
.authority(SettingsSliceProvider.SLICE_AUTHORITY)
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(KEY)
.appendPath(KEY)
.build();
- Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
+ final Pair<Boolean, String> pathPair = SliceBuilderUtils.getPathData(uri);
assertThat(pathPair.first).isTrue();
assertThat(pathPair.second).isEqualTo(KEY + "/" + KEY);
@@ -255,49 +274,68 @@
@Test
public void testUnsupportedSlice_validTitleSummary() {
- SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
- Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
assertThat(slice).isNotNull();
}
@Test
public void testDisabledForUserSlice_validTitleSummary() {
- SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_FOR_USER);
- Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
assertThat(slice).isNotNull();
}
@Test
public void testDisabledDependententSettingSlice_validTitleSummary() {
- SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_DEPENDENT_SETTING);
- Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
+ mLoggingArgumentCatpor.capture());
+ final Pair<Integer, Object> capturedLoggingPair = mLoggingArgumentCatpor.getValue();
+
+ assertThat(capturedLoggingPair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(capturedLoggingPair.second)
+ .isEqualTo(data.getKey());
assertThat(slice).isNotNull();
}
@Test
public void testUnavailableUnknownSlice_validTitleSummary() {
- SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class.getName());
Settings.System.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.UNAVAILABLE_UNKNOWN);
- Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
+ mLoggingArgumentCatpor.capture());
+
+ final Pair<Integer, Object> capturedLoggingPair = mLoggingArgumentCatpor.getValue();
+
+ assertThat(capturedLoggingPair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(capturedLoggingPair.second)
+ .isEqualTo(data.getKey());
assertThat(slice).isNotNull();
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java
new file mode 100644
index 0000000..d1ac84c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowOs.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2018 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.settings.testutils.shadow;
+
+import static android.system.OsConstants.AF_INET;
+import static android.system.OsConstants.AF_INET6;
+
+import android.system.Os;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Pattern;
+
+@Implements(Os.class)
+public class ShadowOs {
+ // These are not actually correct, but good enough for the test
+ private static final Pattern IPV4_PATTERN =
+ Pattern.compile("^\\d{1,3}(\\.\\d{1,3}){3}$");
+ private static final Pattern IPV6_PATTERN =
+ Pattern.compile("^[0-9a-f]{1,4}(:[0-9a-f]{0,4}){0,6}$");
+
+ private static final byte[] IPV4_BYTES = new byte[4];
+ private static final byte[] IPV6_BYTES = new byte[16];
+
+ @Implementation
+ public static InetAddress inet_pton(int family, String address) {
+ if ((AF_INET == family && IPV4_PATTERN.matcher(address).find()) ||
+ (AF_INET6 == family && IPV6_PATTERN.matcher(address).find())) {
+ try {
+ return InetAddress.getByAddress((AF_INET == family) ? IPV4_BYTES : IPV6_BYTES);
+ } catch (UnknownHostException uhe) {
+ // Shouldn't be reached.
+ }
+ }
+ return null;
+ }
+}