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

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

Merge "Catch exceptions from prepareUserStorage() in loadPrivatePackagesInner()" am: 00212f28 

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



Change-Id: I7bd8f6ec6d54e0be077e36923e52905767e79c15
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1799c950 00212f28

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

+5 −2
Original line number Diff line number Diff line
@@ -197,8 +197,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);

            }

        }