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

Commit 3917932a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unbind service error for MusicFxHelper" into main am: 52a3a399 

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



Change-Id: I406b6a5c346b9fb5af2aab78b4e1308d76bf9f25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af5e4189 52a3a399

services/core/java/com/android/server/audio/MusicFxHelper.java

+9 −3
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public class MusicFxHelper { 
    // The binder token identifying the UidObserver registration.

    private IBinder mUidObserverToken = null;



    private boolean mIsBound;



    // Package name and list of open audio sessions for this package

    private static class PackageSessions {

        String mPackageName;
@@ -110,6 +112,7 @@ public class MusicFxHelper { 
                if (procState > ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND) {

                    Intent bindIntent = new Intent().setClassName(mMusicFxPackageName,

                            "com.android.musicfx.KeepAliveService");

                    mIsBound = true;

                    mContext.bindServiceAsUser(

                            bindIntent, mMusicFxBindConnection, Context.BIND_AUTO_CREATE,

                            UserHandle.of(getCurrentUserId()));
@@ -158,12 +161,15 @@ public class MusicFxHelper { 
                    Log.e(TAG, "RemoteException with unregisterUidObserver: " + e);

                }

                mUidObserverToken = null;

                if (mIsBound) {

                    mContext.unbindService(mMusicFxBindConnection);

                    mIsBound = false;

                    Log.i(TAG, "last session closed, unregister UID observer, and unbind "

                            + mMusicFxPackageName);

                }

            }

        }

    }



    // Hashmap of UID and list of open sessions for this UID.

    @GuardedBy("mClientUidMapLock")