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

Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev

Browse Source 
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: Iec6ad93e7445df5d642aba24867c264c435c53ba
This commit is contained in:
Joe Onorato
2016-05-09 22:17:10 +00:00
committed by android-build-merger
parent e508826d72 3b25fd081d
commit bdff78d9ea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ public final class PackageHealthStats {
* Key for a map of the number of times that a package's wakeup alarms have fired * Key for a map of the number of times that a package's wakeup alarms have fired
* while the device was on battery. * while the device was on battery.
* *
* @see android.app.AlarmManager. * @see android.app.AlarmManager
*/ */
@HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENTS) @HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENTS)
public static final int MEASUREMENTS_WAKEUP_ALARMS_COUNT = HealthKeys.BASE_PACKAGE + 2; public static final int MEASUREMENTS_WAKEUP_ALARMS_COUNT = HealthKeys.BASE_PACKAGE + 2;

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

@@ -71,7 +71,7 @@ public class SystemHealthManager {
* @return A {@link HealthStats} object containing the metrics for the requested * @return A {@link HealthStats} object containing the metrics for the requested
* application. The keys for this HealthStats object will be from the {@link UidHealthStats} * application. The keys for this HealthStats object will be from the {@link UidHealthStats}
* class. * class.
* @see Process#myUid() * @see Process#myUid() Process.myUid()
*/ */
public HealthStats takeUidSnapshot(int uid) { public HealthStats takeUidSnapshot(int uid) {
try { try {