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

Commit 490e63e4 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Automerger Merge Worker
Browse files

Merge "Removed logging ProcessMemoryStatReported atom to statsd" into main am:... 

Merge "Removed logging ProcessMemoryStatReported atom to statsd" into main am: 2cdda47d am: 6eb7ac57

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



Change-Id: I174d8a0af10678ace87e02bc3d6b34bdc2c43af6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 024df6a2 6eb7ac57

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

+0 −50
Original line number Diff line number Diff line
@@ -4009,21 +4009,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        profile.addPss(mi.getTotalPss(),

                                mi.getTotalUss(), mi.getTotalRss(), false,

                                ProcessStats.ADD_PSS_EXTERNAL_SLOW, duration);

                        proc.getPkgList().forEachPackageProcessStats(holder -> {

                            final ProcessState state = holder.state;

                            FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,

                                    proc.info.uid,

                                    state != null ? state.getName() : proc.processName,

                                    state != null ? state.getPackage() : proc.info.packageName,

                                    mi.getTotalPss(),

                                    mi.getTotalUss(),

                                    mi.getTotalRss(),

                                    ProcessStats.ADD_PSS_EXTERNAL_SLOW,

                                    duration,

                                    holder.appVersion,

                                    profile.getCurrentHostingComponentTypes(),

                                    profile.getHistoricalHostingComponentTypes());

                        });

                    }

                }

            }
@@ -4070,20 +4055,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        // Record this for posterity if the process has been stable.

                        profile.addPss(pi, tmpUss[0], tmpUss[2], false,

                                ProcessStats.ADD_PSS_EXTERNAL, duration);

                        proc.getPkgList().forEachPackageProcessStats(holder -> {

                            FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,

                                    proc.info.uid,

                                    holder.state.getName(),

                                    holder.state.getPackage(),

                                    pi,

                                    tmpUss[0],

                                    tmpUss[2],

                                    ProcessStats.ADD_PSS_EXTERNAL,

                                    duration,

                                    holder.appVersion,

                                    profile.getCurrentHostingComponentTypes(),

                                    profile.getHistoricalHostingComponentTypes());

                        });

                    }

                }

            }
@@ -11933,17 +11904,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        // Record this for posterity if the process has been stable.

                        r.mProfile.addPss(myTotalPss, myTotalUss, myTotalRss, true,

                                reportType, endTime - startTime);

                        r.getPkgList().forEachPackageProcessStats(holder -> {

                            FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,

                                    r.info.uid,

                                    holder.state.getName(),

                                    holder.state.getPackage(),

                                    myTotalPss, myTotalUss, myTotalRss, reportType,

                                    endTime-startTime,

                                    holder.appVersion,

                                    r.mProfile.getCurrentHostingComponentTypes(),

                                    r.mProfile.getHistoricalHostingComponentTypes());

                        });

                    }

                }










@@ -12579,16 +12539,6 @@ public class ActivityManagerService extends IActivityManager.Stub













                    // Record this for posterity if the process has been stable.















                    r.mProfile.addPss(myTotalPss, myTotalUss, myTotalRss, true,















                                reportType, endTime - startTime);













                    r.getPkgList().forEachPackageProcessStats(holder -> {













                        FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,













                                r.info.uid,













                                holder.state.getName(),













                                holder.state.getPackage(),













                                myTotalPss, myTotalUss, myTotalRss, reportType, endTime-startTime,













                                holder.appVersion,













                                r.mProfile.getCurrentHostingComponentTypes(),













                                r.mProfile.getHistoricalHostingComponentTypes());













                    });















                }















            }







































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



+0
−11




























Original line number
Diff line number
Diff line








@@ -765,17 +765,6 @@ public class AppProfiler {













                swapPss * 1024, rss * 1024, statType, procState, pssDuration);















        profile.setLastPssTime(now);















        profile.addPss(pss, uss, rss, true, statType, pssDuration);













        proc.getPkgList().forEachPackageProcessStats(holder -> {













            FrameworkStatsLog.write(FrameworkStatsLog.PROCESS_MEMORY_STAT_REPORTED,













                    proc.info.uid,













                    holder.state.getName(),













                    holder.state.getPackage(),













                    pss, uss, rss,













                    statType, pssDuration,













                    holder.appVersion,













                    profile.getCurrentHostingComponentTypes(),













                    profile.getHistoricalHostingComponentTypes());













        });















        if (DEBUG_PSS) {















            Slog.d(TAG_PSS,















                    "pss of " + proc.toShortString() + ": " + pss