Merge "Changes screen flash color selected ring color in Flash Notifications" into udc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 476d487..ccf002a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3119,8 +3119,6 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
- <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
- <action android:name="android.intent.action.MY_PACKAGE_UNSUSPENDED"/>
<action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED"/>
<action android:name="com.android.settings.battery.action.PERIODIC_JOB_RECHECK"/>
</intent-filter>
diff --git a/res/values/config.xml b/res/values/config.xml
index ee727bc..28bf723 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -710,4 +710,9 @@
<item></item>
</string-array>
+ <!-- List of packages that should be hidden for MVNO. Do not translate -->
+ <string-array name="datausage_hiding_carrier_service_package_names" translatable="false"/>
+
+ <!-- List of MVNO. Do not translate -->
+ <integer-array name="datausage_hiding_carrier_service_carrier_id" translatable="false"/>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0d54cf4..de33ec7 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -412,10 +412,10 @@
<dimen name="sfps_enroll_find_sensor_lottie_margin">0dp</dimen>
<!-- Flash notifications dimensions -->
- <dimen name="screen_flash_color_button_frame_size">38dp</dimen>
- <dimen name="screen_flash_color_button_outer_circle_size">38dp</dimen>
+ <dimen name="screen_flash_color_button_frame_size">48dp</dimen>
+ <dimen name="screen_flash_color_button_outer_circle_size">48dp</dimen>
<dimen name="screen_flash_color_button_outer_circle_stroke_width">2dp</dimen>
- <dimen name="screen_flash_color_button_inner_circle_size">32dp</dimen>
+ <dimen name="screen_flash_color_button_inner_circle_size">42dp</dimen>
<dimen name="screen_flash_color_button_inner_circle_padding">3dp</dimen>
<dimen name="screen_flash_color_button_inner_circle_stroke">1dp</dimen>
</resources>
diff --git a/res/xml/accounts_work_dashboard_settings_credman.xml b/res/xml/accounts_work_dashboard_settings_credman.xml
index 1559476..2946a21 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">
- <com.android.settings.widget.WorkOnlyCategory
- android:key="autofill_work_app_defaults"
- android:order="30"
+ <PreferenceCategory
+ android:key="default_service_category"
+ android:order="10"
android:title="@string/default_autofill_app">
<com.android.settings.widget.GearPreference
@@ -36,11 +36,11 @@
android:name="for_work"
android:value="true" />
</com.android.settings.widget.GearPreference>
- </com.android.settings.widget.WorkOnlyCategory>
+ </PreferenceCategory>
<PreferenceCategory
android:key="credman_category"
- android:order="20"
+ android:order="50"
android:persistent="false"
android:title="@string/credman_credentials"
settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 68751e5..b1661e1 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -58,15 +58,20 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
import com.android.settings.network.MobileDataEnabledListener;
+import com.android.settings.network.MobileNetworkRepository;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.AppItem;
+import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import com.android.settingslib.net.NetworkCycleChartData;
import com.android.settingslib.net.NetworkCycleChartDataLoader;
import com.android.settingslib.net.NetworkStatsSummaryLoader;
+import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@ -118,6 +123,8 @@
private Preference mUsageAmount;
private PreferenceGroup mApps;
private View mHeader;
+ private MobileNetworkRepository mMobileNetworkRepository;
+ private SubscriptionInfoEntity mSubscriptionInfoEntity;
@Override
public int getMetricsCategory() {
@@ -146,6 +153,11 @@
}
processArgument();
+ mMobileNetworkRepository = MobileNetworkRepository.getInstance(getContext());
+ ThreadUtils.postOnBackgroundThread(() -> {
+ mSubscriptionInfoEntity = mMobileNetworkRepository.getSubInfoById(
+ String.valueOf(mSubId));
+ });
mDataStateListener = new MobileDataEnabledListener(activity, this);
}
@@ -451,7 +463,23 @@
}
Collections.sort(items);
+ final List<String> 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 2cfb526..827f0fc 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java
@@ -204,8 +204,7 @@
@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/BatteryUsageBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
index 9c7ec35..a437877 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
@@ -54,11 +54,13 @@
if (intent == null || intent.getAction() == null) {
return;
}
- Log.d(TAG, "onReceive:" + intent.getAction());
+ final String action = intent.getAction();
+ Log.d(TAG, "onReceive:" + action);
+ DatabaseUtils.recordDateTime(context, action);
final String fullChargeIntentAction = FeatureFactory.getFactory(context)
.getPowerUsageFeatureProvider(context)
.getFullChargeIntentAction();
- switch (intent.getAction()) {
+ switch (action) {
case Intent.ACTION_BATTERY_LEVEL_CHANGED:
// Only when fullChargeIntentAction is ACTION_BATTERY_LEVEL_CHANGED,
// ACTION_BATTERY_LEVEL_CHANGED will be considered as the full charge event and then
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
index d446bb2..fb1be3e 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
@@ -57,6 +57,10 @@
}
final long elapsedTime = System.currentTimeMillis() - start;
Log.d(TAG, String.format("getBatteryUsageStats() in %d/ms", elapsedTime));
+ if (isFullChargeStart) {
+ DatabaseUtils.recordDateTime(
+ context, DatabaseUtils.KEY_LAST_LOAD_FULL_CHARGE_TIME);
+ }
// Uploads the BatteryEntry data into database.
DatabaseUtils.sendBatteryEntryData(
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java
index d61b276..7f112ae 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageStatsLoader.java
@@ -45,7 +45,8 @@
builder.includeBatteryHistory();
}
try {
- return mBatteryStatsManager.getBatteryUsageStats(builder.build());
+ return mBatteryStatsManager.getBatteryUsageStats(
+ builder.includeProcessStateData().build());
} catch (RuntimeException e) {
Log.e(TAG, "loadInBackground() for getBatteryUsageStats()", e);
// Use default BatteryUsageStats.
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
index 8c9285e..64b5b77 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
@@ -61,8 +61,6 @@
switch (action) {
case Intent.ACTION_BOOT_COMPLETED:
- case Intent.ACTION_MY_PACKAGE_REPLACED:
- case Intent.ACTION_MY_PACKAGE_UNSUSPENDED:
case ACTION_SETUP_WIZARD_FINISHED:
case ACTION_PERIODIC_JOB_RECHECK:
Log.d(TAG, "refresh periodic job from action=" + action);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
index c1b7818..fcf934f 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
@@ -237,9 +237,10 @@
return eventBuilder.build();
}
- /** Converts UTC timestamp to human readable local time string. */
- public static String utcToLocalTime(Context context, long timestamp) {
- final Locale locale = getLocale(context);
+ /** Converts UTC timestamp to local time string for logging only, so use the US locale for
+ * better readability in debugging. */
+ public static String utcToLocalTimeForLogging(long timestamp) {
+ final Locale locale = Locale.US;
final String pattern =
DateFormat.getBestDateTimePattern(locale, "MMM dd,yyyy HH:mm:ss");
return DateFormat.format(pattern, timestamp).toString();
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index 338cb11..38d4e69 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batteryusage;
import static com.android.settings.fuelgauge.batteryusage.ConvertUtils.getEffectivePackageName;
-import static com.android.settings.fuelgauge.batteryusage.ConvertUtils.utcToLocalTime;
import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents;
@@ -1357,7 +1356,7 @@
final Map<String, BatteryHistEntry> 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 @@
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 655114f..ef1434c 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
@@ -19,6 +19,7 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
+import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
@@ -37,6 +38,7 @@
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase;
import com.android.settingslib.fuelgauge.BatteryStatus;
+import java.io.PrintWriter;
import java.time.Clock;
import java.time.Duration;
import java.util.ArrayList;
@@ -50,12 +52,15 @@
/** A utility class to operate battery usage database. */
public final class DatabaseUtils {
private static final String TAG = "DatabaseUtils";
+ private static final String SHARED_PREFS_FILE = "battery_usage_shared_prefs";
+
/** Clear memory threshold for device booting phase. **/
private static final long CLEAR_MEMORY_THRESHOLD_MS = Duration.ofMinutes(5).toMillis();
private static final long CLEAR_MEMORY_DELAYED_MS = Duration.ofSeconds(2).toMillis();
- @VisibleForTesting
static final int DATA_RETENTION_INTERVAL_DAY = 9;
+ static final String KEY_LAST_LOAD_FULL_CHARGE_TIME = "last_load_full_charge_time";
+ static final String KEY_LAST_UPLOAD_FULL_CHARGE_TIME = "last_upload_full_charge_time";
/** An authority name of the battery content provider. */
public static final String AUTHORITY = "com.android.settings.battery.usage.provider";
@@ -126,9 +131,10 @@
.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);
@@ -146,7 +152,8 @@
// 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(","));
@@ -174,7 +181,8 @@
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()
@@ -373,10 +381,50 @@
resolver.notifyChange(BATTERY_CONTENT_URI, /*observer=*/ null);
Log.d(TAG, String.format("sendBatteryEntryData() size=%d in %d/ms",
size, (System.currentTimeMillis() - startTime)));
+ if (isFullChargeStart) {
+ recordDateTime(context, KEY_LAST_UPLOAD_FULL_CHARGE_TIME);
+ }
clearMemory();
return valuesList;
}
+ /** Dump all required data into {@link PrintWriter}. */
+ public static void dump(Context context, PrintWriter writer) {
+ writeString(context, writer, "BatteryLevelChanged",
+ Intent.ACTION_BATTERY_LEVEL_CHANGED);
+ writeString(context, writer, "BatteryUnplugging",
+ BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
+ writeString(context, writer, "ClearBatteryCacheData",
+ BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
+ writeString(context, writer, "LastLoadFullChargeTime",
+ KEY_LAST_LOAD_FULL_CHARGE_TIME);
+ writeString(context, writer, "LastUploadFullChargeTime",
+ KEY_LAST_UPLOAD_FULL_CHARGE_TIME);
+ }
+
+ static SharedPreferences getSharedPreferences(Context context) {
+ return context.getApplicationContext().getSharedPreferences(
+ SHARED_PREFS_FILE, Context.MODE_PRIVATE);
+ }
+
+ static void recordDateTime(Context context, String preferenceKey) {
+ final SharedPreferences sharedPreferences = getSharedPreferences(context);
+ if (sharedPreferences != null) {
+ final String currentTime = ConvertUtils.utcToLocalTimeForLogging(
+ System.currentTimeMillis());
+ sharedPreferences.edit().putString(preferenceKey, currentTime).apply();
+ }
+ }
+
+ private static void writeString(
+ Context context, PrintWriter writer, String prefix, String key) {
+ final SharedPreferences sharedPreferences = getSharedPreferences(context);
+ if (sharedPreferences != null) {
+ final String content = sharedPreferences.getString(key, "");
+ writer.println(String.format("\t\t%s: %s", prefix, content));
+ }
+ }
+
private static long loadAppUsageLatestTimestampFromContentProvider(
Context context, final Uri appUsageLatestTimestampUri) {
// We have already make sure the context here is with profile parent's user identity. Don't
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java
index 2b18e92..3d78c00 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobManager.java
@@ -26,11 +26,8 @@
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 @@
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 @@
}
/** 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 @@
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 8215839..9be378b 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java
@@ -19,6 +19,8 @@
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;
import com.android.settings.fuelgauge.batteryusage.db.BatteryState;
@@ -26,12 +28,9 @@
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 {
@@ -39,8 +38,9 @@
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();
final BatteryStateDao dao =
BatteryStateDatabase
.getInstance(context.getApplicationContext())
@@ -57,20 +57,18 @@
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);
});
+ writer.flush();
final List<BatteryState> stateList = dao.getAllAfter(
Clock.systemUTC().millis() - DUMP_TIME_OFFSET_FOR_ENTRY.toMillis());
stateList.stream().forEach(state -> writer.println(state));
}
- @SuppressWarnings("JavaUtilDate")
static void dumpAppUsageDatabaseHist(Context context, PrintWriter writer) {
final AppUsageEventDao dao =
BatteryStateDatabase
@@ -80,6 +78,7 @@
final List<AppUsageEventEntity> eventList = dao.getAllAfter(
Clock.systemUTC().millis() - DUMP_TIME_OFFSET_FOR_ENTRY.toMillis());
eventList.stream().forEach(event -> writer.println(event));
+ writer.flush();
}
private LogUtils() {}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntity.java b/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventEntity.java
index 9d62d07..c08c735 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 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 @@
}
@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 9139c10..190c274 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 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 @@
}
@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/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index fac3aaf..7713e27 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -29,11 +29,12 @@
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.ApplicationInfoFlags;
import android.content.pm.UserInfo;
import android.content.res.Configuration;
+import android.net.Uri;
import android.os.Bundle;
import android.os.Process;
-import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
@@ -71,7 +72,6 @@
import com.android.settings.core.FeatureFlags;
import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.password.PasswordUtils;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
import com.android.settingslib.Utils;
import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;
@@ -96,6 +96,10 @@
public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA =
"settings_large_screen_deep_link_intent_data";
+ // The referrer who fires the initial intent to start the homepage
+ @VisibleForTesting
+ static final String EXTRA_INITIAL_REFERRER = "initial_referrer";
+
static final int DEFAULT_HIGHLIGHT_MENU_KEY = R.string.menu_key_network;
private static final long HOMEPAGE_LOADING_TIMEOUT_MS = 300;
@@ -177,12 +181,16 @@
mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
if (mIsEmbeddingActivityEnabled) {
final UserManager um = getSystemService(UserManager.class);
- final UserInfo userInfo = um.getUserInfo(getUser().getIdentifier());
+ final UserInfo userInfo = um.getUserInfo(getUserId());
if (userInfo.isManagedProfile()) {
final Intent intent = new Intent(getIntent())
- .setClass(this, DeepLinkHomepageActivityInternal.class)
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
- .putExtra(EXTRA_USER_HANDLE, getUser());
+ .putExtra(EXTRA_USER_HANDLE, getUser())
+ .putExtra(EXTRA_INITIAL_REFERRER, getCurrentReferrer());
+ if (TextUtils.equals(intent.getAction(), ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY)
+ && this instanceof DeepLinkHomepageActivity) {
+ intent.setClass(this, DeepLinkHomepageActivityInternal.class);
+ }
intent.removeFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivityAsUser(intent, um.getProfileParent(userInfo.id).getUserHandle());
finish();
@@ -471,7 +479,7 @@
return;
}
- ActivityInfo targetActivityInfo = null;
+ ActivityInfo targetActivityInfo;
try {
targetActivityInfo = getPackageManager().getActivityInfo(targetComponentName,
/* flags= */ 0);
@@ -481,23 +489,29 @@
return;
}
- int callingUid = -1;
- try {
- callingUid = ActivityManager.getService().getLaunchedFromUid(getActivityToken());
- } catch (RemoteException re) {
- Log.e(TAG, "Not able to get callingUid: " + re);
- finish();
- return;
+ UserHandle user = intent.getParcelableExtra(EXTRA_USER_HANDLE, UserHandle.class);
+ String caller = getInitialReferrer();
+ int callerUid = -1;
+ if (caller != null) {
+ try {
+ callerUid = getPackageManager().getApplicationInfoAsUser(caller,
+ ApplicationInfoFlags.of(/* flags= */ 0),
+ user != null ? user.getIdentifier() : getUserId()).uid;
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Not able to get callerUid: " + e);
+ finish();
+ return;
+ }
}
- if (!hasPrivilegedAccess(callingUid, targetActivityInfo)) {
+ if (!hasPrivilegedAccess(caller, callerUid, targetActivityInfo.packageName)) {
if (!targetActivityInfo.exported) {
Log.e(TAG, "Target Activity is not exported");
finish();
return;
}
- if (!isCallingAppPermitted(targetActivityInfo.permission)) {
+ if (!isCallingAppPermitted(targetActivityInfo.permission, callerUid)) {
Log.e(TAG, "Calling app must have the permission of deep link Activity");
finish();
return;
@@ -510,7 +524,7 @@
& (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
if (targetIntent.getData() != null
&& uriPermissionFlags != 0
- && checkUriPermission(targetIntent.getData(), /* pid= */ -1, callingUid,
+ && checkUriPermission(targetIntent.getData(), /* pid= */ -1, callerUid,
uriPermissionFlags) == PackageManager.PERMISSION_DENIED) {
Log.e(TAG, "Calling app must have the permission to access Uri and grant permission");
finish();
@@ -547,7 +561,6 @@
SplitRule.FinishBehavior.ALWAYS,
true /* clearTop */);
- final UserHandle user = intent.getParcelableExtra(EXTRA_USER_HANDLE, UserHandle.class);
if (user != null) {
startActivityAsUser(targetIntent, user);
} else {
@@ -555,31 +568,30 @@
}
}
- // Check if calling app has privileged access to launch Activity of activityInfo.
- private boolean hasPrivilegedAccess(int callingUid, ActivityInfo activityInfo) {
- if (TextUtils.equals(PasswordUtils.getCallingAppPackageName(getActivityToken()),
- getPackageName())) {
+ // Check if the caller has privileged access to launch the target page.
+ private boolean hasPrivilegedAccess(String callerPkg, int callerUid, String targetPackage) {
+ if (TextUtils.equals(callerPkg, getPackageName())) {
return true;
}
int targetUid = -1;
try {
- targetUid = getPackageManager().getApplicationInfo(activityInfo.packageName,
- /* flags= */ 0).uid;
- } catch (PackageManager.NameNotFoundException nnfe) {
- Log.e(TAG, "Not able to get targetUid: " + nnfe);
+ targetUid = getPackageManager().getApplicationInfo(targetPackage,
+ ApplicationInfoFlags.of(/* flags= */ 0)).uid;
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Not able to get targetUid: " + e);
return false;
}
// When activityInfo.exported is false, Activity still can be launched if applications have
// the same user ID.
- if (UserHandle.isSameApp(callingUid, targetUid)) {
+ if (UserHandle.isSameApp(callerUid, targetUid)) {
return true;
}
// When activityInfo.exported is false, Activity still can be launched if calling app has
// root or system privilege.
- int callingAppId = UserHandle.getAppId(callingUid);
+ int callingAppId = UserHandle.getAppId(callerUid);
if (callingAppId == Process.ROOT_UID || callingAppId == Process.SYSTEM_UID) {
return true;
}
@@ -588,9 +600,31 @@
}
@VisibleForTesting
- boolean isCallingAppPermitted(String permission) {
- return TextUtils.isEmpty(permission) || PasswordUtils.isCallingAppPermitted(
- this, getActivityToken(), permission);
+ String getInitialReferrer() {
+ String referrer = getCurrentReferrer();
+ if (!TextUtils.equals(referrer, getPackageName())) {
+ return referrer;
+ }
+
+ String initialReferrer = getIntent().getStringExtra(EXTRA_INITIAL_REFERRER);
+ return TextUtils.isEmpty(initialReferrer) ? referrer : initialReferrer;
+ }
+
+ @VisibleForTesting
+ String getCurrentReferrer() {
+ Intent intent = getIntent();
+ // Clear extras to get the real referrer
+ intent.removeExtra(Intent.EXTRA_REFERRER);
+ intent.removeExtra(Intent.EXTRA_REFERRER_NAME);
+ Uri referrer = getReferrer();
+ return referrer != null ? referrer.getHost() : null;
+ }
+
+ @VisibleForTesting
+ boolean isCallingAppPermitted(String permission, int callerUid) {
+ return TextUtils.isEmpty(permission)
+ || checkPermission(permission, /* pid= */ -1, callerUid)
+ == PackageManager.PERMISSION_GRANTED;
}
private String getHighlightMenuKey() {
diff --git a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
index 4c4c99d..d8c856e 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 @@
@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/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
index 6048197..cb8a886 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
@@ -57,6 +57,7 @@
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mBatteryUsageBroadcastReceiver = new BatteryUsageBroadcastReceiver();
doReturn(mPackageManager).when(mContext).getPackageManager();
+ DatabaseUtils.getSharedPreferences(mContext).edit().clear().apply();
}
@Test
@@ -77,6 +78,7 @@
new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
}
@Test
@@ -94,6 +96,7 @@
new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
}
@Test
@@ -110,6 +113,7 @@
new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
}
@Test
@@ -126,6 +130,7 @@
new Intent(Intent.ACTION_BATTERY_LEVEL_CHANGED));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isTrue();
+ assertSharedPreferences(Intent.ACTION_BATTERY_LEVEL_CHANGED);
}
@Test
@@ -139,6 +144,7 @@
new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
}
@Test
@@ -156,6 +162,7 @@
new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
}
@Test
@@ -172,6 +179,7 @@
new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
}
@Test
@@ -188,6 +196,7 @@
new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isTrue();
+ assertSharedPreferences(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
}
@Test
@@ -202,6 +211,8 @@
new Intent(BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA));
assertThat(BatteryDiffEntry.sValidForRestriction).isEmpty();
+ assertSharedPreferences(
+ BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
}
@Test
@@ -216,6 +227,8 @@
new Intent(BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA));
assertThat(BatteryDiffEntry.sValidForRestriction).isNotEmpty();
+ assertSharedPreferences(
+ BatteryUsageBroadcastReceiver.ACTION_CLEAR_BATTERY_CACHE_DATA);
}
private static Intent getBatteryIntent(int level, int status) {
@@ -225,4 +238,9 @@
intent.putExtra(BatteryManager.EXTRA_STATUS, status);
return intent;
}
+
+ private void assertSharedPreferences(String preferenceKey) {
+ assertThat(DatabaseUtils.getSharedPreferences(mContext).contains(preferenceKey))
+ .isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
index ba51e29..aa1ebd7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
@@ -81,18 +81,6 @@
}
@Test
- public void onReceive_withMyPackageReplacedIntent_refreshesJob() {
- mReceiver.onReceive(mContext, new Intent(Intent.ACTION_MY_PACKAGE_REPLACED));
- assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
- }
-
- @Test
- public void onReceive_withMyPackageUnsuspendIntent_refreshesJob() {
- mReceiver.onReceive(mContext, new Intent(Intent.ACTION_MY_PACKAGE_UNSUSPENDED));
- assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
- }
-
- @Test
public void onReceive_withBootCompletedIntent_refreshesJob() {
mReceiver.onReceive(mContext, new Intent(Intent.ACTION_BOOT_COMPLETED));
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
index 154497e..0cb3d1d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
@@ -46,6 +46,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -73,6 +75,7 @@
doReturn(mMockContentResolver).when(mContext).getContentResolver();
doReturn(mPackageManager).when(mMockContext).getPackageManager();
doReturn(mPackageManager).when(mContext).getPackageManager();
+ DatabaseUtils.getSharedPreferences(mContext).edit().clear().apply();
}
@Test
@@ -396,6 +399,38 @@
assertThat(batteryHistMap).isEmpty();
}
+ @Test
+ public void recordDateTime_writeDataIntoSharedPreferences() {
+ final String preferenceKey = "test_preference_key";
+ DatabaseUtils.recordDateTime(mContext, preferenceKey);
+
+ assertThat(DatabaseUtils.getSharedPreferences(mContext).contains(preferenceKey))
+ .isTrue();
+ }
+
+ @Test
+ public void dump_dumpExpectedData() {
+ DatabaseUtils.recordDateTime(mContext,
+ Intent.ACTION_BATTERY_LEVEL_CHANGED);
+ DatabaseUtils.recordDateTime(mContext,
+ BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING);
+ DatabaseUtils.recordDateTime(mContext,
+ DatabaseUtils.KEY_LAST_LOAD_FULL_CHARGE_TIME);
+ DatabaseUtils.recordDateTime(mContext,
+ DatabaseUtils.KEY_LAST_UPLOAD_FULL_CHARGE_TIME);
+ final StringWriter stringWriter = new StringWriter();
+ final PrintWriter printWriter = new PrintWriter(stringWriter);
+
+ DatabaseUtils.dump(mContext, printWriter);
+
+ String dumpContent = stringWriter.toString();
+ assertThat(dumpContent.contains("BatteryLevelChanged")).isTrue();
+ assertThat(dumpContent.contains("BatteryUnplugging")).isTrue();
+ assertThat(dumpContent.contains("ClearBatteryCacheData")).isTrue();
+ assertThat(dumpContent.contains("LastLoadFullChargeTime")).isTrue();
+ assertThat(dumpContent.contains("LastUploadFullChargeTime")).isTrue();
+ }
+
private static void verifyBatteryEntryContentValues(
double consumedPower, ContentValues values) {
final BatteryInformation batteryInformation =
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index 60f153c..f1d6796 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -20,8 +20,13 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -30,6 +35,8 @@
import android.app.ActivityManager;
import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
import android.os.Build;
import android.view.View;
import android.view.Window;
@@ -215,29 +222,89 @@
}
@Test
- @Config(shadows = {ShadowPasswordUtils.class})
+ public void getInitialReferrer_differentPackage_returnCurrentReferrer() {
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ String referrer = "com.abc";
+ doReturn(referrer).when(activity).getCurrentReferrer();
+
+ assertEquals(activity.getInitialReferrer(), referrer);
+ }
+
+ @Test
+ public void getInitialReferrer_noReferrerExtra_returnCurrentReferrer() {
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ String referrer = activity.getPackageName();
+ doReturn(referrer).when(activity).getCurrentReferrer();
+
+ assertEquals(activity.getInitialReferrer(), referrer);
+ }
+
+ @Test
+ public void getInitialReferrer_hasReferrerExtra_returnGivenReferrer() {
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ doReturn(activity.getPackageName()).when(activity).getCurrentReferrer();
+ String referrer = "com.abc";
+ activity.setIntent(new Intent().putExtra(SettingsHomepageActivity.EXTRA_INITIAL_REFERRER,
+ referrer));
+
+ assertEquals(activity.getInitialReferrer(), referrer);
+ }
+
+ @Test
+ public void getCurrentReferrer_hasReferrerExtra_shouldNotEqual() {
+ String referrer = "com.abc";
+ Uri uri = new Uri.Builder().scheme("android-app").authority(referrer).build();
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ activity.setIntent(new Intent().putExtra(Intent.EXTRA_REFERRER, uri));
+
+ assertNotEquals(activity.getCurrentReferrer(), referrer);
+ }
+
+ @Test
+ public void getCurrentReferrer_hasReferrerNameExtra_shouldNotEqual() {
+ String referrer = "com.abc";
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ activity.setIntent(new Intent().putExtra(Intent.EXTRA_REFERRER_NAME, referrer));
+
+ assertNotEquals(activity.getCurrentReferrer(), referrer);
+ }
+
+ @Test
public void isCallingAppPermitted_emptyPermission_returnTrue() {
- SettingsHomepageActivity homepageActivity = spy(new SettingsHomepageActivity());
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ doReturn(PackageManager.PERMISSION_DENIED).when(activity)
+ .checkPermission(anyString(), anyInt(), anyInt());
- assertTrue(homepageActivity.isCallingAppPermitted(""));
+ assertTrue(activity.isCallingAppPermitted("", 1000));
}
@Test
- @Config(shadows = {ShadowPasswordUtils.class})
- public void isCallingAppPermitted_noGrantedPermission_returnFalse() {
- SettingsHomepageActivity homepageActivity = spy(new SettingsHomepageActivity());
+ public void isCallingAppPermitted_notGrantedPermission_returnFalse() {
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
+ doReturn(PackageManager.PERMISSION_DENIED).when(activity)
+ .checkPermission(anyString(), anyInt(), anyInt());
- assertFalse(homepageActivity.isCallingAppPermitted("android.permission.TEST"));
+ assertFalse(activity.isCallingAppPermitted("android.permission.TEST", 1000));
}
@Test
- @Config(shadows = {ShadowPasswordUtils.class})
public void isCallingAppPermitted_grantedPermission_returnTrue() {
- SettingsHomepageActivity homepageActivity = spy(new SettingsHomepageActivity());
+ SettingsHomepageActivity activity =
+ spy(Robolectric.buildActivity(SettingsHomepageActivity.class).get());
String permission = "android.permission.TEST";
- ShadowPasswordUtils.addGrantedPermission(permission);
+ doReturn(PackageManager.PERMISSION_DENIED).when(activity)
+ .checkPermission(anyString(), anyInt(), anyInt());
+ doReturn(PackageManager.PERMISSION_GRANTED).when(activity)
+ .checkPermission(eq(permission), anyInt(), eq(1000));
- assertTrue(homepageActivity.isCallingAppPermitted(permission));
+ assertTrue(activity.isCallingAppPermitted(permission, 1000));
}
@Implements(SuggestionFeatureProviderImpl.class)
diff --git a/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SilentStatusBarPreferenceControllerTest.java
index a913b9e..9d1dbfb 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.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowUserManager;
@RunWith(RobolectricTestRunner.class)
public class SilentStatusBarPreferenceControllerTest {
@@ -60,6 +68,27 @@
}
@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);
assertThat(mController.isChecked()).isFalse();
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 55e1f1a..15b2ae9 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 @@
"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 @@
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();
}