diff options
6 files changed, 33 insertions, 33 deletions
diff --git a/services/core/java/com/android/server/powerstats/BatteryTrigger.java b/services/core/java/com/android/server/powerstats/BatteryTrigger.java index c1f97f2685b5..6500523198ba 100644 --- a/services/core/java/com/android/server/powerstats/BatteryTrigger.java +++ b/services/core/java/com/android/server/powerstats/BatteryTrigger.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; -import android.util.Log; +import android.util.Slog; /** * BatteryTrigger instantiates a BroadcastReceiver that listens for changes @@ -42,7 +42,7 @@ public final class BatteryTrigger extends PowerStatsLogTrigger { int newBatteryLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); if (newBatteryLevel < mBatteryLevel) { - if (DEBUG) Log.d(TAG, "Battery level dropped. Log rail data"); + if (DEBUG) Slog.d(TAG, "Battery level dropped. Log rail data"); logPowerStatsData(); } diff --git a/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java b/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java index 5d8afd43a5f7..98293570507c 100644 --- a/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java +++ b/services/core/java/com/android/server/powerstats/PowerStatsDataStorage.java @@ -17,7 +17,7 @@ package com.android.server.powerstats; import android.content.Context; -import android.util.Log; +import android.util.Slog; import com.android.internal.util.FileRotator; @@ -127,7 +127,7 @@ public class PowerStatsDataStorage { DataElement dataElement = new DataElement(in); mCallback.onReadDataElement(dataElement.getData()); } catch (IOException e) { - Log.e(TAG, "Failed to read from storage. " + e.getMessage()); + Slog.e(TAG, "Failed to read from storage. " + e.getMessage()); } } } @@ -170,7 +170,7 @@ public class PowerStatsDataStorage { mDataStorageDir = dataStoragePath; if (!mDataStorageDir.exists() && !mDataStorageDir.mkdirs()) { - Log.wtf(TAG, "mDataStorageDir does not exist: " + mDataStorageDir.getPath()); + Slog.wtf(TAG, "mDataStorageDir does not exist: " + mDataStorageDir.getPath()); mFileRotator = null; } else { // Delete files written with an old version number. The version is included in the @@ -208,7 +208,7 @@ public class PowerStatsDataStorage { currentTimeMillis); mFileRotator.maybeRotate(currentTimeMillis); } catch (IOException e) { - Log.e(TAG, "Failed to write to on-device storage: " + e); + Slog.e(TAG, "Failed to write to on-device storage: " + e); } mLock.unlock(); diff --git a/services/core/java/com/android/server/powerstats/PowerStatsLogger.java b/services/core/java/com/android/server/powerstats/PowerStatsLogger.java index bec99bca4d46..f5131c4b371d 100644 --- a/services/core/java/com/android/server/powerstats/PowerStatsLogger.java +++ b/services/core/java/com/android/server/powerstats/PowerStatsLogger.java @@ -23,7 +23,7 @@ import android.hardware.power.stats.EnergyMeasurement; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.util.Log; +import android.util.Slog; import android.util.proto.ProtoInputStream; import android.util.proto.ProtoOutputStream; @@ -58,7 +58,7 @@ public final class PowerStatsLogger extends Handler { public void handleMessage(Message msg) { switch (msg.what) { case MSG_LOG_TO_DATA_STORAGE: - if (DEBUG) Log.d(TAG, "Logging to data storage"); + if (DEBUG) Slog.d(TAG, "Logging to data storage"); // Log power meter data. EnergyMeasurement[] energyMeasurements = mPowerStatsHALWrapper.readEnergyMeters(); @@ -83,7 +83,7 @@ public final class PowerStatsLogger extends Handler { * is written in protobuf format as defined by powerstatsservice.proto. */ public void writeMeterDataToFile(FileDescriptor fd) { - if (DEBUG) Log.d(TAG, "Writing meter data to file"); + if (DEBUG) Slog.d(TAG, "Writing meter data to file"); final ProtoOutputStream pos = new ProtoOutputStream(fd); @@ -106,12 +106,12 @@ public final class PowerStatsLogger extends Handler { EnergyMeasurementUtils.packProtoMessage(energyMeasurement, pos); if (DEBUG) EnergyMeasurementUtils.print(energyMeasurement); } catch (IOException e) { - Log.e(TAG, "Failed to write energy meter data to incident report."); + Slog.e(TAG, "Failed to write energy meter data to incident report."); } } }); } catch (IOException e) { - Log.e(TAG, "Failed to write energy meter info to incident report."); + Slog.e(TAG, "Failed to write energy meter info to incident report."); } pos.flush(); @@ -124,7 +124,7 @@ public final class PowerStatsLogger extends Handler { * is written in protobuf format as defined by powerstatsservice.proto. */ public void writeModelDataToFile(FileDescriptor fd) { - if (DEBUG) Log.d(TAG, "Writing model data to file"); + if (DEBUG) Slog.d(TAG, "Writing model data to file"); final ProtoOutputStream pos = new ProtoOutputStream(fd); @@ -147,12 +147,12 @@ public final class PowerStatsLogger extends Handler { EnergyConsumerResultUtils.packProtoMessage(energyConsumerResult, pos); if (DEBUG) EnergyConsumerResultUtils.print(energyConsumerResult); } catch (IOException e) { - Log.e(TAG, "Failed to write energy model data to incident report."); + Slog.e(TAG, "Failed to write energy model data to incident report."); } } }); } catch (IOException e) { - Log.e(TAG, "Failed to write energy model info to incident report."); + Slog.e(TAG, "Failed to write energy model info to incident report."); } pos.flush(); diff --git a/services/core/java/com/android/server/powerstats/PowerStatsService.java b/services/core/java/com/android/server/powerstats/PowerStatsService.java index b89464fe4656..c8b30ced1436 100644 --- a/services/core/java/com/android/server/powerstats/PowerStatsService.java +++ b/services/core/java/com/android/server/powerstats/PowerStatsService.java @@ -21,7 +21,7 @@ import android.content.Context; import android.os.Binder; import android.os.Environment; import android.os.UserHandle; -import android.util.Log; +import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; @@ -98,7 +98,7 @@ public class PowerStatsService extends SystemService { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; if (mPowerStatsLogger == null) { - Log.e(TAG, "PowerStats HAL is not initialized. No data available."); + Slog.e(TAG, "PowerStats HAL is not initialized. No data available."); } else { if (args.length > 0 && "--proto".equals(args[0])) { if ("model".equals(args[1])) { @@ -127,7 +127,7 @@ public class PowerStatsService extends SystemService { mPowerStatsHALWrapper = mInjector.createPowerStatsHALWrapperImpl(); if (mPowerStatsHALWrapper.initialize()) { - if (DEBUG) Log.d(TAG, "Starting PowerStatsService"); + if (DEBUG) Slog.d(TAG, "Starting PowerStatsService"); // Only start logger and triggers if initialization is successful. mPowerStatsLogger = mInjector.createPowerStatsLogger(mContext, @@ -136,7 +136,7 @@ public class PowerStatsService extends SystemService { mBatteryTrigger = mInjector.createBatteryTrigger(mContext, mPowerStatsLogger); mTimerTrigger = mInjector.createTimerTrigger(mContext, mPowerStatsLogger); } else { - Log.e(TAG, "Initialization of PowerStatsHAL wrapper failed"); + Slog.e(TAG, "Initialization of PowerStatsHAL wrapper failed"); } } diff --git a/services/core/java/com/android/server/powerstats/ProtoStreamUtils.java b/services/core/java/com/android/server/powerstats/ProtoStreamUtils.java index c29c5daf34a5..df70e22d79dd 100644 --- a/services/core/java/com/android/server/powerstats/ProtoStreamUtils.java +++ b/services/core/java/com/android/server/powerstats/ProtoStreamUtils.java @@ -19,7 +19,7 @@ package com.android.server.powerstats; import android.hardware.power.stats.ChannelInfo; import android.hardware.power.stats.EnergyConsumerResult; import android.hardware.power.stats.EnergyMeasurement; -import android.util.Log; +import android.util.Slog; import android.util.proto.ProtoInputStream; import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoUtils; @@ -56,7 +56,7 @@ public class ProtoStreamUtils { public static void print(ChannelInfo[] channelInfo) { for (int i = 0; i < channelInfo.length; i++) { - Log.d(TAG, "ChannelId = " + channelInfo[i].channelId + Slog.d(TAG, "ChannelId = " + channelInfo[i].channelId + ", ChannelName = " + channelInfo[i].channelName); } } @@ -100,11 +100,11 @@ public class ProtoStreamUtils { return energyMeasurementList.toArray( new EnergyMeasurement[energyMeasurementList.size()]); } else { - Log.e(TAG, "Unhandled field in proto: " + Slog.e(TAG, "Unhandled field in proto: " + ProtoUtils.currentFieldToString(pis)); } } catch (WireTypeMismatchException wtme) { - Log.e(TAG, "Wire Type mismatch in proto: " + Slog.e(TAG, "Wire Type mismatch in proto: " + ProtoUtils.currentFieldToString(pis)); } } @@ -136,12 +136,12 @@ public class ProtoStreamUtils { return energyMeasurement; default: - Log.e(TAG, "Unhandled field in EnergyMeasurementProto: " + Slog.e(TAG, "Unhandled field in EnergyMeasurementProto: " + ProtoUtils.currentFieldToString(pis)); break; } } catch (WireTypeMismatchException wtme) { - Log.e(TAG, "Wire Type mismatch in EnergyMeasurementProto: " + Slog.e(TAG, "Wire Type mismatch in EnergyMeasurementProto: " + ProtoUtils.currentFieldToString(pis)); } } @@ -149,7 +149,7 @@ public class ProtoStreamUtils { public static void print(EnergyMeasurement[] energyMeasurement) { for (int i = 0; i < energyMeasurement.length; i++) { - Log.d(TAG, "ChannelId = " + energyMeasurement[i].channelId + Slog.d(TAG, "ChannelId = " + energyMeasurement[i].channelId + ", Timestamp (ms) = " + energyMeasurement[i].timestampMs + ", Energy (uWs) = " + energyMeasurement[i].energyUWs); } @@ -169,7 +169,7 @@ public class ProtoStreamUtils { public static void print(int[] energyConsumerId) { for (int i = 0; i < energyConsumerId.length; i++) { - Log.d(TAG, "EnergyConsumerId = " + energyConsumerId[i]); + Slog.d(TAG, "EnergyConsumerId = " + energyConsumerId[i]); } } } @@ -215,11 +215,11 @@ public class ProtoStreamUtils { return energyConsumerResultList.toArray( new EnergyConsumerResult[energyConsumerResultList.size()]); } else { - Log.e(TAG, "Unhandled field in proto: " + Slog.e(TAG, "Unhandled field in proto: " + ProtoUtils.currentFieldToString(pis)); } } catch (WireTypeMismatchException wtme) { - Log.e(TAG, "Wire Type mismatch in proto: " + Slog.e(TAG, "Wire Type mismatch in proto: " + ProtoUtils.currentFieldToString(pis)); } } @@ -251,12 +251,12 @@ public class ProtoStreamUtils { return energyConsumerResult; default: - Log.e(TAG, "Unhandled field in EnergyConsumerResultProto: " + Slog.e(TAG, "Unhandled field in EnergyConsumerResultProto: " + ProtoUtils.currentFieldToString(pis)); break; } } catch (WireTypeMismatchException wtme) { - Log.e(TAG, "Wire Type mismatch in EnergyConsumerResultProto: " + Slog.e(TAG, "Wire Type mismatch in EnergyConsumerResultProto: " + ProtoUtils.currentFieldToString(pis)); } } @@ -264,7 +264,7 @@ public class ProtoStreamUtils { public static void print(EnergyConsumerResult[] energyConsumerResult) { for (int i = 0; i < energyConsumerResult.length; i++) { - Log.d(TAG, "EnergyConsumerId = " + energyConsumerResult[i].energyConsumerId + Slog.d(TAG, "EnergyConsumerId = " + energyConsumerResult[i].energyConsumerId + ", Timestamp (ms) = " + energyConsumerResult[i].timestampMs + ", Energy (uWs) = " + energyConsumerResult[i].energyUWs); } diff --git a/services/core/java/com/android/server/powerstats/TimerTrigger.java b/services/core/java/com/android/server/powerstats/TimerTrigger.java index a9bee8bec77f..4b5929552856 100644 --- a/services/core/java/com/android/server/powerstats/TimerTrigger.java +++ b/services/core/java/com/android/server/powerstats/TimerTrigger.java @@ -18,7 +18,7 @@ package com.android.server.powerstats; import android.content.Context; import android.os.Handler; -import android.util.Log; +import android.util.Slog; /** * TimerTrigger sets a 60 second opportunistic timer using postDelayed. @@ -39,7 +39,7 @@ public final class TimerTrigger extends PowerStatsLogTrigger { // Do not wake the device for these messages. Opportunistically log rail data every // LOG_PERIOD_MS. mHandler.postDelayed(mLogData, LOG_PERIOD_MS); - if (DEBUG) Log.d(TAG, "Received delayed message. Log rail data"); + if (DEBUG) Slog.d(TAG, "Received delayed message. Log rail data"); logPowerStatsData(); } }; |