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

Merge "Get profile parent's context in case of work profile" into udc-dev am: 21b2671c20

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21512484

Change-Id: I6829eb15fb21775dfdec2f3abca7cd86c1d88261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nikhil Kumar
2023-02-21 13:26:42 +00:00
committed by Automerger Merge Worker
parent 251a8cd40d 21b2671c20
commit 0fd4b8edf7
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
View File

@@ -181,7 +181,7 @@ public final class DataProcessor {
@Nullable @Nullable
public static Map<Long, UsageEvents> getAppUsageEvents(Context context) { public static Map<Long, UsageEvents> getAppUsageEvents(Context context) {
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
context = DatabaseUtils.getOwnerContext(context); context = DatabaseUtils.getParentContext(context);
if (context == null) { if (context == null) {
return null; return null;
} }
@@ -212,7 +212,7 @@ public final class DataProcessor {
public static UsageEvents getAppUsageEventsForUser( public static UsageEvents getAppUsageEventsForUser(
Context context, final int userID, final long startTimestampOfLevelData) { Context context, final int userID, final long startTimestampOfLevelData) {
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
context = DatabaseUtils.getOwnerContext(context); context = DatabaseUtils.getParentContext(context);
if (context == null) { if (context == null) {
return null; return null;
} }

21
src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
View File

@@ -28,7 +28,6 @@ import android.os.BatteryUsageStats;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
@@ -109,7 +108,7 @@ public final class DatabaseUtils {
/** Returns true if current user is a work profile user. */ /** Returns true if current user is a work profile user. */
public static boolean isWorkProfile(Context context) { public static boolean isWorkProfile(Context context) {
final UserManager userManager = context.getSystemService(UserManager.class); final UserManager userManager = context.getSystemService(UserManager.class);
return userManager.isManagedProfile() && !userManager.isSystemUser(); return userManager.isManagedProfile();
} }
/** Returns the latest timestamp current user data in app usage event table. */ /** Returns the latest timestamp current user data in app usage event table. */
@@ -239,15 +238,15 @@ public final class DatabaseUtils {
return startCalendar.getTimeInMillis(); return startCalendar.getTimeInMillis();
} }
/** Returns the context with OWNER identity when current user is work profile. */ /** Returns the context with profile parent identity when current user is work profile. */
public static Context getOwnerContext(Context context) { public static Context getParentContext(Context context) {
final boolean isWorkProfileUser = isWorkProfile(context); if (isWorkProfile(context)) {
if (isWorkProfileUser) {
try { try {
return context.createPackageContextAsUser( return context.createPackageContextAsUser(
/*packageName=*/ context.getPackageName(), /*packageName=*/ context.getPackageName(),
/*flags=*/ 0, /*flags=*/ 0,
/*user=*/ UserHandle.OWNER); /*user=*/ context.getSystemService(UserManager.class)
.getProfileParent(context.getUser()));
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "context.createPackageContextAsUser() fail:" + e); Log.e(TAG, "context.createPackageContextAsUser() fail:" + e);
return null; return null;
@@ -380,8 +379,8 @@ public final class DatabaseUtils {
private static long loadAppUsageLatestTimestampFromContentProvider( private static long loadAppUsageLatestTimestampFromContentProvider(
Context context, final Uri appUsageLatestTimestampUri) { Context context, final Uri appUsageLatestTimestampUri) {
// We have already make sure the context here is with OWNER user identity. Don't need to // We have already make sure the context here is with profile parent's user identity. Don't
// check whether current user is work profile. // need to check whether current user is work profile.
try (Cursor cursor = sFakeAppUsageLatestTimestampSupplier != null try (Cursor cursor = sFakeAppUsageLatestTimestampSupplier != null
? sFakeAppUsageLatestTimestampSupplier.get() ? sFakeAppUsageLatestTimestampSupplier.get()
: context.getContentResolver().query( : context.getContentResolver().query(
@@ -405,7 +404,7 @@ public final class DatabaseUtils {
private static List<AppUsageEvent> loadAppUsageEventsFromContentProvider( private static List<AppUsageEvent> loadAppUsageEventsFromContentProvider(
Context context, Uri appUsageEventUri) { Context context, Uri appUsageEventUri) {
final List<AppUsageEvent> appUsageEventList = new ArrayList<>(); final List<AppUsageEvent> appUsageEventList = new ArrayList<>();
context = getOwnerContext(context); context = getParentContext(context);
if (context == null) { if (context == null) {
return appUsageEventList; return appUsageEventList;
} }
@@ -430,7 +429,7 @@ public final class DatabaseUtils {
private static Map<Long, Map<String, BatteryHistEntry>> loadHistoryMapFromContentProvider( private static Map<Long, Map<String, BatteryHistEntry>> loadHistoryMapFromContentProvider(
Context context, Uri batteryStateUri) { Context context, Uri batteryStateUri) {
context = DatabaseUtils.getOwnerContext(context); context = DatabaseUtils.getParentContext(context);
if (context == null) { if (context == null) {
return null; return null;
} }