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

Commit c2c34a8a authored by Xiang Wang's avatar Xiang Wang Committed by Automerger Merge Worker
Browse files

Merge "Don't throw if hint session death link doesn't exist" into main am: c809fcee 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2853686



Change-Id: I90cbb0bb751faee4846ef66ccf04c6d36723066f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9c21a10 c809fcee

services/core/java/com/android/server/power/hint/HintManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import java.io.FileDescriptor; 
import java.io.PrintWriter;

import java.util.Arrays;

import java.util.List;

import java.util.NoSuchElementException;

import java.util.Objects;



/** An hint service implementation that runs in System Server process. */
@@ -521,7 +522,11 @@ public final class HintManagerService extends SystemService { 
                if (mHalSessionPtr == 0) return;

                mNativeWrapper.halCloseHintSession(mHalSessionPtr);

                mHalSessionPtr = 0;

                try {

                    mToken.unlinkToDeath(this, 0);

                } catch (NoSuchElementException ignored) {

                    Slogf.d(TAG, "Death link does not exist for session with UID " + mUid);

                }

                ArrayMap<IBinder, ArraySet<AppHintSession>> tokenMap = mActiveSessions.get(mUid);

                if (tokenMap == null) {

                    Slogf.w(TAG, "UID %d is not present in active session map", mUid);