PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Inclusive language for Data Usage

Browse Source 
Change wordings in data usage part into inclusive language.

Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
This commit is contained in:
Bonian Chen
2020-07-08 02:47:18 +08:00
parent 0d34f6c80b
commit a5f08854e3
16 changed files with 120 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/AllInOneTetherSettings.java
View File

@@ -304,12 +304,12 @@ public class AllInOneTetherSettings extends RestrictedDashboardFragment
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
// Do nothing // Do nothing
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
// Do nothing // Do nothing
} }

4
src/com/android/settings/TetherSettings.java
View File

@@ -218,11 +218,11 @@ public class TetherSettings extends RestrictedSettingsFragment
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
} }
@VisibleForTesting @VisibleForTesting

2
src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
View File

@@ -110,7 +110,7 @@ public class SpecialAppAccessPreferenceController extends BasePreferenceControll
continue; continue;
} }
if (entry.extraInfo instanceof DataUsageState if (entry.extraInfo instanceof DataUsageState
&& ((DataUsageState) entry.extraInfo).isDataSaverWhitelisted) { && ((DataUsageState) entry.extraInfo).isDataSaverAllowlisted) {
count++; count++;
} }
} }

14
src/com/android/settings/datausage/AppDataUsage.java
View File

@@ -235,11 +235,11 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mRestrictBackground) { if (preference == mRestrictBackground) {
mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue); mDataSaverBackend.setIsDenylisted(mAppItem.key, mPackageName, !(Boolean) newValue);
updatePrefs(); updatePrefs();
return true; return true;
} else if (preference == mUnrestrictedData) { } else if (preference == mUnrestrictedData) {
mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue); mDataSaverBackend.setIsAllowlisted(mAppItem.key, mPackageName, (Boolean) newValue);
return true; return true;
} }
return false; return false;
@@ -330,7 +330,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
private boolean getUnrestrictData() { private boolean getUnrestrictData() {
if (mDataSaverBackend != null) { if (mDataSaverBackend != null) {
return mDataSaverBackend.isWhitelisted(mAppItem.key); return mDataSaverBackend.isAllowlisted(mAppItem.key);
} }
return false; return false;
} }
@@ -464,16 +464,16 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
if (mAppItem.uids.get(uid, false)) { if (mAppItem.uids.get(uid, false)) {
updatePrefs(getAppRestrictBackground(), isWhitelisted); updatePrefs(getAppRestrictBackground(), isAllowlisted);
} }
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
if (mAppItem.uids.get(uid, false)) { if (mAppItem.uids.get(uid, false)) {
updatePrefs(isBlacklisted, getUnrestrictData()); updatePrefs(isDenylisted, getUnrestrictData());
} }
} }
} }

18
src/com/android/settings/datausage/AppStateDataUsageBridge.java
View File

@@ -37,24 +37,24 @@ public class AppStateDataUsageBridge extends AppStateBaseBridge {
final int N = apps.size(); final int N = apps.size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
AppEntry app = apps.get(i); AppEntry app = apps.get(i);
app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(app.info.uid), app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(app.info.uid),
mDataSaverBackend.isBlacklisted(app.info.uid)); mDataSaverBackend.isDenylisted(app.info.uid));
} }
} }
@Override @Override
protected void updateExtraInfo(AppEntry app, String pkg, int uid) { protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(uid), app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(uid),
mDataSaverBackend.isBlacklisted(uid)); mDataSaverBackend.isDenylisted(uid));
} }
public static class DataUsageState { public static class DataUsageState {
public boolean isDataSaverWhitelisted; public boolean isDataSaverAllowlisted;
public boolean isDataSaverBlacklisted; public boolean isDataSaverDenylisted;
public DataUsageState(boolean isDataSaverWhitelisted, boolean isDataSaverBlacklisted) { public DataUsageState(boolean isDataSaverAllowlisted, boolean isDataSaverDenylisted) {
this.isDataSaverWhitelisted = isDataSaverWhitelisted; this.isDataSaverAllowlisted = isDataSaverAllowlisted;
this.isDataSaverBlacklisted = isDataSaverBlacklisted; this.isDataSaverDenylisted = isDataSaverDenylisted;
} }
} }
} }

76
src/com/android/settings/datausage/DataSaverBackend.java
View File

@@ -42,8 +42,8 @@ public class DataSaverBackend {
private final NetworkPolicyManager mPolicyManager; private final NetworkPolicyManager mPolicyManager;
private final ArrayList<Listener> mListeners = new ArrayList<>(); private final ArrayList<Listener> mListeners = new ArrayList<>();
private SparseIntArray mUidPolicies = new SparseIntArray(); private SparseIntArray mUidPolicies = new SparseIntArray();
private boolean mWhitelistInitialized; private boolean mAllowlistInitialized;
private boolean mBlacklistInitialized; private boolean mDenylistInitialized;
// TODO: Staticize into only one. // TODO: Staticize into only one.
public DataSaverBackend(Context context) { public DataSaverBackend(Context context) {
@@ -77,63 +77,63 @@ public class DataSaverBackend {
mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0); mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
} }
public void refreshWhitelist() { public void refreshAllowlist() {
loadWhitelist(); loadAllowlist();
} }
public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) { public void setIsAllowlisted(int uid, String packageName, boolean allowlisted) {
final int policy = whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE; final int policy = allowlisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
mPolicyManager.setUidPolicy(uid, policy); mPolicyManager.setUidPolicy(uid, policy);
mUidPolicies.put(uid, policy); mUidPolicies.put(uid, policy);
if (whitelisted) { if (allowlisted) {
mMetricsFeatureProvider.action( mMetricsFeatureProvider.action(
mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName); mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);
} }
} }
public boolean isWhitelisted(int uid) { public boolean isAllowlisted(int uid) {
loadWhitelist(); loadAllowlist();
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_ALLOW_METERED_BACKGROUND; return mUidPolicies.get(uid, POLICY_NONE) == POLICY_ALLOW_METERED_BACKGROUND;
} }
private void loadWhitelist() { private void loadAllowlist() {
if (mWhitelistInitialized) { if (mAllowlistInitialized) {
return; return;
} }
for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) { for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) {
mUidPolicies.put(uid, POLICY_ALLOW_METERED_BACKGROUND); mUidPolicies.put(uid, POLICY_ALLOW_METERED_BACKGROUND);
} }
mWhitelistInitialized = true; mAllowlistInitialized = true;
} }
public void refreshBlacklist() { public void refreshDenylist() {
loadBlacklist(); loadDenylist();
} }
public void setIsBlacklisted(int uid, String packageName, boolean blacklisted) { public void setIsDenylisted(int uid, String packageName, boolean denylisted) {
final int policy = blacklisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE; final int policy = denylisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
mPolicyManager.setUidPolicy(uid, policy); mPolicyManager.setUidPolicy(uid, policy);
mUidPolicies.put(uid, policy); mUidPolicies.put(uid, policy);
if (blacklisted) { if (denylisted) {
mMetricsFeatureProvider.action( mMetricsFeatureProvider.action(
mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName); mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);
} }
} }
public boolean isBlacklisted(int uid) { public boolean isDenylisted(int uid) {
loadBlacklist(); loadDenylist();
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND; return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND;
} }
private void loadBlacklist() { private void loadDenylist() {
if (mBlacklistInitialized) { if (mDenylistInitialized) {
return; return;
} }
for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) { for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) {
mUidPolicies.put(uid, POLICY_REJECT_METERED_BACKGROUND); mUidPolicies.put(uid, POLICY_REJECT_METERED_BACKGROUND);
} }
mBlacklistInitialized = true; mDenylistInitialized = true;
} }
private void handleRestrictBackgroundChanged(boolean isDataSaving) { private void handleRestrictBackgroundChanged(boolean isDataSaving) {
@@ -142,21 +142,21 @@ public class DataSaverBackend {
} }
} }
private void handleWhitelistChanged(int uid, boolean isWhitelisted) { private void handleAllowlistChanged(int uid, boolean isAllowlisted) {
for (int i = 0; i < mListeners.size(); i++) { for (int i = 0; i < mListeners.size(); i++) {
mListeners.get(i).onWhitelistStatusChanged(uid, isWhitelisted); mListeners.get(i).onAllowlistStatusChanged(uid, isAllowlisted);
} }
} }
private void handleBlacklistChanged(int uid, boolean isBlacklisted) { private void handleDenylistChanged(int uid, boolean isDenylisted) {
for (int i = 0; i < mListeners.size(); i++) { for (int i = 0; i < mListeners.size(); i++) {
mListeners.get(i).onBlacklistStatusChanged(uid, isBlacklisted); mListeners.get(i).onDenylistStatusChanged(uid, isDenylisted);
} }
} }
private void handleUidPoliciesChanged(int uid, int newPolicy) { private void handleUidPoliciesChanged(int uid, int newPolicy) {
loadWhitelist(); loadAllowlist();
loadBlacklist(); loadDenylist();
final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE); final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE);
if (newPolicy == POLICY_NONE) { if (newPolicy == POLICY_NONE) {
@@ -165,17 +165,17 @@ public class DataSaverBackend {
mUidPolicies.put(uid, newPolicy); mUidPolicies.put(uid, newPolicy);
} }
final boolean wasWhitelisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND; final boolean wasAllowlisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND; final boolean wasDenylisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
final boolean isWhitelisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND; final boolean isAllowlisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
final boolean isBlacklisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND; final boolean isDenylisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
if (wasWhitelisted != isWhitelisted) { if (wasAllowlisted != isAllowlisted) {
handleWhitelistChanged(uid, isWhitelisted); handleAllowlistChanged(uid, isAllowlisted);
} }
if (wasBlacklisted != isBlacklisted) { if (wasDenylisted != isDenylisted) {
handleBlacklistChanged(uid, isBlacklisted); handleDenylistChanged(uid, isDenylisted);
} }
} }
@@ -211,8 +211,8 @@ public class DataSaverBackend {
public interface Listener { public interface Listener {
void onDataSaverChanged(boolean isDataSaving); void onDataSaverChanged(boolean isDataSaving);
void onWhitelistStatusChanged(int uid, boolean isWhitelisted); void onAllowlistStatusChanged(int uid, boolean isAllowlisted);
void onBlacklistStatusChanged(int uid, boolean isBlacklisted); void onDenylistStatusChanged(int uid, boolean isDenylisted);
} }
} }

4
src/com/android/settings/datausage/DataSaverPreference.java
View File

@@ -48,10 +48,10 @@ public class DataSaverPreference extends Preference implements DataSaverBackend.
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
} }
} }

10
src/com/android/settings/datausage/DataSaverSummary.java
View File

@@ -82,8 +82,8 @@ public class DataSaverSummary extends SettingsPreferenceFragment
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
mDataSaverBackend.refreshWhitelist(); mDataSaverBackend.refreshAllowlist();
mDataSaverBackend.refreshBlacklist(); mDataSaverBackend.refreshDenylist();
mDataSaverBackend.addListener(this); mDataSaverBackend.addListener(this);
mDataUsageBridge.resume(); mDataUsageBridge.resume();
} }
@@ -125,11 +125,11 @@ public class DataSaverSummary extends SettingsPreferenceFragment
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
} }
@Override @Override
@@ -146,7 +146,7 @@ public class DataSaverSummary extends SettingsPreferenceFragment
continue; continue;
} }
if (entry.extraInfo != null && ((AppStateDataUsageBridge.DataUsageState) if (entry.extraInfo != null && ((AppStateDataUsageBridge.DataUsageState)
entry.extraInfo).isDataSaverWhitelisted) { entry.extraInfo).isDataSaverAllowlisted) {
count++; count++;
} }
} }

22
src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
View File

@@ -79,15 +79,15 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
@Override @Override
protected void onClick() { protected void onClick() {
if (mDataUsageState.isDataSaverBlacklisted) { if (mDataUsageState.isDataSaverDenylisted) {
// app is blacklisted, launch App Data Usage screen // app is denylisted, launch App Data Usage screen
AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class, AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
R.string.data_usage_app_summary_title, R.string.data_usage_app_summary_title,
null /* arguments */, null /* arguments */,
mParentFragment, mParentFragment,
mEntry); mEntry);
} else { } else {
// app is not blacklisted, let superclass handle toggle switch // app is not denylisted, let superclass handle toggle switch
super.onClick(); super.onClick();
} }
} }
@@ -119,7 +119,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
widgetFrame.setVisibility(View.VISIBLE); widgetFrame.setVisibility(View.VISIBLE);
} else { } else {
widgetFrame.setVisibility( widgetFrame.setVisibility(
mDataUsageState != null && mDataUsageState.isDataSaverBlacklisted mDataUsageState != null && mDataUsageState.isDataSaverDenylisted
? View.INVISIBLE : View.VISIBLE); ? View.INVISIBLE : View.VISIBLE);
} }
super.onBindViewHolder(holder); super.onBindViewHolder(holder);
@@ -136,17 +136,17 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
if (mDataUsageState != null && mEntry.info.uid == uid) { if (mDataUsageState != null && mEntry.info.uid == uid) {
mDataUsageState.isDataSaverWhitelisted = isWhitelisted; mDataUsageState.isDataSaverAllowlisted = isAllowlisted;
updateState(); updateState();
} }
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
if (mDataUsageState != null && mEntry.info.uid == uid) { if (mDataUsageState != null && mEntry.info.uid == uid) {
mDataUsageState.isDataSaverBlacklisted = isBlacklisted; mDataUsageState.isDataSaverDenylisted = isDenylisted;
updateState(); updateState();
} }
} }
@@ -167,14 +167,14 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
mHelper.setDisabledByAdmin(admin); mHelper.setDisabledByAdmin(admin);
} }
// Sets UI state based on whitelist/blacklist status. // Sets UI state based on allowlist/denylist status.
public void updateState() { public void updateState() {
setTitle(mEntry.label); setTitle(mEntry.label);
if (mDataUsageState != null) { if (mDataUsageState != null) {
setChecked(mDataUsageState.isDataSaverWhitelisted); setChecked(mDataUsageState.isDataSaverAllowlisted);
if (isDisabledByAdmin()) { if (isDisabledByAdmin()) {
setSummary(R.string.disabled_by_admin); setSummary(R.string.disabled_by_admin);
} else if (mDataUsageState.isDataSaverBlacklisted) { } else if (mDataUsageState.isDataSaverDenylisted) {
setSummary(R.string.restrict_background_blacklisted); setSummary(R.string.restrict_background_blacklisted);
} else { } else {
setSummary(""); setSummary("");

14
src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
View File

@@ -186,11 +186,11 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo
if (preference instanceof UnrestrictedDataAccessPreference) { if (preference instanceof UnrestrictedDataAccessPreference) {
final UnrestrictedDataAccessPreference final UnrestrictedDataAccessPreference
accessPreference = (UnrestrictedDataAccessPreference) preference; accessPreference = (UnrestrictedDataAccessPreference) preference;
boolean whitelisted = newValue == Boolean.TRUE; boolean allowlisted = newValue == Boolean.TRUE;
logSpecialPermissionChange(whitelisted, accessPreference.getEntry().info.packageName); logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName);
mDataSaverBackend.setIsWhitelisted(accessPreference.getEntry().info.uid, mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid,
accessPreference.getEntry().info.packageName, whitelisted); accessPreference.getEntry().info.packageName, allowlisted);
accessPreference.getDataUsageState().isDataSaverWhitelisted = whitelisted; accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted;
return true; return true;
} }
return false; return false;
@@ -224,8 +224,8 @@ public class UnrestrictedDataAccessPreferenceController extends BasePreferenceCo
} }
@VisibleForTesting @VisibleForTesting
void logSpecialPermissionChange(boolean whitelisted, String packageName) { void logSpecialPermissionChange(boolean allowlisted, String packageName) {
final int logCategory = whitelisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW final int logCategory = allowlisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY; : SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY;
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext, FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
logCategory, packageName); logCategory, packageName);

4
src/com/android/settings/network/TetherBasePreferenceController.java
View File

@@ -129,11 +129,11 @@ public abstract class TetherBasePreferenceController extends TogglePreferenceCon
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
} }
/** /**

4
src/com/android/settings/network/TetherEnabler.java
View File

@@ -368,12 +368,12 @@ public class TetherEnabler implements SwitchWidgetController.OnSwitchChangeListe
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
// we don't care, since we just want to read the value // we don't care, since we just want to read the value
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
// we don't care, since we just want to read the value // we don't care, since we just want to read the value
} }

4
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -162,12 +162,12 @@ public class WifiTetherSwitchBarController implements
} }
@Override @Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) { public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
// we don't care, since we just want to read the value // we don't care, since we just want to read the value
} }
@Override @Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) { public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
// we don't care, since we just want to read the value // we don't care, since we just want to read the value
} }
} }

4
tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
View File

@@ -124,7 +124,7 @@ public class ChartDataUsagePreferenceTest {
tonight - TimeUnit.DAYS.toMillis(2), tonight - TimeUnit.DAYS.toMillis(1), 83849690L)); tonight - TimeUnit.DAYS.toMillis(2), tonight - TimeUnit.DAYS.toMillis(1), 83849690L));
mNetworkCycleData.add(createNetworkCycleData( mNetworkCycleData.add(createNetworkCycleData(
tonight - TimeUnit.DAYS.toMillis(1), tonight, 1883657L)); tonight - TimeUnit.DAYS.toMillis(1), tonight, 1883657L));
// add dummy usage data for next 5 days // add test usage data for next 5 days
mNetworkCycleData.add(createNetworkCycleData( mNetworkCycleData.add(createNetworkCycleData(
tonight, tonight + TimeUnit.DAYS.toMillis(1), 0L)); tonight, tonight + TimeUnit.DAYS.toMillis(1), 0L));
mNetworkCycleData.add(createNetworkCycleData( mNetworkCycleData.add(createNetworkCycleData(
@@ -149,7 +149,7 @@ public class ChartDataUsagePreferenceTest {
verify(usageView).addPath(pointsCaptor.capture()); verify(usageView).addPath(pointsCaptor.capture());
final SparseIntArray points = pointsCaptor.getValue(); final SparseIntArray points = pointsCaptor.getValue();
// should only have 7 points: 1 dummy point indicating the start of data, starting point 0, // should only have 7 points: 1 test point indicating the start of data, starting point 0,
// and 5 actual data point for each day // and 5 actual data point for each day
assertThat(points.size()).isEqualTo(7); assertThat(points.size()).isEqualTo(7);
assertThat(points.keyAt(0)).isEqualTo(-1); assertThat(points.keyAt(0)).isEqualTo(-1);

52
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -61,7 +61,7 @@ public class DataUsageSummaryPreferenceTest {
private static final long CYCLE_DURATION_MILLIS = 1000000000L; private static final long CYCLE_DURATION_MILLIS = 1000000000L;
private static final long UPDATE_LAG_MILLIS = 10000000L; private static final long UPDATE_LAG_MILLIS = 10000000L;
private static final String DUMMY_CARRIER = "z-mobile"; private static final String FAKE_CARRIER = "z-mobile";
private Activity mActivity; private Activity mActivity;
private PreferenceViewHolder mHolder; private PreferenceViewHolder mHolder;
@@ -99,7 +99,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withLaunchIntent_launchButtonShown() { public void testSetUsageInfo_withLaunchIntent_launchButtonShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -108,7 +108,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withoutLaunchIntent_launchButtonNotShown() { public void testSetUsageInfo_withoutLaunchIntent_launchButtonNotShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
null /* launchIntent */); null /* launchIntent */);
bindViewHolder(); bindViewHolder();
@@ -117,7 +117,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withDataPlans_carrierInfoShown() { public void testSetUsageInfo_withDataPlans_carrierInfoShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -126,7 +126,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withNoDataPlans_carrierInfoNotShown() { public void testSetUsageInfo_withNoDataPlans_carrierInfoNotShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -140,12 +140,12 @@ public class DataUsageSummaryPreferenceTest {
final long updateTime = System.currentTimeMillis() final long updateTime = System.currentTimeMillis()
- TimeUnit.DAYS.toMillis(baseUnit) - TimeUnit.HOURS.toMillis(smudge); - TimeUnit.DAYS.toMillis(baseUnit) - TimeUnit.HOURS.toMillis(smudge);
mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update); mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " days ago"); .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " days ago");
} }
@Test @Test
@@ -155,12 +155,12 @@ public class DataUsageSummaryPreferenceTest {
final long updateTime = System.currentTimeMillis() final long updateTime = System.currentTimeMillis()
- TimeUnit.HOURS.toMillis(baseUnit) - TimeUnit.MINUTES.toMillis(smudge); - TimeUnit.HOURS.toMillis(baseUnit) - TimeUnit.MINUTES.toMillis(smudge);
mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update); mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " hr ago"); .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " hr ago");
} }
@Test @Test
@@ -170,24 +170,24 @@ public class DataUsageSummaryPreferenceTest {
final long updateTime = System.currentTimeMillis() final long updateTime = System.currentTimeMillis()
- TimeUnit.MINUTES.toMillis(baseUnit) - TimeUnit.SECONDS.toMillis(smudge); - TimeUnit.MINUTES.toMillis(baseUnit) - TimeUnit.SECONDS.toMillis(smudge);
mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update); mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " min ago"); .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " min ago");
} }
@Test @Test
public void testCarrierUpdateTime_shouldFormatLessThanMinuteCorrectly() { public void testCarrierUpdateTime_shouldFormatLessThanMinuteCorrectly() {
final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45); final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45);
mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update); mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
assertThat(mCarrierInfo.getText().toString()) assertThat(mCarrierInfo.getText().toString())
.isEqualTo("Updated by " + DUMMY_CARRIER + " just now"); .isEqualTo("Updated by " + FAKE_CARRIER + " just now");
} }
@Test @Test
@@ -218,7 +218,7 @@ public class DataUsageSummaryPreferenceTest {
public void setUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() { public void setUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() {
final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1); final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1);
mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update); mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -231,7 +231,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withStaleCarrierUpdate_setsCarrierInfoWarningColorAndFont() { public void testSetUsageInfo_withStaleCarrierUpdate_setsCarrierInfoWarningColorAndFont() {
final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(7); final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(7);
mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -244,7 +244,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withNoDataPlans_usageTitleNotShown() { public void testSetUsageInfo_withNoDataPlans_usageTitleNotShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -253,7 +253,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withMultipleDataPlans_usageTitleShown() { public void testSetUsageInfo_withMultipleDataPlans_usageTitleShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 2 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 2 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -264,7 +264,7 @@ public class DataUsageSummaryPreferenceTest {
public void testSetUsageInfo_cycleRemainingTimeIsLessOneDay() { public void testSetUsageInfo_cycleRemainingTimeIsLessOneDay() {
// just under one day // just under one day
final long cycleEnd = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(23); final long cycleEnd = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(23);
mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -276,7 +276,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_cycleRemainingTimeNegativeDaysLeft_shouldDisplayNoneLeft() { public void testSetUsageInfo_cycleRemainingTimeNegativeDaysLeft_shouldDisplayNoneLeft() {
final long cycleEnd = System.currentTimeMillis() - 1L; final long cycleEnd = System.currentTimeMillis() - 1L;
mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -290,7 +290,7 @@ public class DataUsageSummaryPreferenceTest {
final int daysLeft = 3; final int daysLeft = 3;
final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft) final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
+ TimeUnit.HOURS.toMillis(1); + TimeUnit.HOURS.toMillis(1);
mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
bindViewHolder(); bindViewHolder();
@@ -369,7 +369,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageAndRemainingInfo_withUsageInfo_dataUsageAndRemainingShown() { public void testSetUsageAndRemainingInfo_withUsageInfo_dataUsageAndRemainingShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
mSummaryPreference.setUsageNumbers( mSummaryPreference.setUsageNumbers(
BillingCycleSettings.MIB_IN_BYTES, BillingCycleSettings.MIB_IN_BYTES,
@@ -386,7 +386,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withDataOverusage() { public void testSetUsageInfo_withDataOverusage() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
mSummaryPreference.setUsageNumbers( mSummaryPreference.setUsageNumbers(
11 * BillingCycleSettings.MIB_IN_BYTES, 11 * BillingCycleSettings.MIB_IN_BYTES,
@@ -402,7 +402,7 @@ public class DataUsageSummaryPreferenceTest {
@Test @Test
public void testSetUsageInfo_withUsageInfo_dataUsageShown() { public void testSetUsageInfo_withUsageInfo_dataUsageShown() {
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
mSummaryPreference.setUsageNumbers( mSummaryPreference.setUsageNumbers(
BillingCycleSettings.MIB_IN_BYTES, -1L, true /* hasMobileData */); BillingCycleSettings.MIB_IN_BYTES, -1L, true /* hasMobileData */);
@@ -419,7 +419,7 @@ public class DataUsageSummaryPreferenceTest {
intent.setPackage("test-owner.example.com"); intent.setPackage("test-owner.example.com");
intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, 42); intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, 42);
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
intent); intent);
bindViewHolder(); bindViewHolder();
@@ -448,7 +448,7 @@ public class DataUsageSummaryPreferenceTest {
doReturn(dataUsed).when(mHolder).findViewById(R.id.data_usage_view); doReturn(dataUsed).when(mHolder).findViewById(R.id.data_usage_view);
doReturn(dataRemaining).when(mHolder).findViewById(R.id.data_remaining_view); doReturn(dataRemaining).when(mHolder).findViewById(R.id.data_remaining_view);
mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */, mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
new Intent()); new Intent());
mSummaryPreference.setUsageNumbers( mSummaryPreference.setUsageNumbers(
BillingCycleSettings.MIB_IN_BYTES, BillingCycleSettings.MIB_IN_BYTES,
@@ -484,7 +484,7 @@ public class DataUsageSummaryPreferenceTest {
+ TimeUnit.HOURS.toMillis(1); + TimeUnit.HOURS.toMillis(1);
final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class); final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
mSummaryPreference = spy(mSummaryPreference); mSummaryPreference = spy(mSummaryPreference);
mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */, mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
new Intent()); new Intent());
mSummaryPreference.setUsageNumbers(1000000L, -1L, true); mSummaryPreference.setUsageNumbers(1000000L, -1L, true);
final String cycleText = "The quick fox"; final String cycleText = "The quick fox";

3
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
View File

@@ -21,6 +21,7 @@ import static android.app.slice.Slice.HINT_TITLE;
import static android.app.slice.SliceItem.FORMAT_TEXT; import static android.app.slice.SliceItem.FORMAT_TEXT;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME; import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
@@ -152,7 +153,7 @@ public class WifiCallingSliceHelperTest {
mQueryImsState.setIsEnabledByUser(false); mQueryImsState.setIsEnabledByUser(false);
mQueryImsState.setIsTtyOnVolteEnabled(false); mQueryImsState.setIsTtyOnVolteEnabled(false);
when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null); when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
mWfcSliceHelper.setActivationAppIntent(new Intent()); // dummy Intent mWfcSliceHelper.setActivationAppIntent(new Intent()); // unused Intent
final Slice slice = mWfcSliceHelper.createWifiCallingSlice( final Slice slice = mWfcSliceHelper.createWifiCallingSlice(
CustomSliceRegistry.WIFI_CALLING_URI); CustomSliceRegistry.WIFI_CALLING_URI);