Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd722084 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

BatteryStats: Add debug logging to narrow down slow camera launch 

BatteryStats is on the hotpath when the screen is turning on.
Double tap to launch camera may be impacted on some dogfood devices.
Adds logging (that will be removed before release) to help narrow
down the cases when this happens.

Bug: 36201811
Test: builds/manual
Change-Id: I8080ac09b21269237eda6215d73199676de2005a
parent 881a623e

services/core/java/com/android/server/am/BatteryStatsService.java

+46 −20
Original line number Diff line number Diff line
@@ -149,9 +149,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub 


                case MSG_WRITE_TO_DISK:

                    updateExternalStatsSync("write", UPDATE_ALL);

                    Slog.d(TAG, "begin writeAsyncLocked");

                    synchronized (mStats) {

                        mStats.writeAsyncLocked();

                    }

                    Slog.d(TAG, "end writeAsyncLocked");

                    break;

            }

        }
@@ -191,6 +193,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub 


    @Override

    public String getPlatformLowPowerStats() {

        Slog.d(TAG, "begin getPlatformLowPowerStats");

        try {

            mUtf8BufferStat.clear();

            mUtf16BufferStat.clear();

            mDecoderStat.reset();
@@ -204,6 +208,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
            mDecoderStat.decode(mUtf8BufferStat, mUtf16BufferStat, true);

            mUtf16BufferStat.flip();

            return mUtf16BufferStat.toString();

        } finally {

            Slog.d(TAG, "end getPlatformLowPowerStats");

        }

    }



    BatteryStatsService(File systemDir, Handler handler) {
@@ -551,9 +558,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        

    public void noteScreenState(int state) {

        enforceCallingPermission();

        Slog.d(TAG, "begin noteScreenState");

        synchronized (mStats) {

            mStats.noteScreenStateLocked(state);

        }

        Slog.d(TAG, "end noteScreenState");

    }

    

    public void noteScreenBrightness(int brightness) {
@@ -706,9 +715,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub 


    public void noteStartCamera(int uid) {

        enforceCallingPermission();

        Slog.d(TAG, "begin noteStartCamera");

        synchronized (mStats) {

            mStats.noteCameraOnLocked(uid);

        }

        Slog.d(TAG, "end noteStartCamera");

    }



    public void noteStopCamera(int uid) {
@@ -1009,24 +1020,32 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        mHandler.post(new Runnable() {

            @Override

            public void run() {

                Slog.d(TAG, "begin setBatteryStateLocked");

                try {

                    synchronized (mStats) {

                        final boolean onBattery = plugType == BatteryStatsImpl.BATTERY_PLUGGED_NONE;

                        if (mStats.isOnBattery() == onBattery) {

                            // The battery state has not changed, so we don't need to sync external

                            // stats immediately.

                        mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt,

                            mStats.setBatteryStateLocked(status, health, plugType, level, temp,

                                    volt,

                                    chargeUAh, chargeFullUAh);

                            return;

                        }

                    }

                } finally {

                    Slog.d(TAG, "end setBatteryStateLocked");

                }



                // Sync external stats first as the battery has changed states. If we don't sync

                // immediately here, we may not collect the relevant data later.

                updateExternalStatsSync("battery-state", BatteryStatsImpl.ExternalStatsSync.UPDATE_ALL);

                Slog.d(TAG, "begin setBatteryStateLocked");

                synchronized (mStats) {

                    mStats.setBatteryStateLocked(status, health, plugType, level, temp, volt,

                            chargeUAh, chargeFullUAh);

                }

                Slog.d(TAG, "end setBatteryStateLocked");

            }

        });

    }
@@ -1326,19 +1345,23 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                    }

                }

            }

            Slog.d(TAG, "begin dumpCheckinLocked from UID " + Binder.getCallingUid());

            synchronized (mStats) {

                mStats.dumpCheckinLocked(mContext, pw, apps, flags, historyStart);

                if (writeData) {

                    mStats.writeAsyncLocked();

                }

            }

            Slog.d(TAG, "end dumpCheckinLocked");

        } else {

            Slog.d(TAG, "begin dumpLocked from UID " + Binder.getCallingUid());

            synchronized (mStats) {

                mStats.dumpLocked(mContext, pw, flags, reqUid, historyStart);

                if (writeData) {

                    mStats.writeAsyncLocked();

                }

            }

            Slog.d(TAG, "end dumpLocked");

        }

    }
@@ -1460,9 +1483,11 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        SynchronousResultReceiver bluetoothReceiver = null;

        SynchronousResultReceiver modemReceiver = null;



        Slog.d(TAG, "begin updateExternalStatsSync reason=" + reason);

        synchronized (mExternalStatsLock) {

            if (mContext == null) {

                // Don't do any work yet.

                Slog.d(TAG, "end updateExternalStatsSync");

                return;

            }
@@ -1559,6 +1584,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
                }

            }

        }

        Slog.d(TAG, "end updateExternalStatsSync");

    }



    /**