Merge "Fix crash in non-indexable keys collection" into pi-dev
diff --git a/Android.mk b/Android.mk
index 61851cf..e37e9fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@
android-slices-builders \
android-slices-core \
android-slices-view \
+ android-support-compat \
android-support-v4 \
android-support-v13 \
android-support-v7-appcompat \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 17bb5ff..b892dee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -105,7 +105,8 @@
android:allowBackup="false"
android:usesCleartextTraffic="true"
android:defaultToDeviceProtectedStorage="true"
- android:directBootAware="true">
+ android:directBootAware="true"
+ android:appComponentFactory="android.support.v4.app.CoreComponentFactory">
<uses-library android:name="org.apache.http.legacy" />
<!-- Settings -->
@@ -388,7 +389,7 @@
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.ApnSettings" />
+ android:value="com.android.settings.network.ApnSettings" />
</activity>
<!-- Keep compatibility with old shortcuts. -->
@@ -1903,7 +1904,7 @@
<data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.ApnEditor" />
+ android:value="com.android.settings.network.ApnEditor" />
</activity>
<activity
diff --git a/proguard.flags b/proguard.flags
index 21c5cfd..43a038b 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -51,3 +51,4 @@
public static ** SEARCH_INDEX_DATA_PROVIDER;
public static ** SUMMARY_PROVIDER_FACTORY;
}
+-keep class android.support.v4.app.CoreComponentFactory
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 26210d9..7507de2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8774,6 +8774,8 @@
<string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
<!-- Title for dialog displayed to tell user that turning off backups is disallowed by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_turn_off_backups">Can\'t turn off backups</string>
+ <!-- Title for dialog displayed to tell user that the app was suspended by an admin [CHAR LIMIT=50] -->
+ <string name="disabled_by_policy_title_suspend_packages">Can\'t open this app</string>
<!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
<string name="default_admin_support_msg">If you have questions, contact your IT admin</string>
<!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index a1c0e2a..fdec662 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -46,6 +46,7 @@
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
+import com.android.settings.network.ApnSettings;
import com.android.settingslib.RestrictedLockUtils;
/**
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/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index e0c19ff..1f843b9 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -19,6 +19,7 @@
import android.app.AppOpsManager;
import android.app.AppOpsManager.PackageOps;
import android.content.Context;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.RemoteException;
@@ -31,7 +32,6 @@
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import java.util.Arrays;
import java.util.Collection;
@@ -47,7 +47,7 @@
private static final String TAG = "AppStateAppOpsBridge";
- private final IPackageManagerWrapper mIPackageManager;
+ private final IPackageManager mIPackageManager;
private final UserManager mUserManager;
private final List<UserHandle> mProfiles;
private final AppOpsManager mAppOpsManager;
@@ -58,12 +58,12 @@
public AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
int appOpsOpCode, String[] permissions) {
this(context, appState, callback, appOpsOpCode, permissions,
- new IPackageManagerWrapper(AppGlobals.getPackageManager()));
+ AppGlobals.getPackageManager());
}
@VisibleForTesting
AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
- int appOpsOpCode, String[] permissions, IPackageManagerWrapper packageManager) {
+ int appOpsOpCode, String[] permissions, IPackageManager packageManager) {
super(appState, callback);
mContext = context;
mIPackageManager = packageManager;
@@ -210,9 +210,10 @@
if (entriesForProfile == null) {
continue;
}
- @SuppressWarnings("unchecked")
- final List<PackageInfo> packageInfos = mIPackageManager
- .getPackagesHoldingPermissions(mPermissions, 0, profileId).getList();
+ @SuppressWarnings("unchecked") final List<PackageInfo> packageInfos =
+ mIPackageManager
+ .getPackagesHoldingPermissions(mPermissions, 0,
+ profileId).getList();
final int packageInfoCount = packageInfos != null ? packageInfos.size() : 0;
for (int i = 0; i < packageInfoCount; i++) {
final PackageInfo packageInfo = packageInfos.get(i);
diff --git a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
index 77cecd2..9bb7a4b 100644
--- a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
+++ b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
@@ -17,12 +17,12 @@
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.RemoteException;
import android.os.UserHandle;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
/**
@@ -32,11 +32,11 @@
public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter {
private final String[] mPermissions;
- private final IPackageManagerWrapper mPackageManagerService;
+ private final IPackageManager mPackageManagerService;
private final DevicePolicyManager mDevicePolicyManager;
public AppWithAdminGrantedPermissionsCounter(Context context, String[] permissions,
- PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
+ PackageManagerWrapper packageManager, IPackageManager packageManagerService,
DevicePolicyManager devicePolicyManager) {
super(context, packageManager);
mPermissions = permissions;
@@ -52,7 +52,7 @@
public static boolean includeInCount(String[] permissions,
DevicePolicyManager devicePolicyManager, PackageManagerWrapper packageManager,
- IPackageManagerWrapper packageManagerService, ApplicationInfo info) {
+ IPackageManager packageManagerService, ApplicationInfo info) {
if (info.targetSdkVersion >= Build.VERSION_CODES.M) {
// The app uses run-time permissions. Check whether one or more of the permissions were
// granted by enterprise policy.
diff --git a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
index 655758a..1308620 100644
--- a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
+++ b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
@@ -18,9 +18,9 @@
import android.app.admin.DevicePolicyManager;
import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
import android.os.UserManager;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
/**
@@ -29,11 +29,11 @@
*/
public abstract class AppWithAdminGrantedPermissionsLister extends AppLister {
private final String[] mPermissions;
- private final IPackageManagerWrapper mPackageManagerService;
+ private final IPackageManager mPackageManagerService;
private final DevicePolicyManager mDevicePolicyManager;
public AppWithAdminGrantedPermissionsLister(String[] permissions,
- PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
+ PackageManagerWrapper packageManager, IPackageManager packageManagerService,
DevicePolicyManager devicePolicyManager, UserManager userManager) {
super(packageManager, userManager);
mPermissions = permissions;
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index cd54f79..f592865 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.ComponentInfo;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
@@ -27,7 +28,6 @@
import android.os.UserManager;
import android.util.ArraySet;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.ArrayList;
@@ -38,12 +38,12 @@
private final Context mContext;
private final PackageManagerWrapper mPm;
- private final IPackageManagerWrapper mPms;
+ private final IPackageManager mPms;
private final DevicePolicyManager mDpm;
private final UserManager mUm;
public ApplicationFeatureProviderImpl(Context context, PackageManagerWrapper pm,
- IPackageManagerWrapper pms, DevicePolicyManager dpm) {
+ IPackageManager pms, DevicePolicyManager dpm) {
mContext = context.getApplicationContext();
mPm = pm;
mPms = pms;
@@ -149,7 +149,7 @@
CurrentUserAndManagedProfileAppWithAdminGrantedPermissionsCounter(Context context,
String[] permissions, PackageManagerWrapper packageManager,
- IPackageManagerWrapper packageManagerService,
+ IPackageManager packageManagerService,
DevicePolicyManager devicePolicyManager, NumberOfAppsCallback callback) {
super(context, permissions, packageManager, packageManagerService, devicePolicyManager);
mCallback = callback;
@@ -181,7 +181,7 @@
private ListOfAppsCallback mCallback;
CurrentUserAppWithAdminGrantedPermissionsLister(String[] permissions,
- PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
+ PackageManagerWrapper packageManager, IPackageManager packageManagerService,
DevicePolicyManager devicePolicyManager, UserManager userManager,
ListOfAppsCallback callback) {
super(permissions, packageManager, packageManagerService, devicePolicyManager,
diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
index 87fa9ca..4c1f009 100644
--- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
@@ -22,6 +22,7 @@
import android.os.Bundle;
import android.support.v7.preference.Preference;
+import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
@@ -77,7 +78,18 @@
public static CharSequence getNotificationSummary(NotificationBackend.AppRow appRow,
Context context) {
- // TODO: implement summary when it is known what it should say
- return "";
+ if (appRow == null) {
+ return "";
+ }
+ if (appRow.banned || appRow.channelCount == appRow.blockedChannelCount) {
+ return context.getString(R.string.notifications_disabled);
+ } else {
+ if (appRow.blockedChannelCount == 0) {
+ return context.getString(R.string.notifications_enabled);
+ }
+ return context.getString(R.string.notifications_enabled_with_info,
+ context.getResources().getQuantityString(R.plurals.notifications_categories_off,
+ appRow.blockedChannelCount, appRow.blockedChannelCount));
+ }
}
}
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index c3317fe..7842dbf 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -16,8 +16,6 @@
package com.android.settings.core.gateway;
-import com.android.settings.ApnEditor;
-import com.android.settings.ApnSettings;
import com.android.settings.DateTimeSettings;
import com.android.settings.DeviceAdminSettings;
import com.android.settings.DisplaySettings;
@@ -91,6 +89,8 @@
import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.localepicker.LocaleListEditor;
import com.android.settings.location.LocationSettings;
+import com.android.settings.network.ApnEditor;
+import com.android.settings.network.ApnSettings;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.nfc.AndroidBeam;
import com.android.settings.nfc.PaymentSettings;
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 3429957..ff43e6e 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -148,6 +148,9 @@
case DevicePolicyManager.POLICY_MANDATORY_BACKUPS:
titleView.setText(R.string.disabled_by_policy_title_turn_off_backups);
break;
+ case DevicePolicyManager.POLICY_SUSPEND_PACKAGES:
+ titleView.setText(R.string.disabled_by_policy_title_suspend_packages);
+ break;
default:
// Use general text if no specialized title applies
titleView.setText(R.string.disabled_by_policy_title);
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 1eb95df..eead69f 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -23,6 +23,7 @@
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Resources;
+import android.net.ConnectivityManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -32,7 +33,6 @@
import com.android.settings.R;
import com.android.settings.vpn2.VpnUtils;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import java.util.Date;
@@ -44,13 +44,13 @@
private final DevicePolicyManager mDpm;
private final PackageManagerWrapper mPm;
private final UserManager mUm;
- private final ConnectivityManagerWrapper mCm;
+ private final ConnectivityManager mCm;
private final Resources mResources;
private static final int MY_USER_ID = UserHandle.myUserId();
public EnterprisePrivacyFeatureProviderImpl(Context context, DevicePolicyManager dpm,
- PackageManagerWrapper pm, UserManager um, ConnectivityManagerWrapper cm,
+ PackageManagerWrapper pm, UserManager um, ConnectivityManager cm,
Resources resources) {
mContext = context.getApplicationContext();
mDpm = dpm;
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
index fd150e4..1b6e2f0 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.BatteryStats;
import android.support.annotation.VisibleForTesting;
+import android.text.format.DateUtils;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -72,18 +73,20 @@
final long foregroundTimeMs = mBatteryUtils.getProcessTimeMs(
BatteryUtils.StatusType.FOREGROUND, batterySipper.uidObj,
BatteryStats.STATS_SINCE_CHARGED);
- mHighUsageAppList.add(new AppInfo.Builder()
- .setUid(batterySipper.getUid())
- .setPackageName(
- mBatteryUtils.getPackageName(batterySipper.getUid()))
- .setScreenOnTimeMs(foregroundTimeMs)
- .build());
+ if (foregroundTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
+ mHighUsageAppList.add(new AppInfo.Builder()
+ .setUid(batterySipper.getUid())
+ .setPackageName(
+ mBatteryUtils.getPackageName(batterySipper.getUid()))
+ .setScreenOnTimeMs(foregroundTimeMs)
+ .build());
+ }
}
}
+ Collections.sort(mHighUsageAppList, Collections.reverseOrder());
mHighUsageAppList = mHighUsageAppList.subList(0,
Math.min(mPolicy.highUsageAppCount, mHighUsageAppList.size()));
- Collections.sort(mHighUsageAppList, Collections.reverseOrder());
}
}
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
similarity index 99%
rename from src/com/android/settings/ApnEditor.java
rename to src/com/android/settings/network/ApnEditor.java
index 15edbf4..61f1243 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.network;
+
+import static android.content.Context.TELEPHONY_SERVICE;
import android.app.AlertDialog;
import android.app.Dialog;
@@ -47,9 +49,11 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.utils.ThreadUtils;
import java.util.Arrays;
@@ -57,11 +61,6 @@
import java.util.List;
import java.util.Set;
-import static android.content.Context.TELEPHONY_SERVICE;
-
-/**
- * TODO(b/77339683): After loading all changes, please move this to network package.
- */
public class ApnEditor extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, OnKeyListener {
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java
similarity index 98%
rename from src/com/android/settings/ApnPreference.java
rename to src/com/android/settings/network/ApnPreference.java
index 0111b26..412c288 100755
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/network/ApnPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.network;
import android.content.ContentUris;
import android.content.Context;
@@ -32,6 +32,8 @@
import android.widget.RadioButton;
import android.widget.RelativeLayout;
+import com.android.settings.R;
+
public class ApnPreference extends Preference implements
CompoundButton.OnCheckedChangeListener, OnClickListener {
final static String TAG = "ApnPreference";
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
similarity index 99%
rename from src/com/android/settings/ApnSettings.java
rename to src/com/android/settings/network/ApnSettings.java
index d554301..bbbcdbc 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.network;
import android.app.Activity;
import android.app.Dialog;
@@ -39,7 +39,6 @@
import android.provider.Telephony;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -50,7 +49,6 @@
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
-import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -59,6 +57,8 @@
import com.android.internal.telephony.dataconnection.ApnSetting;
import com.android.internal.telephony.uicc.IccRecords;
import com.android.internal.telephony.uicc.UiccController;
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import java.util.ArrayList;
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/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 34b6ce5..62c8388 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -60,6 +60,8 @@
row.banned = getNotificationsBanned(row.pkg, row.uid);
row.showBadge = canShowBadge(row.pkg, row.uid);
row.userId = UserHandle.getUserId(row.uid);
+ row.blockedChannelCount = getBlockedChannelCount(row.pkg, row.uid);
+ row.channelCount = getChannelCount(row.pkg, row.uid);
return row;
}
@@ -178,18 +180,6 @@
}
}
- public NotificationChannelGroup getGroupWithChannels(String pkg, int uid, String groupId) {
- if (groupId == null) {
- return null;
- }
- try {
- return sINM.getPopulatedNotificationChannelGroupForPackage(pkg, uid, groupId, true);
- } catch (Exception e) {
- Log.w(TAG, "Error calling NoMan", e);
- return null;
- }
- }
-
public ParceledListSlice<NotificationChannelGroup> getGroups(String pkg, int uid) {
try {
return sINM.getNotificationChannelGroupsForPackage(pkg, uid, false);
@@ -224,6 +214,15 @@
}
}
+ public int getBlockedChannelCount(String pkg, int uid) {
+ try {
+ return sINM.getBlockedChannelCount(pkg, uid);
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return 0;
+ }
+ }
+
public boolean onlyHasDefaultChannel(String pkg, int uid) {
try {
return sINM.onlyHasDefaultChannel(pkg, uid);
@@ -233,6 +232,15 @@
}
}
+ public int getChannelCount(String pkg, int uid) {
+ try {
+ return sINM.getNumNotificationChannelsForPackage(pkg, uid, false);
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return 0;
+ }
+ }
+
public List<NotifyingApp> getRecentApps() {
try {
return sINM.getRecentNotifyingAppsForUser(UserHandle.myUserId()).getList();
@@ -259,5 +267,7 @@
public String lockedChannelId;
public boolean showBadge;
public int userId;
+ public int blockedChannelCount;
+ public int channelCount;
}
}
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 89f1e27..478a7d6b 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -83,6 +83,7 @@
public void setStream(int stream) {
mStream = stream;
setMax(mAudioManager.getStreamMaxVolume(mStream));
+ setMin(mAudioManager.getStreamMinVolume(mStream));
setProgress(mAudioManager.getStreamVolume(mStream));
}
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index f0bbe2e..b652c66 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -51,8 +51,6 @@
import com.android.settings.slices.SlicesFeatureProviderImpl;
import com.android.settings.users.UserFeatureProvider;
import com.android.settings.users.UserFeatureProviderImpl;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.wrapper.PackageManagerWrapper;
@@ -112,7 +110,7 @@
if (mApplicationFeatureProvider == null) {
mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(context,
new PackageManagerWrapper(context.getPackageManager()),
- new IPackageManagerWrapper(AppGlobals.getPackageManager()),
+ AppGlobals.getPackageManager(),
(DevicePolicyManager) context
.getSystemService(Context.DEVICE_POLICY_SERVICE));
}
@@ -134,8 +132,7 @@
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE),
new PackageManagerWrapper(context.getPackageManager()),
UserManager.get(context),
- new ConnectivityManagerWrapper((ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE)),
+ (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
context.getResources());
}
return mEnterprisePrivacyFeatureProvider;
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index b07bcb0..1a73ea7 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -24,6 +24,7 @@
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.support.annotation.VisibleForTesting;
+import android.support.v4.graphics.drawable.IconCompat;
import android.util.Log;
import com.android.settings.R;
@@ -203,7 +204,8 @@
.addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),
null, finalWifiEnabled))
.setPrimaryAction(
- new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))
+ new SliceAction(getIntent(Intent.ACTION_MAIN),
+ (IconCompat) null, null)))
.build();
}
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 af9a336..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,17 +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;
/**
@@ -67,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);
}
@@ -164,7 +171,7 @@
.setTitle(sliceData.getTitle())
.setTitleItem(icon, ICON_IMAGE)
.setSubtitle(subtitleText)
- .setPrimaryAction(new SliceAction(contentIntent, null, null))
+ .setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null))
.addEndItem(sliceAction))
.build();
}
@@ -180,7 +187,7 @@
.setTitle(sliceData.getTitle())
.setTitleItem(icon, ICON_IMAGE)
.setSubtitle(subtitleText)
- .setPrimaryAction(new SliceAction(contentIntent, null, null)))
+ .setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null)))
.build();
}
@@ -284,24 +291,25 @@
switch (controller.getAvailabilityStatus()) {
case DISABLED_UNSUPPORTED:
summary = context.getString(R.string.unsupported_setting_summary);
- primaryAction = new SliceAction(getSettingsIntent(context), null /* actionIcon */,
+ primaryAction = new SliceAction(getSettingsIntent(context),
+ (IconCompat) null /* actionIcon */,
null /* actionTitle */);
break;
case DISABLED_FOR_USER:
summary = context.getString(R.string.disabled_for_user_setting_summary);
primaryAction = new SliceAction(getContentIntent(context, data),
- null /* actionIcon */, null /* actionTitle */);
+ (IconCompat) null /* actionIcon */, null /* actionTitle */);
break;
case DISABLED_DEPENDENT_SETTING:
summary = context.getString(R.string.disabled_dependent_setting_summary);
primaryAction = new SliceAction(getContentIntent(context, data),
- null /* actionIcon */, null /* actionTitle */);
+ (IconCompat) null /* actionIcon */, null /* actionTitle */);
break;
case UNAVAILABLE_UNKNOWN:
default:
summary = context.getString(R.string.unknown_unavailability_setting_summary);
primaryAction = new SliceAction(getSettingsIntent(context),
- null /* actionIcon */, null /* actionTitle */);
+ (IconCompat) null /* actionIcon */, null /* actionTitle */);
}
return new ListBuilder(context, data.getUri())
diff --git a/src/com/android/settings/vpn2/VpnUtils.java b/src/com/android/settings/vpn2/VpnUtils.java
index 1aa4ada..4528180 100644
--- a/src/com/android/settings/vpn2/VpnUtils.java
+++ b/src/com/android/settings/vpn2/VpnUtils.java
@@ -27,7 +27,6 @@
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
/**
* Utility functions for vpn.
@@ -89,7 +88,7 @@
ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
}
- public static boolean isAlwaysOnVpnSet(ConnectivityManagerWrapper cm, final int userId) {
+ public static boolean isAlwaysOnVpnSet(ConnectivityManager cm, final int userId) {
return cm.getAlwaysOnVpnPackageForUser(userId) != null;
}
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index c5e79b2..cdb9292 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -34,11 +34,10 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchWidgetController;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.WirelessUtils;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -46,7 +45,7 @@
private final SwitchWidgetController mSwitchWidget;
private final WifiManager mWifiManager;
- private final ConnectivityManagerWrapper mConnectivityManager;
+ private final ConnectivityManager mConnectivityManager;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private Context mContext;
@@ -81,20 +80,20 @@
public WifiEnabler(Context context, SwitchWidgetController switchWidget,
MetricsFeatureProvider metricsFeatureProvider) {
- this(context, switchWidget, metricsFeatureProvider, new ConnectivityManagerWrapper(
- (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)));
+ this(context, switchWidget, metricsFeatureProvider,
+ (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE));
}
@VisibleForTesting
WifiEnabler(Context context, SwitchWidgetController switchWidget,
MetricsFeatureProvider metricsFeatureProvider,
- ConnectivityManagerWrapper connectivityManagerWrapper) {
+ ConnectivityManager connectivityManager) {
mContext = context;
mSwitchWidget = switchWidget;
mSwitchWidget.setListener(this);
mMetricsFeatureProvider = metricsFeatureProvider;
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- mConnectivityManager = connectivityManagerWrapper;
+ mConnectivityManager = connectivityManager;
mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
// The order matters! We really should not depend on this. :(
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 5f29922..4f1c832 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -64,7 +64,6 @@
import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settings.widget.SwitchBarController;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
@@ -852,9 +851,7 @@
pref.getAccessPoint().saveWifiState(pref.getExtras());
if (mCaptivePortalNetworkCallback != null
&& mCaptivePortalNetworkCallback.isCaptivePortal()) {
- ConnectivityManagerWrapper connectivityManagerWrapper =
- new ConnectivityManagerWrapper(mConnectivityManager);
- connectivityManagerWrapper.startCaptivePortalApp(
+ mConnectivityManager.startCaptivePortalApp(
mCaptivePortalNetworkCallback.getNetwork());
} else {
launchNetworkDetailsFragment(pref);
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index e7f0fdd..2339e38 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -48,6 +48,7 @@
import android.util.Log;
import android.widget.ImageView;
import android.widget.Toast;
+
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -60,7 +61,6 @@
import com.android.settings.wifi.WifiDialog;
import com.android.settings.wifi.WifiDialog.WifiDialogListener;
import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -68,6 +68,7 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.wifi.AccessPoint;
+
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
@@ -114,7 +115,6 @@
static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
private AccessPoint mAccessPoint;
- private final ConnectivityManagerWrapper mConnectivityManagerWrapper;
private final ConnectivityManager mConnectivityManager;
private final Fragment mFragment;
private final Handler mHandler;
@@ -152,10 +152,10 @@
switch (intent.getAction()) {
case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
if (!intent.getBooleanExtra(WifiManager.EXTRA_MULTIPLE_NETWORKS_CHANGED,
- false /* defaultValue */)) {
+ false /* defaultValue */)) {
// only one network changed
WifiConfiguration wifiConfiguration = intent
- .getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);
+ .getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);
if (mAccessPoint.matches(wifiConfiguration)) {
mWifiConfig = wifiConfiguration;
}
@@ -215,7 +215,7 @@
public static WifiDetailPreferenceController newInstance(
AccessPoint accessPoint,
- ConnectivityManagerWrapper connectivityManagerWrapper,
+ ConnectivityManager connectivityManager,
Context context,
Fragment fragment,
Handler handler,
@@ -223,14 +223,14 @@
WifiManager wifiManager,
MetricsFeatureProvider metricsFeatureProvider) {
return new WifiDetailPreferenceController(
- accessPoint, connectivityManagerWrapper, context, fragment, handler, lifecycle,
+ accessPoint, connectivityManager, context, fragment, handler, lifecycle,
wifiManager, metricsFeatureProvider, new IconInjector(context));
}
@VisibleForTesting
- /* package */ WifiDetailPreferenceController(
+ /* package */ WifiDetailPreferenceController(
AccessPoint accessPoint,
- ConnectivityManagerWrapper connectivityManagerWrapper,
+ ConnectivityManager connectivityManager,
Context context,
Fragment fragment,
Handler handler,
@@ -241,8 +241,7 @@
super(context);
mAccessPoint = accessPoint;
- mConnectivityManager = connectivityManagerWrapper.getConnectivityManager();
- mConnectivityManagerWrapper = connectivityManagerWrapper;
+ mConnectivityManager = connectivityManager;
mFragment = fragment;
mHandler = handler;
mSignalStr = context.getResources().getStringArray(R.array.wifi_signal);
@@ -326,7 +325,7 @@
mNetworkCapabilities = mConnectivityManager.getNetworkCapabilities(mNetwork);
updateInfo();
mContext.registerReceiver(mReceiver, mFilter);
- mConnectivityManagerWrapper.registerNetworkCallback(mNetworkRequest, mNetworkCallback,
+ mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback,
mHandler);
}
@@ -486,7 +485,7 @@
private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
try {
InetAddress all = InetAddress.getByAddress(
- new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
+ new byte[] {(byte) 255, (byte) 255, (byte) 255, (byte) 255});
return NetworkUtils.getNetworkPart(all, prefixLength).getHostAddress();
} catch (UnknownHostException e) {
return null;
@@ -538,7 +537,7 @@
private void signIntoNetwork() {
mMetricsFeatureProvider.action(
mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
- mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork);
+ mConnectivityManager.startCaptivePortalApp(mNetwork);
}
@Override
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index b2e56b9..3438035 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -20,13 +20,10 @@
import android.app.Dialog;
import android.content.Context;
import android.net.ConnectivityManager;
-import android.net.NetworkPolicyManager;
-import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.v7.preference.DropDownPreference;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -37,13 +34,11 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.wifi.WifiConfigUiBase;
import com.android.settings.wifi.WifiDialog;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.wifi.AccessPoint;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
/**
@@ -126,10 +121,10 @@
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
+ final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(
mAccessPoint,
- new ConnectivityManagerWrapper(cm),
+ cm,
context,
this,
new Handler(Looper.getMainLooper()), // UI thread.
diff --git a/src/com/android/settings/wrapper/ConnectivityManagerWrapper.java b/src/com/android/settings/wrapper/ConnectivityManagerWrapper.java
deleted file mode 100644
index c80a97b..0000000
--- a/src/com/android/settings/wrapper/ConnectivityManagerWrapper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 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.wrapper;
-
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkRequest;
-import android.os.Handler;
-import android.net.ProxyInfo;
-
-/**
- * This class replicates a subset of the android.net.ConnectivityManager (CM). The class
- * exists so that we can use a thin wrapper around the CM in production code and a mock in tests.
- * We cannot directly mock or shadow the CM, because some of the methods we rely on are marked as
- * hidden and are thus invisible to Robolectric.
- */
-public class ConnectivityManagerWrapper {
-
- private final ConnectivityManager mCm;
-
- public ConnectivityManagerWrapper(ConnectivityManager cm) {
- mCm = cm;
- }
-
- /**
- * Returns the real ConnectivityManager object wrapped by this wrapper.
- */
- public ConnectivityManager getConnectivityManager() {
- return mCm;
- }
-
- /**
- * Calls {@code ConnectivityManager.getAlwaysOnVpnPackageForUser()}.
- *
- * @see android.net.ConnectivityManager#getAlwaysOnVpnPackageForUser
- */
- public String getAlwaysOnVpnPackageForUser(int userId) {
- return mCm.getAlwaysOnVpnPackageForUser(userId);
- }
-
- /**
- * Calls {@code ConnectivityManager.getGlobalProxy()}.
- *
- * @see android.net.ConnectivityManager#getGlobalProxy
- */
- public ProxyInfo getGlobalProxy() {
- return mCm.getGlobalProxy();
- }
-
- /**
- * Calls {@code ConnectivityManager.registerNetworkCallback()}.
- *
- * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
- * to the robolectric tests, which currently build with SDK 23.
- * TODO: delete this once the robolectric tests build with SDK 26 or above.
- *
- * @see android.net.ConnectivityManager#registerNetworkCallback(NetworkRequest,NetworkCallback,Handler)
- */
- public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
- Handler handler) {
- mCm.registerNetworkCallback(request, callback, handler);
- }
-
- /**
- * Calls {@code ConnectivityManager.startCaptivePortalApp()}.
- *
- * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
- * to the robolectric tests, which currently build with SDK 23.
- * TODO: delete this once the robolectric tests build with SDK 26 or above.
- *
- * @see android.net.ConnectivityManager#startCaptivePortalApp(Network)
- */
- public void startCaptivePortalApp(Network network) {
- mCm.startCaptivePortalApp(network);
- }
-
- /**
- * {@link ConnectivityManager#stopTethering}
- */
- public void stopTethering(int type) {
- mCm.stopTethering(type);
- }
-}
diff --git a/src/com/android/settings/wrapper/IPackageManagerWrapper.java b/src/com/android/settings/wrapper/IPackageManagerWrapper.java
deleted file mode 100644
index 9bb2df7..0000000
--- a/src/com/android/settings/wrapper/IPackageManagerWrapper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 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.wrapper;
-
-import android.content.Intent;
-import android.content.pm.IPackageManager;
-import android.content.pm.PackageInfo;
-import android.content.pm.ParceledListSlice;
-import android.content.pm.ResolveInfo;
-import android.os.RemoteException;
-
-/**
- * This class replicates a subset of the android.content.pm.IPackageManager (PMS). The class
- * exists so that we can use a thin wrapper around the PMS in production code and a mock in tests.
- * We cannot directly mock or shadow the PMS, because some of the methods we rely on are newer than
- * the API version supported by Robolectric.
- */
-public class IPackageManagerWrapper {
-
- private final IPackageManager mPms;
-
- public IPackageManagerWrapper(IPackageManager pms) {
- mPms = pms;
- }
-
- /**
- * Calls {@code IPackageManager.checkUidPermission()}.
- *
- * @see android.content.pm.IPackageManager#checkUidPermission
- */
- public int checkUidPermission(String permName, int uid) throws RemoteException {
- return mPms.checkUidPermission(permName, uid);
- }
-
- /**
- * Calls {@code IPackageManager.findPersistentPreferredActivity()}.
- *
- * @see android.content.pm.IPackageManager#findPersistentPreferredActivity
- */
- public ResolveInfo findPersistentPreferredActivity(Intent intent, int userId)
- throws RemoteException {
- return mPms.findPersistentPreferredActivity(intent, userId);
- }
-
- /**
- * Calls {@code IPackageManager.getPackageInfo()}.
- *
- * @see android.content.pm.IPackageManager#getPackageInfo
- */
- public PackageInfo getPackageInfo(String packageName, int flags, int userId)
- throws RemoteException {
- return mPms.getPackageInfo(packageName, flags, userId);
- }
-
- /**
- * Calls {@code IPackageManager.getAppOpPermissionPackages()}.
- *
- * @see android.content.pm.IPackageManager#getAppOpPermissionPackages
- */
- public String[] getAppOpPermissionPackages(String permissionName) throws RemoteException {
- return mPms.getAppOpPermissionPackages(permissionName);
- }
-
- /**
- * Calls {@code IPackageManager.isPackageAvailable()}.
- *
- * @see android.content.pm.IPackageManager#isPackageAvailable
- */
- public boolean isPackageAvailable(String packageName, int userId) throws RemoteException {
- return mPms.isPackageAvailable(packageName, userId);
- }
-
- /**
- * Calls {@code IPackageManager.getPackagesHoldingPermissions()}.
- *
- * @see android.content.pm.IPackageManager#getPackagesHoldingPermissions
- */
- public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
- String[] permissions, int flags, int userId) throws RemoteException {
- return mPms.getPackagesHoldingPermissions(permissions, flags, userId);
- }
-
-}
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/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
index 2df0117..a4eeacd 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -23,11 +23,11 @@
import android.Manifest;
import android.app.AppOpsManager;
import android.content.Context;
+import android.content.pm.IPackageManager;
import android.os.RemoteException;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import org.junit.Before;
@@ -41,7 +41,7 @@
@Mock private Context mContext;
@Mock private UserManager mUserManager;
- @Mock private IPackageManagerWrapper mPackageManagerService;
+ @Mock private IPackageManager mPackageManagerService;
@Mock private AppOpsManager mAppOpsManager;
@Before
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index a0bae85..dcc6a1e 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -29,6 +29,7 @@
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Build;
@@ -37,7 +38,6 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -81,7 +81,7 @@
@Mock
private PackageManagerWrapper mPackageManager;
@Mock
- private IPackageManagerWrapper mPackageManagerService;
+ private IPackageManager mPackageManagerService;
@Mock
private DevicePolicyManager mDevicePolicyManager;
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 940fd4b..8365db2 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Build;
@@ -34,7 +35,6 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -78,7 +78,7 @@
@Mock
private PackageManagerWrapper mPackageManager;
@Mock
- private IPackageManagerWrapper mPackageManagerService;
+ private IPackageManager mPackageManagerService;
@Mock
private DevicePolicyManager mDevicePolicyManager;
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 8afb798..a457ba2 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -24,6 +24,7 @@
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
@@ -33,7 +34,6 @@
import com.android.settings.testutils.ApplicationTestUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.IPackageManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -72,7 +72,7 @@
@Mock
private PackageManagerWrapper mPackageManager;
@Mock
- private IPackageManagerWrapper mPackageManagerService;
+ private IPackageManager mPackageManagerService;
@Mock
private DevicePolicyManager mDevicePolicyManager;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
index 5d24180..a453f78 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
@@ -105,4 +105,49 @@
assertThat(controller.getArguments().containsKey(EXTRA_FRAGMENT_ARG_KEY)).isTrue();
assertThat(controller.getArguments().getString(EXTRA_FRAGMENT_ARG_KEY)).isEqualTo("test");
}
+
+ @Test
+ public void getNotificationSummary_noCrashOnNull() {
+ mController.getNotificationSummary(null, mContext);
+ }
+
+ @Test
+ public void getNotificationSummary_appBlocked() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ appRow.banned = true;
+ appRow.blockedChannelCount = 30;
+ assertThat(mController.getNotificationSummary(appRow, mContext).toString())
+ .isEqualTo("Off");
+ }
+
+ @Test
+ public void getNotificationSummary_appNotBlockedAllChannelsBlocked() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ appRow.banned = false;
+ appRow.blockedChannelCount = 30;
+ appRow.channelCount = 30;
+ assertThat(mController.getNotificationSummary(appRow, mContext).toString())
+ .isEqualTo("Off");
+ }
+
+ @Test
+ public void getNotificationSummary_appNotBlocked() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ appRow.banned = false;
+ appRow.blockedChannelCount = 30;
+ appRow.channelCount = 60;
+ assertThat(mController.getNotificationSummary(
+ appRow, mContext).toString().contains("30")).isTrue();
+ assertThat(mController.getNotificationSummary(
+ appRow, mContext).toString().contains("On")).isTrue();
+ }
+
+ @Test
+ public void getNotificationSummary_channelsNotBlocked() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ appRow.banned = false;
+ appRow.blockedChannelCount = 0;
+ appRow.channelCount = 10;
+ assertThat(mController.getNotificationSummary(appRow, mContext).toString()).isEqualTo("On");
+ }
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
index 32926b4..ccd66e8 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
@@ -128,6 +128,10 @@
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title_turn_off_backups));
+ mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_SUSPEND_PACKAGES);
+ assertEquals(Shadows.shadowOf(textView).innerText(),
+ mActivity.getString(R.string.disabled_by_policy_title_suspend_packages));
+
mHelper.setAdminSupportTitle(view, "another restriction");
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title));
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index beb0a3c..40371d7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -28,6 +28,7 @@
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.content.res.Resources;
+import android.net.ConnectivityManager;
import android.net.ProxyInfo;
import android.os.UserHandle;
import android.os.UserManager;
@@ -36,7 +37,6 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
@@ -72,7 +72,7 @@
private @Mock PackageManagerWrapper mPackageManagerWrapper;
private @Mock PackageManager mPackageManager;
private @Mock UserManager mUserManager;
- private @Mock ConnectivityManagerWrapper mConnectivityManger;
+ private @Mock ConnectivityManager mConnectivityManger;
private Resources mResources;
private EnterprisePrivacyFeatureProvider mProvider;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
index 14627c5..d983dfc 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -17,8 +17,10 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -48,7 +50,8 @@
@RunWith(SettingsRobolectricTestRunner.class)
public class HighUsageDetectorTest {
- private static final int UID = 123;
+ private static final int UID_HIGH = 123;
+ private static final int UID_ZERO = 345;
private static final long SCREEN_ON_TIME_MS = DateUtils.HOUR_IN_MILLIS;
private Context mContext;
@Mock
@@ -56,7 +59,9 @@
@Mock
private BatteryUtils mBatteryUtils;
@Mock
- private BatterySipper mBatterySipper;
+ private BatterySipper mHighBatterySipper;
+ @Mock
+ private BatterySipper mZeroBatterySipper;
@Mock
private HighUsageDataParser mDataParser;
@@ -75,14 +80,25 @@
mHighUsageDetector.mBatteryUtils = mBatteryUtils;
mHighUsageDetector.mDataParser = mDataParser;
doNothing().when(mHighUsageDetector).parseBatteryData();
- doReturn(UID).when(mBatterySipper).getUid();
+ doReturn(UID_HIGH).when(mHighBatterySipper).getUid();
+ mHighBatterySipper.uidObj = mock(BatteryStats.Uid.class);
+ mZeroBatterySipper.uidObj = mock(BatteryStats.Uid.class);
+ doReturn(UID_ZERO).when(mZeroBatterySipper).getUid();
mAppInfo = new AppInfo.Builder()
- .setUid(UID)
+ .setUid(UID_HIGH)
.setScreenOnTimeMs(SCREEN_ON_TIME_MS)
.build();
+ doReturn(SCREEN_ON_TIME_MS).when(mBatteryUtils).getProcessTimeMs(
+ BatteryUtils.StatusType.FOREGROUND, mHighBatterySipper.uidObj,
+ BatteryStats.STATS_SINCE_CHARGED);
+ doReturn(0L).when(mBatteryUtils).getProcessTimeMs(
+ BatteryUtils.StatusType.FOREGROUND, mZeroBatterySipper.uidObj,
+ BatteryStats.STATS_SINCE_CHARGED);
+
mUsageList = new ArrayList<>();
- mUsageList.add(mBatterySipper);
+ mUsageList.add(mHighBatterySipper);
+ when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
}
@Test
@@ -95,10 +111,16 @@
@Test
public void testDetect_containsHighUsageApp_tipVisible() {
doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
- when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
- doReturn(SCREEN_ON_TIME_MS).when(mBatteryUtils).getProcessTimeMs(
- BatteryUtils.StatusType.FOREGROUND, mBatterySipper.uidObj,
- BatteryStats.STATS_SINCE_CHARGED);
+
+ final HighUsageTip highUsageTip = (HighUsageTip) mHighUsageDetector.detect();
+ assertThat(highUsageTip.isVisible()).isTrue();
+ assertThat(highUsageTip.getHighUsageAppList()).containsExactly(mAppInfo);
+ }
+
+ @Test
+ public void testDetect_containsHighUsageApp_removeZeroOne() {
+ doReturn(true).when(mDataParser).isDeviceHeavilyUsed();
+ mUsageList.add(mZeroBatterySipper);
final HighUsageTip highUsageTip = (HighUsageTip) mHighUsageDetector.detect();
assertThat(highUsageTip.isVisible()).isTrue();
diff --git a/tests/robotests/src/com/android/settings/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
similarity index 99%
rename from tests/robotests/src/com/android/settings/ApnEditorTest.java
rename to tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index aca460f..f3315e5 100644
--- a/tests/robotests/src/com/android/settings/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
@@ -40,7 +40,8 @@
import android.view.MenuItem;
import android.view.View;
-import com.android.settings.ApnEditor.ApnData;
+import com.android.settings.R;
+import com.android.settings.network.ApnEditor.ApnData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -52,7 +53,6 @@
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class ApnEditorTest {
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;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
index f354c43..fd41c36 100644
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -20,8 +20,9 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import android.net.ConnectivityManager;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -30,7 +31,7 @@
public final class VpnUtilsTest {
@Test
public void testIsAlwaysOnVpnSet() {
- final ConnectivityManagerWrapper cm = mock(ConnectivityManagerWrapper.class);
+ final ConnectivityManager cm = mock(ConnectivityManager.class);
when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn("com.example.vpn");
assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isTrue();
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index b7bc33e..66cbd30 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -26,7 +26,6 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.SwitchWidgetController;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
@@ -43,7 +42,7 @@
@Mock
private WifiManager mWifiManager;
@Mock
- private ConnectivityManagerWrapper mConnectivityManager;
+ private ConnectivityManager mConnectivityManager;
private WifiEnabler mEnabler;
@@ -52,7 +51,7 @@
MockitoAnnotations.initMocks(this);
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
mEnabler = new WifiEnabler(mContext, mock(SwitchWidgetController.class),
- mock(MetricsFeatureProvider.class), mConnectivityManager);
+ mock(MetricsFeatureProvider.class), mConnectivityManager);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 9c20d18..d08f922 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -51,7 +51,6 @@
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceScreen;
import android.view.View;
@@ -70,7 +69,6 @@
import com.android.settings.widget.ActionButtonPreferenceTest;
import com.android.settings.widget.EntityHeaderController;
import com.android.settings.wifi.WifiDetailPreference;
-import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.wifi.AccessPoint;
@@ -91,7 +89,6 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
-import java.util.List;
import java.util.stream.Collectors;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -119,8 +116,6 @@
@Mock
private ConnectivityManager mockConnectivityManager;
@Mock
- private ConnectivityManagerWrapper mockConnectivityManagerWrapper;
- @Mock
private Network mockNetwork;
@Mock
private NetworkInfo mockNetworkInfo;
@@ -173,8 +168,6 @@
private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
@Captor
private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
- @Captor
- private ArgumentCaptor<Preference> mIpv6AddressCaptor;
private Context mContext;
private Lifecycle mLifecycle;
@@ -245,12 +238,9 @@
when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
when(mockAccessPoint.getSecurityString(false)).thenReturn(SECURITY);
-
- when(mockConnectivityManagerWrapper.getConnectivityManager())
- .thenReturn(mockConnectivityManager);
when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
.thenReturn(mockNetworkInfo);
- doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
+ doNothing().when(mockConnectivityManager).registerNetworkCallback(
nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
mockButtonsPref = ActionButtonPreferenceTest.createMock();
when(mockButtonsPref.setButton1OnClickListener(mForgetClickListener.capture()))
@@ -281,7 +271,7 @@
private WifiDetailPreferenceController newWifiDetailPreferenceController() {
return new WifiDetailPreferenceController(
mockAccessPoint,
- mockConnectivityManagerWrapper,
+ mockConnectivityManager,
mContext,
mockFragment,
null, // Handler
@@ -362,7 +352,7 @@
public void networkCallback_shouldBeRegisteredOnResume() {
displayAndResume();
- verify(mockConnectivityManagerWrapper, times(1)).registerNetworkCallback(
+ verify(mockConnectivityManager, times(1)).registerNetworkCallback(
nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
}
@@ -779,8 +769,6 @@
displayAndResume();
- List<Preference> addrs = mIpv6AddressCaptor.getAllValues();
-
String expectedAddresses = String.join("\n",
asString(Constants.IPV6_LINKLOCAL),
asString(Constants.IPV6_GLOBAL1),
@@ -826,7 +814,7 @@
ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
verify(mockButtonsPref).setButton2OnClickListener(captor.capture());
captor.getValue().onClick(null);
- verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
+ verify(mockConnectivityManager).startCaptivePortalApp(mockNetwork);
verify(mockMetricsFeatureProvider)
.action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
}