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

Commit dccd16c0 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: 6b4a4aa4

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

Change-Id: I1cba6069b6db9a90c908bd69b4e00cce8b36d073
parents ab39a8d0 6b4a4aa4

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;