diff --git a/res/values/config.xml b/res/values/config.xml index ee727bcb2e4..28bf7232aca 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -710,4 +710,9 @@ + + + + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0d54cf437f3..de33ec77496 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -412,10 +412,10 @@ 0dp - 38dp - 38dp + 48dp + 48dp 2dp - 32dp + 42dp 3dp 1dp diff --git a/res/xml/accounts_work_dashboard_settings_credman.xml b/res/xml/accounts_work_dashboard_settings_credman.xml index 155947629dc..2946a217cd5 100644 --- a/res/xml/accounts_work_dashboard_settings_credman.xml +++ b/res/xml/accounts_work_dashboard_settings_credman.xml @@ -22,9 +22,9 @@ android:title="@string/account_dashboard_title" settings:keywords="@string/keywords_accounts"> - - + { + mSubscriptionInfoEntity = mMobileNetworkRepository.getSubInfoById( + String.valueOf(mSubId)); + }); mDataStateListener = new MobileDataEnabledListener(activity, this); } @@ -451,7 +463,23 @@ public class DataUsageList extends DataUsageBaseFragment } Collections.sort(items); + final List packageNames = Arrays.asList(getContext().getResources().getStringArray( + R.array.datausage_hiding_carrier_service_package_names)); + boolean shouldHidePackageName = mSubscriptionInfoEntity != null + ? Arrays.stream(getContext().getResources().getIntArray( + R.array.datausage_hiding_carrier_service_carrier_id)) + .anyMatch(carrierId -> (carrierId == mSubscriptionInfoEntity.carrierId)) + : false; + for (int i = 0; i < items.size(); i++) { + UidDetail detail = mUidDetailProvider.getUidDetail(items.get(i).key, true); + // Do not show carrier service package in data usage list if it should be hidden for + // the carrier. + if (detail != null && shouldHidePackageName && packageNames.contains( + detail.packageName)) { + continue; + } + final int percentTotal = largest != 0 ? (int) (items.get(i).total * 100 / largest) : 0; final AppDataUsagePreference preference = new AppDataUsagePreference(getContext(), items.get(i), percentTotal, mUidDetailProvider); diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java index 2cfb526d0fb..827f0fccb4e 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java @@ -204,8 +204,7 @@ public class BatteryHistEntry { @Override public String toString() { - final String recordAtDateTime = - ConvertUtils.utcToLocalTime(/*context=*/ null, mTimestamp); + final String recordAtDateTime = ConvertUtils.utcToLocalTimeForLogging(mTimestamp); final StringBuilder builder = new StringBuilder() .append("\nBatteryHistEntry{") .append(String.format("\n\tpackage=%s|label=%s|uid=%d|userId=%d|isHidden=%b", diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java index d61b2764633..7f112ae7078 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java @@ -45,7 +45,8 @@ public class BatteryUsageStatsLoader extends AsyncLoaderCompat entryMap = processedBatteryHistoryMap.get(timestamp); if (entryMap == null || entryMap.isEmpty()) { Log.e(TAG, "abnormal entry list in the timestamp:" - + utcToLocalTime(context, timestamp)); + + ConvertUtils.utcToLocalTimeForLogging(timestamp)); return null; } // The current time battery history hasn't been loaded yet, returns the current battery @@ -1934,7 +1933,7 @@ public final class DataProcessor { final BatteryHistEntry entry) { if (sDebug) { Log.d(TAG, String.format(entry != null ? "%s %s:\n%s" : "%s %s:%s", - utcToLocalTime(context, timestamp), content, entry)); + ConvertUtils.utcToLocalTimeForLogging(timestamp), content, entry)); } } } diff --git a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java index f1e72f07b05..ef1434cb4a0 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java @@ -39,15 +39,12 @@ import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase; import com.android.settingslib.fuelgauge.BatteryStatus; import java.io.PrintWriter; -import java.text.SimpleDateFormat; import java.time.Clock; import java.time.Duration; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -134,9 +131,10 @@ public final class DatabaseUtils { .build(); final long latestTimestamp = loadAppUsageLatestTimestampFromContentProvider(context, appUsageLatestTimestampUri); + final String latestTimestampString = ConvertUtils.utcToLocalTimeForLogging(latestTimestamp); Log.d(TAG, String.format( - "getAppUsageStartTimestampOfUser() userId=%d latestTimestamp=%d in %d/ms", - userId, latestTimestamp, (System.currentTimeMillis() - startTime))); + "getAppUsageStartTimestampOfUser() userId=%d latestTimestamp=%s in %d/ms", + userId, latestTimestampString, (System.currentTimeMillis() - startTime))); // Use (latestTimestamp + 1) here to avoid loading the events of the latestTimestamp // repeatedly. return Math.max(latestTimestamp + 1, earliestTimestamp); @@ -154,7 +152,8 @@ public final class DatabaseUtils { // sure the app usage calculation near the boundaries is correct. final long queryTimestamp = Math.max(rawStartTimestamp, sixDaysAgoTimestamp) - USAGE_QUERY_BUFFER_HOURS; - Log.d(TAG, "sixDayAgoTimestamp: " + sixDaysAgoTimestamp); + Log.d(TAG, "sixDayAgoTimestamp: " + ConvertUtils.utcToLocalTimeForLogging( + sixDaysAgoTimestamp)); final String queryUserIdString = userIds.stream() .map(userId -> String.valueOf(userId)) .collect(Collectors.joining(",")); @@ -182,7 +181,8 @@ public final class DatabaseUtils { Context context, Calendar calendar) { final long startTime = System.currentTimeMillis(); final long sixDaysAgoTimestamp = getTimestampSixDaysAgo(calendar); - Log.d(TAG, "sixDayAgoTimestamp: " + sixDaysAgoTimestamp); + Log.d(TAG, "sixDayAgoTimestamp: " + ConvertUtils.utcToLocalTimeForLogging( + sixDaysAgoTimestamp)); // Builds the content uri everytime to avoid cache. final Uri batteryStateUri = new Uri.Builder() @@ -410,7 +410,9 @@ public final class DatabaseUtils { static void recordDateTime(Context context, String preferenceKey) { final SharedPreferences sharedPreferences = getSharedPreferences(context); if (sharedPreferences != null) { - sharedPreferences.edit().putString(preferenceKey, getCurrentDateTime()).apply(); + final String currentTime = ConvertUtils.utcToLocalTimeForLogging( + System.currentTimeMillis()); + sharedPreferences.edit().putString(preferenceKey, currentTime).apply(); } } @@ -519,9 +521,4 @@ public final class DatabaseUtils { Log.w(TAG, "invoke clearMemory()"); }, CLEAR_MEMORY_DELAYED_MS); } - - private static String getCurrentDateTime() { - return new SimpleDateFormat("MMM dd,yyyy HH:mm:ss", Locale.getDefault()) - .format(new Date(System.currentTimeMillis())); - } } diff --git a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java index 2b18e9237a5..3d78c00c46f 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java +++ b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java @@ -26,11 +26,8 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; -import java.text.SimpleDateFormat; import java.time.Clock; import java.time.Duration; -import java.util.Date; -import java.util.Locale; /** Manages the periodic job to schedule or cancel the next job. */ public final class PeriodicJobManager { @@ -41,8 +38,6 @@ public final class PeriodicJobManager { private final Context mContext; private final AlarmManager mAlarmManager; - private final SimpleDateFormat mSimpleDateFormat = - new SimpleDateFormat("MMM dd,yyyy HH:mm:ss", Locale.ENGLISH); @VisibleForTesting static final int DATA_FETCH_INTERVAL_MINUTE = 60; @@ -69,7 +64,6 @@ public final class PeriodicJobManager { } /** Schedules the next alarm job if it is available. */ - @SuppressWarnings("JavaUtilDate") public void refreshJob(final boolean fromBoot) { if (mAlarmManager == null) { Log.e(TAG, "cannot schedule next alarm job"); @@ -83,7 +77,7 @@ public final class PeriodicJobManager { mAlarmManager.setExactAndAllowWhileIdle( AlarmManager.RTC_WAKEUP, triggerAtMillis, pendingIntent); Log.d(TAG, "schedule next alarm job at " - + mSimpleDateFormat.format(new Date(triggerAtMillis))); + + ConvertUtils.utcToLocalTimeForLogging(triggerAtMillis)); } void cancelJob(PendingIntent pendingIntent) { diff --git a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java index acf71ff4e95..9be378bacb1 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.batteryusage.bugreport; import android.content.Context; import android.util.Log; +import com.android.settings.fuelgauge.batteryusage.ConvertUtils; import com.android.settings.fuelgauge.batteryusage.DatabaseUtils; import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventDao; import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity; @@ -27,12 +28,9 @@ import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDao; import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase; import java.io.PrintWriter; -import java.text.SimpleDateFormat; import java.time.Clock; import java.time.Duration; -import java.util.Date; import java.util.List; -import java.util.Locale; /** A utility class to aggregate and provide required log data. */ public final class LogUtils { @@ -40,7 +38,6 @@ public final class LogUtils { private static final Duration DUMP_TIME_OFFSET = Duration.ofHours(24); private static final Duration DUMP_TIME_OFFSET_FOR_ENTRY = Duration.ofHours(4); - @SuppressWarnings("JavaUtilDate") static void dumpBatteryUsageDatabaseHist(Context context, PrintWriter writer) { DatabaseUtils.dump(context, writer); writer.flush(); @@ -60,10 +57,8 @@ public final class LogUtils { return; } // Dumps all distinct timestamps. - final SimpleDateFormat formatter = - new SimpleDateFormat("MMM dd, HH:mm:ss", Locale.US); timestamps.forEach(timestamp -> { - final String formattedTimestamp = formatter.format(new Date(timestamp)); + final String formattedTimestamp = ConvertUtils.utcToLocalTimeForLogging(timestamp); writer.println("\t" + formattedTimestamp); Log.w(TAG, "\t" + formattedTimestamp); }); @@ -74,7 +69,6 @@ public final class LogUtils { stateList.stream().forEach(state -> writer.println(state)); } - @SuppressWarnings("JavaUtilDate") static void dumpAppUsageDatabaseHist(Context context, PrintWriter writer) { final AppUsageEventDao dao = BatteryStateDatabase diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntity.java b/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntity.java index 9d62d079e91..c08c735da86 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntity.java +++ b/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntity.java @@ -21,19 +21,15 @@ import android.content.ContentValues; import androidx.room.Entity; import androidx.room.PrimaryKey; +import com.android.settings.fuelgauge.batteryusage.ConvertUtils; + import com.google.errorprone.annotations.CanIgnoreReturnValue; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.Locale; -import java.util.TimeZone; /** A {@link Entity} class to save app usage events into database. */ @Entity public class AppUsageEventEntity { - private static String sCacheZoneId; - private static SimpleDateFormat sCacheSimpleDateFormat; - /** Keys for accessing {@link ContentValues}. */ public static final String KEY_UID = "uid"; public static final String KEY_USER_ID = "userId"; @@ -83,14 +79,8 @@ public class AppUsageEventEntity { } @Override - @SuppressWarnings("JavaUtilDate") public String toString() { - final String currentZoneId = TimeZone.getDefault().getID(); - if (!currentZoneId.equals(sCacheZoneId) || sCacheSimpleDateFormat == null) { - sCacheZoneId = currentZoneId; - sCacheSimpleDateFormat = new SimpleDateFormat("MMM dd,yyyy HH:mm:ss", Locale.US); - } - final String recordAtDateTime = sCacheSimpleDateFormat.format(new Date(timestamp)); + final String recordAtDateTime = ConvertUtils.utcToLocalTimeForLogging(timestamp); final StringBuilder builder = new StringBuilder() .append("\nAppUsageEvent{") .append(String.format(Locale.US, diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryState.java b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryState.java index 9139c10df44..190c27420dc 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryState.java +++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryState.java @@ -23,20 +23,15 @@ import androidx.room.PrimaryKey; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batteryusage.BatteryInformation; +import com.android.settings.fuelgauge.batteryusage.ConvertUtils; import com.google.errorprone.annotations.CanIgnoreReturnValue; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.Locale; -import java.util.TimeZone; /** A {@link Entity} class to save battery states snapshot into database. */ @Entity public class BatteryState { - private static String sCacheZoneId; - private static SimpleDateFormat sCacheSimpleDateFormat; - @PrimaryKey(autoGenerate = true) private long mId; @@ -91,14 +86,8 @@ public class BatteryState { } @Override - @SuppressWarnings("JavaUtilDate") public String toString() { - final String currentZoneId = TimeZone.getDefault().getID(); - if (!currentZoneId.equals(sCacheZoneId) || sCacheSimpleDateFormat == null) { - sCacheZoneId = currentZoneId; - sCacheSimpleDateFormat = new SimpleDateFormat("MMM dd,yyyy HH:mm:ss", Locale.US); - } - final String recordAtDateTime = sCacheSimpleDateFormat.format(new Date(timestamp)); + final String recordAtDateTime = ConvertUtils.utcToLocalTimeForLogging(timestamp); final BatteryInformation batteryInformationInstance = BatteryUtils.parseProtoFromString( batteryInformation, BatteryInformation.getDefaultInstance()); diff --git a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java index 4c4c99dcd1a..d8c856e6a98 100644 --- a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java +++ b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; +import android.os.UserManager; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; @@ -51,7 +52,7 @@ public class SilentStatusBarPreferenceController extends TogglePreferenceControl @Override public int getAvailabilityStatus() { - return AVAILABLE; + return UserManager.get(mContext).isGuestUser() ? DISABLED_FOR_USER : AVAILABLE; } @Override diff --git a/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java index a913b9e6752..9d1dbfb9435 100644 --- a/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java @@ -16,14 +16,21 @@ package com.android.settings.notification; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.robolectric.Shadows.shadowOf; import android.content.Context; +import android.content.pm.UserInfo; +import android.os.UserHandle; +import android.os.UserManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -35,6 +42,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.shadows.ShadowUserManager; @RunWith(RobolectricTestRunner.class) public class SilentStatusBarPreferenceControllerTest { @@ -59,6 +67,27 @@ public class SilentStatusBarPreferenceControllerTest { when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } + @Test + public void isAvailable_systemUser_available() { + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + public void isAvailable_extraUser_available() { + ShadowUserManager um = shadowOf(mContext.getSystemService(UserManager.class)); + um.addUser(UserHandle.myUserId(), "Another User", UserInfo.FLAG_FULL); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + public void isAvailable_guestUser_disabled() { + ShadowUserManager um = shadowOf(mContext.getSystemService(UserManager.class)); + um.addUser(UserHandle.myUserId(), "Guest", UserInfo.FLAG_GUEST); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER); + } + @Test public void isChecked_settingIsOff() { when(mBackend.shouldHideSilentStatusBarIcons(any())).thenReturn(false); diff --git a/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java index 55e1f1a23c7..15b2ae94901 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/AutoPinConfirmPreferenceControllerTest.java @@ -86,7 +86,7 @@ public class AutoPinConfirmPreferenceControllerTest { "true", /* makeDefault */ false); when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID)) .thenReturn(LockPatternUtils.CREDENTIAL_TYPE_PIN); - when(mLockPatternUtils.getPinLength(TEST_USER_ID)).thenReturn(5L); + when(mLockPatternUtils.getPinLength(TEST_USER_ID)).thenReturn(5); assertThat(mController.isAvailable()).isFalse(); } @@ -98,7 +98,7 @@ public class AutoPinConfirmPreferenceControllerTest { when(mLockPatternUtils.isSecure(TEST_USER_ID)).thenReturn(true); when(mLockPatternUtils.getCredentialTypeForUser(TEST_USER_ID)) .thenReturn(LockPatternUtils.CREDENTIAL_TYPE_PIN); - when(mLockPatternUtils.getPinLength(TEST_USER_ID)).thenReturn(6L); + when(mLockPatternUtils.getPinLength(TEST_USER_ID)).thenReturn(6); assertThat(mController.isAvailable()).isTrue(); }