diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 50 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/AppProfiler.java | 11 | 
2 files changed, 0 insertions, 61 deletions
| diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d85e630796a5..f4d00250fb6e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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()); -                    });                  }              } diff --git a/services/core/java/com/android/server/am/AppProfiler.java b/services/core/java/com/android/server/am/AppProfiler.java index 16f222697646..0934ffd2568a 100644 --- a/services/core/java/com/android/server/am/AppProfiler.java +++ b/services/core/java/com/android/server/am/AppProfiler.java @@ -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 |