Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes If51568c3,Idd434c19 into nyc-dev am: 45165c9373

Browse Source 
am: 6b10cec210

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

Change-Id: Ifc94199cc5ad69af73871cc012aa2dac31b6f67b
This commit is contained in:
Joe Onorato
2016-05-18 00:52:32 +00:00
committed by android-build-merger
parent c936ef8af2 6b10cec210
commit 269f64079b
5 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -29469,7 +29469,6 @@ package android.os.health {
} }
public class SystemHealthManager { 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 takeMyUidSnapshot();
method public android.os.health.HealthStats takeUidSnapshot(int); method public android.os.health.HealthStats takeUidSnapshot(int);
method public android.os.health.HealthStats[] takeUidSnapshots(int[]); method public android.os.health.HealthStats[] takeUidSnapshots(int[]);

1
api/system-current.txt
View File

@@ -32005,7 +32005,6 @@ package android.os.health {
} }
public class SystemHealthManager { 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 takeMyUidSnapshot();
method public android.os.health.HealthStats takeUidSnapshot(int); method public android.os.health.HealthStats takeUidSnapshot(int);
method public android.os.health.HealthStats[] takeUidSnapshots(int[]); method public android.os.health.HealthStats[] takeUidSnapshots(int[]);

1
api/test-current.txt
View File

@@ -29540,7 +29540,6 @@ package android.os.health {
} }
public class SystemHealthManager { 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 takeMyUidSnapshot();
method public android.os.health.HealthStats takeUidSnapshot(int); method public android.os.health.HealthStats takeUidSnapshot(int);
method public android.os.health.HealthStats[] takeUidSnapshots(int[]); method public android.os.health.HealthStats[] takeUidSnapshots(int[]);

2
core/java/android/os/health/SystemHealthManager.java
View File

@@ -53,6 +53,8 @@ public class SystemHealthManager {
/** /**
* Obtain a SystemHealthManager object for the supplied context. * Obtain a SystemHealthManager object for the supplied context.
*
* @hide
*/ */
public static SystemHealthManager from(Context context) { public static SystemHealthManager from(Context context) {
return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE); return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE);

2
core/java/com/android/internal/app/procstats/ProcessState.java
View File

@@ -277,7 +277,7 @@ public final class ProcessState {
if (!mDead) { if (!mDead) {
return; return;
} }
Slog.wtfStack(TAG, "ProcessState dead: name=" + mName Slog.w(TAG, "ProcessState dead: name=" + mName
+ " pkg=" + mPackage + " uid=" + mUid + " common.name=" + mCommonProcess.mName); + " pkg=" + mPackage + " uid=" + mUid + " common.name=" + mCommonProcess.mName);
} }