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

Commit d8181994 authored by Omar Eissa's avatar Omar Eissa
Browse files

Don't hold lock when calling into ExternalStorageService 

Make sure that we don't hold StorageSessionController lock when calling
into ExternalStorageService hosted my MediaProvider. It was found that
Watchdog was crashing SystemServer because some other operations were
waiting to hold StorageSessionController lock which was held by
notifyVolumeStateChanged, and if this operation takes long, other
operations will be blocked for no reason, even if they don't require
calling into ExternalStorageService.

Bug: 369519866
Test: Manual
Flag: EXEMPT bufix
Change-Id: I0dc31e10579227f252597779225de1a19c82ea9a
parent d9f8e5f2

services/core/java/com/android/server/storage/StorageSessionController.java

+20 −17
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ public final class StorageSessionController { 
        StorageUserConnection connection = null;

        synchronized (mLock) {

            connection = mConnections.get(connectionUserId);

        }



        if (connection != null) {

            Slog.i(TAG, "Notifying volume state changed for session with id: " + sessionId);

            connection.notifyVolumeStateChanged(sessionId,
@@ -165,7 +167,6 @@ public final class StorageSessionController { 
                    + connectionUserId);

        }

    }

    }



    /**

     * Frees any cache held by ExternalStorageService.
@@ -225,8 +226,11 @@ public final class StorageSessionController { 
        String sessionId = vol.getId();

        int userId = getConnectionUserIdForVolume(vol);



        StorageUserConnection connection = null;

        synchronized (mLock) {

            StorageUserConnection connection = mConnections.get(userId);

            connection = mConnections.get(userId);

        }



        if (connection != null) {

            Slog.i(TAG, "Removed session for vol with id: " + sessionId);

            connection.removeSession(sessionId);
@@ -236,7 +240,6 @@ public final class StorageSessionController { 
            return null;

        }

    }

    }





    /**