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

Commit f92de2f6 authored by Li Li's avatar Li Li
Browse files

Fix lock contention in CAO.binderError handler 

CAO.binderError handler already has a local copy of frozen pids. It's
not necessary to hold Freezer lock. Holding the Freezer lock here
actually causes lock contention as the CAO thread might be preempted for
multiple seconds, blocking unfreeze operations in freezeHandler.

Bug: 323393888
Test: frozen apps receiving unexpected binder transactions can be killed
Change-Id: I8d6f1b2327dae76b61ef6f4d7f39d66a85f313f1
parent 6139d587

services/core/java/com/android/server/am/CachedAppOptimizer.java

+4 −5
Original line number Diff line number Diff line
@@ -2256,10 +2256,9 @@ public final class CachedAppOptimizer { 
                        }

                    }



                    // Check binder errors to frozen processes with a local freezer lock

                    synchronized (mFreezerLock) {

                        binderErrorLocked(pids);

                    }

                    // Check binder errors to frozen processes

                    // Freezer lock is not required as we don't perform (un)freeze operations here

                    binderErrorInternal(pids);

                } break;

                default:

                    return;
@@ -2618,7 +2617,7 @@ public final class CachedAppOptimizer { 
        mFreezeHandler.sendEmptyMessage(BINDER_ERROR_MSG);

    }



    private void binderErrorLocked(IntArray pids) {

    private void binderErrorInternal(IntArray pids) {

        // PIDs that run out of async binder buffer when being frozen

        ArraySet<Integer> pidsAsync = (mFreezerBinderAsyncThreshold < 0) ? null : new ArraySet<>();