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

Commit 6b10cec2 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Merge changes If51568c3,Idd434c19 into nyc-dev 

am: 45165c93

* commit '45165c93':
  Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
  @hide SystemHealthManager.from

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
parents 993f6850 45165c93

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -29368,7 +29368,6 @@ package android.os.health { 
  }















  public class SystemHealthManager {













    method public static android.os.health.SystemHealthManager from(android.content.Context);















    method public android.os.health.HealthStats takeMyUidSnapshot();















    method public android.os.health.HealthStats takeUidSnapshot(int);















    method public android.os.health.HealthStats[] takeUidSnapshots(int[]);

























api/system-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -31904,7 +31904,6 @@ package android.os.health {













  }





























  public class SystemHealthManager {













    method public static android.os.health.SystemHealthManager from(android.content.Context);















    method public android.os.health.HealthStats takeMyUidSnapshot();















    method public android.os.health.HealthStats takeUidSnapshot(int);















    method public android.os.health.HealthStats[] takeUidSnapshots(int[]);

























api/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -29438,7 +29438,6 @@ package android.os.health {













  }





























  public class SystemHealthManager {













    method public static android.os.health.SystemHealthManager from(android.content.Context);















    method public android.os.health.HealthStats takeMyUidSnapshot();















    method public android.os.health.HealthStats takeUidSnapshot(int);















    method public android.os.health.HealthStats[] takeUidSnapshots(int[]);

























core/java/android/os/health/SystemHealthManager.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -53,6 +53,8 @@ public class SystemHealthManager {





























    /**















     * Obtain a SystemHealthManager object for the supplied context.













     *













     * @hide















     */















    public static SystemHealthManager from(Context context) {















        return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE);

































core/java/com/android/internal/app/procstats/ProcessState.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -277,7 +277,7 @@ public final class ProcessState {













        if (!mDead) {















            return;















        }













        Slog.wtfStack(TAG, "ProcessState dead: name=" + mName













        Slog.w(TAG, "ProcessState dead: name=" + mName















                + " pkg=" + mPackage + " uid=" + mUid + " common.name=" + mCommonProcess.mName);















    }