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

Commit ff3ff896 authored by Corina Grigoras's avatar Corina Grigoras Committed by Automerger Merge Worker
Browse files

Merge "Keep lock while binding the storage service" into rvc-dev am:... 

Merge "Keep lock while binding the storage service" into rvc-dev am: cdde51ea am: 8ddeead6 am: 9e70944e

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

Change-Id: Idea07b37511677cda0a13d24842bc8a37a682a9a
parents ab39a8d0 9e70944e

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

+9 −11
Original line number Diff line number Diff line
@@ -413,7 +413,6 @@ public final class StorageUserConnection { 
                        resetUserSessions();

                    }

                };

            }



                Slog.i(TAG, "Binding to the ExternalStorageService for user " + mUserId);

                if (mContext.bindServiceAsUser(new Intent().setComponent(name), mServiceConnection,
@@ -422,14 +421,13 @@ public final class StorageUserConnection { 
                    Slog.i(TAG, "Bound to the ExternalStorageService for user " + mUserId);

                    return mLatch;

                } else {

                synchronized (mLock) {

                    mIsConnecting = false;

                }

                    throw new ExternalStorageServiceException(

                            "Failed to bind to the ExternalStorageService for user " + mUserId);

                }

            }

        }

    }



    private static final class Session {

        public final String sessionId;