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

Merge "Generate new field short_name_hash for atom ForegroundServiceStateChanged." into sc-dev am: b7c4eb868e

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

Change-Id: Ia2c87aeef372459b6199bccdddc2a8a3ca966524
This commit is contained in:
Hui Yu
2021-06-03 07:14:56 +00:00
committed by Automerger Merge Worker
parent cdbf56133b b7c4eb868e
commit 8a2422a87b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -6191,7 +6191,8 @@ public final class ActiveServices {
r.mFgsNotificationDeferred, r.mFgsNotificationDeferred,
r.mFgsNotificationShown, r.mFgsNotificationShown,
durationMs, durationMs,
r.mStartForegroundCount); r.mStartForegroundCount,
ActivityManagerUtils.hashComponentNameForAtom(r.shortInstanceName));
} }
boolean canAllowWhileInUsePermissionInFgsLocked(int callingPid, int callingUid, boolean canAllowWhileInUsePermissionInFgsLocked(int callingPid, int callingUid,

8
services/core/java/com/android/server/am/ActivityManagerUtils.java
View File

@@ -121,4 +121,12 @@ public class ActivityManagerUtils {
return (((double) hash) / Integer.MAX_VALUE) <= rate; return (((double) hash) / Integer.MAX_VALUE) <= rate;
} }
/**
* @param shortInstanceName {@link ServiceRecord#shortInstanceName}.
* @return hash of the ServiceRecord's shortInstanceName, combined with ANDROID_ID.
*/
public static int hashComponentNameForAtom(String shortInstanceName) {
return getUnsignedHashUnCached(shortInstanceName) ^ getAndroidIdHash();
}
} }