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

Commit d8c06fab authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data... 

am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev

* commit '80213add':
  Fix issue #10671878: Proc stats needs to remove old data structures
parents b198dbaf 80213add

core/java/android/app/ActivityManager.java

+6 −1
Original line number Diff line number Diff line
@@ -2106,7 +2106,12 @@ public class ActivityManager { 
        }

        // If the target is not exported, then nobody else can get to it.

        if (!exported) {

            Slog.w(TAG, "Permission denied: checkComponentPermission() owningUid=" + owningUid);

            /*

            RuntimeException here = new RuntimeException("here");

            here.fillInStackTrace();

            Slog.w(TAG, "Permission denied: checkComponentPermission() owningUid=" + owningUid,

                    here);

            */

            return PackageManager.PERMISSION_DENIED;

        }

        if (permission == null) {

core/java/com/android/internal/app/ProcessStats.java

+225 −36

File changed.

Preview size limit exceeded, changes collapsed.

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

+12 −11

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/am/ProcessRecord.java

+66 −11

File changed.

Preview size limit exceeded, changes collapsed.

services/java/com/android/server/am/ProcessStatsService.java

+3 −3
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ public final class ProcessStatsService extends IProcessStats.Stub { 
    // exists in and the offset into the array to find it.  The constants below

    // define the encoding of that data in an integer.



    static final int MAX_HISTORIC_STATES = 4;   // Maximum number of historic states we will keep.

    static final int MAX_HISTORIC_STATES = 6;   // Maximum number of historic states we will keep.

    static final String STATE_FILE_PREFIX = "state-"; // Prefix to use for state filenames.

    static final String STATE_FILE_SUFFIX = ".bin"; // Suffix to use for state filenames.

    static final String STATE_FILE_CHECKIN_SUFFIX = ".ci"; // State files that have checked in.

    static long WRITE_PERIOD = 30*60*1000;      // Write file every 30 minutes or so.

    static long COMMIT_PERIOD = 24*60*60*1000;  // Commit current stats every day.

    static long COMMIT_PERIOD = 12*60*60*1000;  // Commit current stats every 12 hours.



    final ActivityManagerService mAm;

    final File mBaseDir;
@@ -132,7 +132,7 @@ public final class ProcessStatsService extends IProcessStats.Stub { 
                    ArrayMap<String, ProcessStats.ServiceState> services = pkg.mServices;

                    for (int k=0; k<services.size(); k++) {

                        ProcessStats.ServiceState service = services.valueAt(k);

                        if (service.isActive()) {

                        if (service.isInUse()) {

                            if (service.mStartedState != ProcessStats.STATE_NOTHING) {

                                service.setStarted(true, memFactor, now);

                            }