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

Merge "Fix failing cts tests"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-06 18:46:54 +00:00
committed by Android (Google) Code Review
parent 402534a343 2c4b946f05
commit 53ba25661c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/powerstats/PowerStatsService.java
View File

@@ -16,6 +16,7 @@
package com.android.server.powerstats;
import android.annotation.Nullable;
import android.content.Context;
import android.os.Binder;
import android.os.Environment;
@@ -48,8 +49,11 @@ public class PowerStatsService extends SystemService {
private Context mContext;
private IPowerStatsHALWrapper mPowerStatsHALWrapper;
@Nullable
private PowerStatsLogger mPowerStatsLogger;
@Nullable
private BatteryTrigger mBatteryTrigger;
@Nullable
private TimerTrigger mTimerTrigger;
@VisibleForTesting
@@ -88,7 +92,11 @@ public class PowerStatsService extends SystemService {
if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;
if (args.length > 0 && "--proto".equals(args[0])) {
mPowerStatsLogger.writeToFile(fd);
if (mPowerStatsLogger == null) {
Log.e(TAG, "PowerStats HAL is not initialized. No data available.");
} else {
mPowerStatsLogger.writeToFile(fd);
}
}
}
}