Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update sync exemptions log to include restriction level." into tm-dev am: 2b4f92c65a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18438448

Change-Id: Ife3c568f1d18dfcb34e34b55489802025e21294d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-19 22:14:11 +00:00
committed by Automerger Merge Worker
parent ea8e9ceb46 2b4f92c65a
commit fbb5830959
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/content/ContentService.java
View File

@@ -26,6 +26,7 @@ import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManager.RestrictionLevel;
import android.app.ActivityManagerInternal; import android.app.ActivityManagerInternal;
import android.app.AppGlobals; import android.app.AppGlobals;
import android.app.AppOpsManager; import android.app.AppOpsManager;
@@ -52,6 +53,7 @@ import android.content.pm.ProviderInfo;
import android.database.IContentObserver; import android.database.IContentObserver;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
import android.net.Uri; import android.net.Uri;
import android.os.AppBackgroundRestrictionsInfo;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -1544,7 +1546,8 @@ public final class ContentService extends IContentService.Stub {
} }
if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND || isUidActive) { if (procState <= ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND || isUidActive) {
FrameworkStatsLog.write(FrameworkStatsLog.SYNC_EXEMPTION_OCCURRED, FrameworkStatsLog.write(FrameworkStatsLog.SYNC_EXEMPTION_OCCURRED,
callingUid, getProcStateForStatsd(procState), isUidActive); callingUid, getProcStateForStatsd(procState), isUidActive,
getRestrictionLevelForStatsd(ami.getRestrictionLevel(callingUid)));
return ContentResolver.SYNC_EXEMPTION_PROMOTE_BUCKET; return ContentResolver.SYNC_EXEMPTION_PROMOTE_BUCKET;
} }
return ContentResolver.SYNC_EXEMPTION_NONE; return ContentResolver.SYNC_EXEMPTION_NONE;
@@ -1599,6 +1602,27 @@ public final class ContentService extends IContentService.Stub {
} }
} }
private int getRestrictionLevelForStatsd(@RestrictionLevel int level) {
switch (level) {
case ActivityManager.RESTRICTION_LEVEL_UNKNOWN:
return AppBackgroundRestrictionsInfo.LEVEL_UNKNOWN;
case ActivityManager.RESTRICTION_LEVEL_UNRESTRICTED:
return AppBackgroundRestrictionsInfo.LEVEL_UNRESTRICTED;
case ActivityManager.RESTRICTION_LEVEL_EXEMPTED:
return AppBackgroundRestrictionsInfo.LEVEL_EXEMPTED;
case ActivityManager.RESTRICTION_LEVEL_ADAPTIVE_BUCKET:
return AppBackgroundRestrictionsInfo.LEVEL_ADAPTIVE_BUCKET;
case ActivityManager.RESTRICTION_LEVEL_RESTRICTED_BUCKET:
return AppBackgroundRestrictionsInfo.LEVEL_RESTRICTED_BUCKET;
case ActivityManager.RESTRICTION_LEVEL_BACKGROUND_RESTRICTED:
return AppBackgroundRestrictionsInfo.LEVEL_BACKGROUND_RESTRICTED;
case ActivityManager.RESTRICTION_LEVEL_HIBERNATION:
return AppBackgroundRestrictionsInfo.LEVEL_HIBERNATION;
default:
return AppBackgroundRestrictionsInfo.LEVEL_UNKNOWN;
}
}
/** {@hide} */ /** {@hide} */
@VisibleForTesting @VisibleForTesting
public static final class ObserverNode { public static final class ObserverNode {