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

Merge "Fix StorageManagerService linkToDeath more than one time when vold/storaged died."

Browse Source 
am: d7f82d5766

Change-Id: I2a6fc7358c3c13cd67fc642d55c9973ab24331d1
This commit is contained in:
Jeff Sharkey
2019-08-07 09:36:24 -07:00
committed by android-build-merger
parent b745860a3e d7f82d5766
commit c80ad354b4
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1557,10 +1557,11 @@ class StorageManagerService extends IStorageManager.Stub
} }
private void start() { private void start() {
connect(); connectStoraged();
connectVold();
} }
private void connect() { private void connectStoraged() {
IBinder binder = ServiceManager.getService("storaged"); IBinder binder = ServiceManager.getService("storaged");
if (binder != null) { if (binder != null) {
try { try {
@@ -1569,7 +1570,7 @@ class StorageManagerService extends IStorageManager.Stub
public void binderDied() { public void binderDied() {
Slog.w(TAG, "storaged died; reconnecting"); Slog.w(TAG, "storaged died; reconnecting");
mStoraged = null; mStoraged = null;
connect(); connectStoraged();
} }
}, 0); }, 0);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -1583,7 +1584,17 @@ class StorageManagerService extends IStorageManager.Stub
Slog.w(TAG, "storaged not found; trying again"); Slog.w(TAG, "storaged not found; trying again");
} }
binder = ServiceManager.getService("vold"); if (mStoraged == null) {
BackgroundThread.getHandler().postDelayed(() -> {
connectStoraged();
}, DateUtils.SECOND_IN_MILLIS);
} else {
onDaemonConnected();
}
}
private void connectVold() {
IBinder binder = ServiceManager.getService("vold");
if (binder != null) { if (binder != null) {
try { try {
binder.linkToDeath(new DeathRecipient() { binder.linkToDeath(new DeathRecipient() {
@@ -1591,7 +1602,7 @@ class StorageManagerService extends IStorageManager.Stub
public void binderDied() { public void binderDied() {
Slog.w(TAG, "vold died; reconnecting"); Slog.w(TAG, "vold died; reconnecting");
mVold = null; mVold = null;
connect(); connectVold();
} }
}, 0); }, 0);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -1611,9 +1622,9 @@ class StorageManagerService extends IStorageManager.Stub
Slog.w(TAG, "vold not found; trying again"); Slog.w(TAG, "vold not found; trying again");
} }
if (mStoraged == null || mVold == null) { if (mVold == null) {
BackgroundThread.getHandler().postDelayed(() -> { BackgroundThread.getHandler().postDelayed(() -> {
connect(); connectVold();
}, DateUtils.SECOND_IN_MILLIS); }, DateUtils.SECOND_IN_MILLIS);
} else { } else {
onDaemonConnected(); onDaemonConnected();