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

Commit 980b248d authored by Omar Eissa's avatar Omar Eissa
Browse files

Extend watchdog timeout in case of unmounting 

Unmounting public volumes through Settings app would call into unmount
method in StorageManagerService. Unmounting could take long time to
complete. Hence, calling extendWatchdogTimeout to make sure that
Watchdog won't throw given it's known that unmounting is long running
operation, that's not really blocked.

Test: Manual
Bug: 369519866
Flag: EXEMPT bugfix
Change-Id: I1a307372fc08dc6f36c479a586648defe32d3a86
parent d9f8e5f2

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import static com.android.internal.util.XmlUtils.writeStringAttribute; 
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;

import static org.xmlpull.v1.XmlPullParser.START_TAG;



import android.annotation.EnforcePermission;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;
@@ -2443,6 +2442,7 @@ class StorageManagerService extends IStorageManager.Stub 
            } catch (Installer.InstallerException e) {

                Slog.e(TAG, "Failed unmount mirror data", e);

            }

            extendWatchdogTimeout("#unmount might be slow");

            mVold.unmount(vol.getId());

            mStorageSessionController.onVolumeUnmount(vol.getImmutableVolumeInfo());

        } catch (Exception e) {