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

Commit 32607d3b authored by Atneya Nair's avatar Atneya Nair
Browse files

Fix appops callback leak 

Test: dumpsys appops after track finish to verify listener clears
Bug: 376481063
Bug: 385535422
Flag: com.android.media.audio.hardening_impl
Change-Id: Id431726a669a31a65ff63a66c79aadd9c7701db8
parent 4ecdd87b

media/libaudiopermission/AppOpsSession.cpp

+7 −2
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ using ::android::content::AttributionSourceState; 


namespace android::media::permission {



// params are unreliable at the moment

void DefaultAppOpsFacade::OpMonitor::opChanged(int32_t, const String16&) {

// Package name param is unreliable (can be empty), but we should only get valid events based on

// how we register the listener.

void DefaultAppOpsFacade::OpMonitor::opChanged(int32_t op, const String16&) {

    if (mOps.attributedOp != op && mOps.additionalOp != op) return;

    DefaultAppOpsFacade x{};

    const auto allowed = x.checkAccess(mAttr, mOps);

    std::lock_guard l_{mLock};
@@ -107,6 +109,9 @@ void DefaultAppOpsFacade::removeChangeCallback(uintptr_t ptr) { 
    }

    LOG_ALWAYS_FATAL_IF(monitor == nullptr, "Unexpected nullptr in cb map");

    monitor->stopListening();

    // Callbacks are stored via binder identity in AppOpsService, so unregistering the callback

    // removes it regardless of how many calls to startWatchingMode occurred

    AppOpsManager{}.stopWatchingMode(monitor);

}



}  // namespace android::media::permission