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

Commit 9ce32d8d authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Stop logging service name hash" into main

parents 604bf886 b55ef6a4

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

+1 −1
Original line number Diff line number Diff line
@@ -8303,7 +8303,7 @@ public final class ActiveServices { 
                r.mFgsNotificationShown,

                durationMs,

                r.mStartForegroundCount,

                ActivityManagerUtils.hashComponentNameForAtom(r.shortInstanceName),

                0, // Short instance name -- no longer logging it.

                r.mFgsHasNotificationPermission,

                r.foregroundServiceType,

                fgsTypeCheckCode,

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

+0 −8
Original line number Diff line number Diff line
@@ -128,14 +128,6 @@ 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();

    }



    /**

     * Helper method to log an unsafe intent event.

     */

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

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ public class ForegroundServiceTypeLoggerModule { 
                r.mFgsNotificationShown,

                0, // durationMs

                r.mStartForegroundCount,

                ActivityManagerUtils.hashComponentNameForAtom(r.shortInstanceName),

                0, // Short instance name -- no longer logging it.

                r.mFgsHasNotificationPermission,

                r.foregroundServiceType,

                0,