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

Commit d0d2d5b6 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Catch exceptions from prepareUserStorage() in... 

Merge "Catch exceptions from prepareUserStorage() in loadPrivatePackagesInner()" am: 00212f28 am: 701876a9 am: 84ade52c

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



Change-Id: I3db63f1d0a0d88b13dd33f9957d8b4cda42ede1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c780324 84ade52c

services/core/java/com/android/server/pm/StorageEventHelper.java

+5 −2
Original line number Diff line number Diff line
@@ -196,8 +196,11 @@ public final class StorageEventHelper extends StorageEventListener { 
                    appDataHelper.reconcileAppsDataLI(volumeUuid, user.id, flags,

                            true /* migrateAppData */);

                }

            } catch (IllegalStateException e) {

                // Device was probably ejected, and we'll process that event momentarily

            } catch (RuntimeException e) {

                // The volume was probably already unmounted.  We'll probably process the unmount

                // event momentarily.  TODO(b/256909937): ignoring errors from prepareUserStorage()

                // is very dangerous.  Instead, we should fix the race condition that allows this

                // code to run on an unmounted volume in the first place.

                Slog.w(TAG, "Failed to prepare storage: " + e);

            }

        }