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

Commit 1d6554f0 authored by Zim's avatar Zim
Browse files

Reduce demo user FUSE volume mount timeout 

A long timeout seems to break demo users when calling
DevicePolicyManagerService#enableSystemApp.

We soft-revert Ia8f6f121448f6b5e484fd3e8cca845fdd89afc23 just for demo
users while investigating the root cause.

Test: Manual
Bug: 161702661
Change-Id: I8ff153f2649e3a1d05f2e3e6e382bbba8c79630c
parent 77e3cce0

services/core/java/com/android/server/storage/StorageUserConnection.java

+10 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.ParcelFileDescriptor; 
import android.os.ParcelableException;

import android.os.RemoteCallback;

import android.os.UserHandle;

import android.os.UserManagerInternal;

import android.os.storage.StorageManagerInternal;

import android.os.storage.StorageVolume;

import android.service.storage.ExternalStorageService;
@@ -62,19 +63,25 @@ import java.util.concurrent.TimeoutException; 
public final class StorageUserConnection {

    private static final String TAG = "StorageUserConnection";



    public static final int REMOTE_TIMEOUT_SECONDS = 20;

    private static final int DEFAULT_REMOTE_TIMEOUT_SECONDS = 20;

    // TODO(b/161702661): Workaround for demo user to have shorter timeout.

    // This allows the DevicePolicyManagerService#enableSystemApp call to succeed without ANR.

    private static final int DEMO_USER_REMOTE_TIMEOUT_SECONDS = 5;



    private final Object mLock = new Object();

    private final Context mContext;

    private final int mUserId;

    private final StorageSessionController mSessionController;

    private final ActiveConnection mActiveConnection = new ActiveConnection();

    private final boolean mIsDemoUser;

    @GuardedBy("mLock") private final Map<String, Session> mSessions = new HashMap<>();



    public StorageUserConnection(Context context, int userId, StorageSessionController controller) {

        mContext = Objects.requireNonNull(context);

        mUserId = Preconditions.checkArgumentNonnegative(userId);

        mSessionController = controller;

        mIsDemoUser = LocalServices.getService(UserManagerInternal.class)

                .getUserInfo(userId).isDemo();

    }



    /**
@@ -200,7 +207,8 @@ public final class StorageUserConnection { 


    private void waitForLatch(CountDownLatch latch, String reason) throws TimeoutException {

        try {

            if (!latch.await(REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {

            if (!latch.await(mIsDemoUser ? DEMO_USER_REMOTE_TIMEOUT_SECONDS

                            : DEFAULT_REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {

                // TODO(b/140025078): Call ActivityManager ANR API?

                Slog.wtf(TAG, "Failed to bind to the ExternalStorageService for user " + mUserId);

                throw new TimeoutException("Latch wait for " + reason + " elapsed");