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

Commit ba0f563d authored by Yi Jiang's avatar Yi Jiang
Browse files

Ensures only one result is logged per attention check 

There is a rare chance that one attention check will report results
twice. Results should only log at the time when attention check is
fulfilled.

Test: manual
Bug: 149931757
Change-Id: Ie0a6316d77140be5205f3d944164625ed786416a
parent 2e806917

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

+13 −13
Original line number Diff line number Diff line
@@ -260,12 +260,12 @@ public class AttentionManagerService extends SystemService { 
        final IAttentionCallback iAttentionCallback = new IAttentionCallback.Stub() {

            @Override

            public void onSuccess(@AttentionSuccessCodes int result, long timestamp) {

                // the callback might have been cancelled already

                if (!userState.mCurrentAttentionCheck.mIsFulfilled) {

                    callbackInternal.onSuccess(result, timestamp);

                    userState.mCurrentAttentionCheck.mIsFulfilled = true;

                if (userState.mCurrentAttentionCheck.mIsFulfilled) {

                    return;

                }



                userState.mCurrentAttentionCheck.mIsFulfilled = true;

                callbackInternal.onSuccess(result, timestamp);

                logStats(result);

                synchronized (mLock) {

                    if (userState.mAttentionCheckCacheBuffer == null) {

                        userState.mAttentionCheckCacheBuffer = new AttentionCheckCacheBuffer();
@@ -273,22 +273,22 @@ public class AttentionManagerService extends SystemService { 
                    userState.mAttentionCheckCacheBuffer.add(

                            new AttentionCheckCache(SystemClock.uptimeMillis(), result, timestamp));

                }

                FrameworkStatsLog.write(

                        FrameworkStatsLog.ATTENTION_MANAGER_SERVICE_RESULT_REPORTED,

                        result);

            }



            @Override

            public void onFailure(@AttentionFailureCodes int error) {

                // the callback might have been cancelled already

                if (!userState.mCurrentAttentionCheck.mIsFulfilled) {

                    callbackInternal.onFailure(error);

                if (userState.mCurrentAttentionCheck.mIsFulfilled) {

                    return;

                }

                userState.mCurrentAttentionCheck.mIsFulfilled = true;

                callbackInternal.onFailure(error);

                logStats(error);

            }



            private void logStats(int result) {

                FrameworkStatsLog.write(

                        FrameworkStatsLog.ATTENTION_MANAGER_SERVICE_RESULT_REPORTED,

                        error);

                        result);

            }

        };