Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increase timeout waiting for ExternalStorageService to bind." into rvc-dev am: c817e215f9 am: e33a51eaca

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894162

Change-Id: I259097f936ac1f658878ea7f9ac270428185b2a5
This commit is contained in:
Martijn Coenen
2020-06-18 14:56:45 +00:00
committed by Automerger Merge Worker
parent f5ce29e7c0 e33a51eaca
commit 19d3f70058
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -52,7 +52,6 @@ import static com.android.internal.util.XmlUtils.readStringAttribute;
import static com.android.internal.util.XmlUtils.writeIntAttribute; import static com.android.internal.util.XmlUtils.writeIntAttribute;
import static com.android.internal.util.XmlUtils.writeLongAttribute; import static com.android.internal.util.XmlUtils.writeLongAttribute;
import static com.android.internal.util.XmlUtils.writeStringAttribute; import static com.android.internal.util.XmlUtils.writeStringAttribute;
import static com.android.server.storage.StorageUserConnection.REMOTE_TIMEOUT_SECONDS;
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;
@@ -224,6 +223,9 @@ class StorageManagerService extends IStorageManager.Stub
private static final String ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY = private static final String ANDROID_VOLD_APP_DATA_ISOLATION_ENABLED_PROPERTY =
"persist.sys.vold_app_data_isolation_enabled"; "persist.sys.vold_app_data_isolation_enabled";
// How long we wait to reset storage, if we failed to call onMount on the
// external storage service.
public static final int FAILED_MOUNT_RESET_TIMEOUT_SECONDS = 10;
/** /**
* If {@code 1}, enables the isolated storage feature. If {@code -1}, * If {@code 1}, enables the isolated storage feature. If {@code -1},
* disables the isolated storage feature. If {@code 0}, uses the default * disables the isolated storage feature. If {@code 0}, uses the default
@@ -2202,7 +2204,7 @@ class StorageManagerService extends IStorageManager.Stub
} catch (ExternalStorageServiceException e) { } catch (ExternalStorageServiceException e) {
Slog.e(TAG, "Failed to mount volume " + vol, e); Slog.e(TAG, "Failed to mount volume " + vol, e);
int nextResetSeconds = REMOTE_TIMEOUT_SECONDS * 2; int nextResetSeconds = FAILED_MOUNT_RESET_TIMEOUT_SECONDS;
Slog.i(TAG, "Scheduling reset in " + nextResetSeconds + "s"); Slog.i(TAG, "Scheduling reset in " + nextResetSeconds + "s");
mHandler.removeMessages(H_RESET); mHandler.removeMessages(H_RESET);
mHandler.sendMessageDelayed(mHandler.obtainMessage(H_RESET), mHandler.sendMessageDelayed(mHandler.obtainMessage(H_RESET),

3
services/core/java/com/android/server/storage/StorageUserConnection.java
View File

@@ -62,7 +62,7 @@ import java.util.concurrent.TimeoutException;
public final class StorageUserConnection { public final class StorageUserConnection {
private static final String TAG = "StorageUserConnection"; private static final String TAG = "StorageUserConnection";
public static final int REMOTE_TIMEOUT_SECONDS = 5; public static final int REMOTE_TIMEOUT_SECONDS = 20;
private final Object mLock = new Object(); private final Object mLock = new Object();
private final Context mContext; private final Context mContext;
@@ -202,6 +202,7 @@ public final class StorageUserConnection {
try { try {
if (!latch.await(REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) { if (!latch.await(REMOTE_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
// TODO(b/140025078): Call ActivityManager ANR API? // 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"); throw new TimeoutException("Latch wait for " + reason + " elapsed");
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {