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

Commit 5ffba38d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Correct dump()" into qt-dev

parents 1fca828a 75b0a992

services/core/java/com/android/server/attention/AttentionManagerService.java

+26 −5
Original line number Diff line number Diff line
@@ -374,8 +374,15 @@ public class AttentionManagerService extends SystemService { 
    private void dumpInternal(IndentingPrintWriter ipw) {

        ipw.println("Attention Manager Service (dumpsys attention) state:\n");



        ipw.printPair("context", mContext);

        ipw.println();

        ipw.println("AttentionServicePackageName=" + getServiceConfigPackage(mContext));

        ipw.println("Resolved component:");

        if (mComponentName != null) {

            ipw.increaseIndent();

            ipw.println("Component=" + mComponentName.getPackageName());

            ipw.println("Class=" + mComponentName.getClassName());

            ipw.decreaseIndent();

        }



        synchronized (mLock) {

            int size = mUserStates.size();

            ipw.print("Number user states: ");
@@ -511,10 +518,24 @@ public class AttentionManagerService extends SystemService { 
        }



        private void dump(IndentingPrintWriter pw) {

            pw.printPair("context", mContext);

            pw.printPair("userId", mUserId);

            pw.println("userId=" + mUserId);

            synchronized (mLock) {

                pw.printPair("binding", mBinding);

                pw.println("binding=" + mBinding);

                pw.println("current attention check:");

                if (mCurrentAttentionCheck != null) {

                    pw.increaseIndent();

                    pw.println("is dispatched=" + mCurrentAttentionCheck.mIsDispatched);

                    pw.println("is fulfilled:=" + mCurrentAttentionCheck.mIsFulfilled);

                    pw.decreaseIndent();

                }

                pw.println("attention check cache:");

                if (mAttentionCheckCache != null) {

                    pw.increaseIndent();

                    pw.println("last computed=" + mAttentionCheckCache.mLastComputed);

                    pw.println("timestamp=" + mAttentionCheckCache.mTimestamp);

                    pw.println("result=" + mAttentionCheckCache.mResult);

                    pw.decreaseIndent();

                }

            }

        }

services/core/java/com/android/server/power/AttentionDetector.java

+7 −7
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ public class AttentionDetector { 
            mRequested.set(false);

        }



        Slog.v(TAG, "Checking user attention");

        Slog.v(TAG, "Checking user attention, ID: " + mRequestId);

        return whenToCheck;

    }
@@ -277,12 +277,12 @@ public class AttentionDetector { 
    }



    public void dump(PrintWriter pw) {

        pw.print("AttentionDetector:");

        pw.print(" mMaximumExtensionMillis=" + mMaximumExtensionMillis);

        pw.print(" mMaxAttentionApiTimeoutMillis=" + mMaxAttentionApiTimeoutMillis);

        pw.print(" mLastUserActivityTime(excludingAttention)=" + mLastUserActivityTime);

        pw.print(" mAttentionServiceSupported=" + isAttentionServiceSupported());

        pw.print(" mRequested=" + mRequested);

        pw.println("AttentionDetector:");

        pw.println(" mMaximumExtensionMillis=" + mMaximumExtensionMillis);

        pw.println(" mMaxAttentionApiTimeoutMillis=" + mMaxAttentionApiTimeoutMillis);

        pw.println(" mLastUserActivityTime(excludingAttention)=" + mLastUserActivityTime);

        pw.println(" mAttentionServiceSupported=" + isAttentionServiceSupported());

        pw.println(" mRequested=" + mRequested);

    }



    @VisibleForTesting