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

Merge "Correct rebind to DataLoader after crash/death." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-02 18:39:54 +00:00
committed by Android (Google) Code Review
parent 90b5c66337 e98e2cbdca
commit 2190aed87a
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/pm/DataLoaderManagerService.java
View File

@@ -207,35 +207,37 @@ public class DataLoaderManagerService extends SystemService {
@Override
public void onServiceDisconnected(ComponentName arg0) {
Slog.i(TAG, "DataLoader " + mId + " disconnected, but will try to recover");
callListener(IDataLoaderStatusListener.DATA_LOADER_DESTROYED);
destroy();
unbindAndReportDestroyed();
}
@Override
public void onBindingDied(ComponentName name) {
Slog.i(TAG, "DataLoader " + mId + " died");
callListener(IDataLoaderStatusListener.DATA_LOADER_DESTROYED);
destroy();
unbindAndReportDestroyed();
}
@Override
public void onNullBinding(ComponentName name) {
Slog.i(TAG, "DataLoader " + mId + " failed to start");
callListener(IDataLoaderStatusListener.DATA_LOADER_DESTROYED);
destroy();
unbindAndReportDestroyed();
}
@Override
public void binderDied() {
Slog.i(TAG, "DataLoader " + mId + " died");
callListener(IDataLoaderStatusListener.DATA_LOADER_DESTROYED);
destroy();
unbindAndReportDestroyed();
}
IDataLoader getDataLoader() {
return mDataLoader;
}
private void unbindAndReportDestroyed() {
if (unbind()) {
callListener(IDataLoaderStatusListener.DATA_LOADER_DESTROYED);
}
}
void destroy() {
if (mDataLoader != null) {
try {
@@ -244,11 +246,15 @@ public class DataLoaderManagerService extends SystemService {
}
mDataLoader = null;
}
unbind();
}
boolean unbind() {
try {
mContext.unbindService(this);
} catch (Exception ignored) {
}
remove();
return remove();
}
private boolean append() {
@@ -266,12 +272,14 @@ public class DataLoaderManagerService extends SystemService {
}
}
private void remove() {
private boolean remove() {
synchronized (mServiceConnections) {
if (mServiceConnections.get(mId) == this) {
mServiceConnections.remove(mId);
return true;
}
}
return false;
}
private void callListener(int status) {