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

Commit b50f7410 authored by Aleksandr Lukin's avatar Aleksandr Lukin Committed by Android (Google) Code Review
Browse files

Merge "Extend the watchdog timeout when calling #mount operation" into main

parents 0d11a371 f4cc30c3

services/core/java/com/android/server/StorageManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -2341,6 +2341,8 @@ class StorageManagerService extends IStorageManager.Stub 
        try {

            // TODO(b/135341433): Remove cautious logging when FUSE is stable

            Slog.i(TAG, "Mounting volume " + vol);

            Watchdog.getInstance().setOneOffTimeoutForMonitors(

                    SLOW_OPERATION_WATCHDOG_TIMEOUT_MS, "#mount might be slow");

            mVold.mount(vol.id, vol.mountFlags, vol.mountUserId, new IVoldMountCallback.Stub() {

                @Override

                public boolean onVolumeChecking(FileDescriptor fd, String path,