Merge "Fix failing cts tests" (53ba2566) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/powerstats/PowerStatsService.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -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,10 +92,14 @@ public class PowerStatsService extends SystemService {
		if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;

		if (args.length > 0 && "--proto".equals(args[0])) {
		if (mPowerStatsLogger == null) {
		Log.e(TAG, "PowerStats HAL is not initialized. No data available.");
		} else {
		mPowerStatsLogger.writeToFile(fd);
		}
		}
		}
		}

		@Override
		public void onBootPhase(int phase) {