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

Commit 10800341 authored by Alex Salo's avatar Alex Salo
Browse files

Notify caller about cancellation 

In an event when service disconnected we clear the pending callback.
Don't forget to cancel it and notify the caller.

Bug: 129348179
Test: manually
Change-Id: Iaf3d44df9bbee4b31ae3aa680351f1cdd7f0ef96
parent ec35d666

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.attention; 
import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE;

import static android.provider.Settings.System.ADAPTIVE_SLEEP;

import static android.service.attention.AttentionService.ATTENTION_FAILURE_CANCELLED;

import static android.service.attention.AttentionService.ATTENTION_FAILURE_UNKNOWN;



import android.Manifest;

import android.annotation.NonNull;
@@ -249,6 +250,7 @@ public class AttentionManagerService extends SystemService { 
                if (userState.mPendingAttentionCheck != null

                        && userState.mPendingAttentionCheck.mCallbackInternal.equals(

                        callbackInternal)) {

                    userState.mPendingAttentionCheck.cancel(ATTENTION_FAILURE_UNKNOWN);

                    userState.mPendingAttentionCheck = null;

                }

                return;
@@ -624,7 +626,7 @@ public class AttentionManagerService extends SystemService { 
            if (userState == null) {

                return;

            }

            cancel(userState, AttentionService.ATTENTION_FAILURE_UNKNOWN);

            cancel(userState, ATTENTION_FAILURE_UNKNOWN);



            mContext.unbindService(userState.mConnection);

            userState.mConnection.cleanupService();