Merge changes If51568c3,Idd434c19 into nyc-dev

am: 45165c9373

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

Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8

api/current.txt

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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);
     }