Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2422a8 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Generate new field short_name_hash for atom... 

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

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

Change-Id: Ia2c87aeef372459b6199bccdddc2a8a3ca966524
parents cdbf5613 b7c4eb86

services/core/java/com/android/server/am/ActiveServices.java

+2 −1
Original line number Diff line number Diff line
@@ -6191,7 +6191,8 @@ public final class ActiveServices { 
                r.mFgsNotificationDeferred,

                r.mFgsNotificationShown,

                durationMs,

                r.mStartForegroundCount);

                r.mStartForegroundCount,

                ActivityManagerUtils.hashComponentNameForAtom(r.shortInstanceName));

    }



    boolean canAllowWhileInUsePermissionInFgsLocked(int callingPid, int callingUid,

services/core/java/com/android/server/am/ActivityManagerUtils.java

+8 −0
Original line number Diff line number Diff line
@@ -121,4 +121,12 @@ public class ActivityManagerUtils { 


        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();

    }

}