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

Commit 793ae050 authored by Omar Eissa's avatar Omar Eissa Committed by Android (Google) Code Review
Browse files

Merge "Extend watchdog timeout in case of unmounting" into main

parents eccb3eed 980b248d

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

+1 −1
Original line number Original line 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.END_DOCUMENT;

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

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





import android.annotation.EnforcePermission;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

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

            } catch (Installer.InstallerException e) {

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

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

            }

            }

            extendWatchdogTimeout("#unmount might be slow");

            mVold.unmount(vol.getId());

            mVold.unmount(vol.getId());

            mStorageSessionController.onVolumeUnmount(vol.getImmutableVolumeInfo());

            mStorageSessionController.onVolumeUnmount(vol.getImmutableVolumeInfo());

        } catch (Exception e) {

        } catch (Exception e) {