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

am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev

Browse Source 
* commit '000dd0f8887ec32725cc8e9b44a8fe79543daf0d':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
This commit is contained in:
Yao Chen
2014-09-26 16:07:00 +00:00
committed by Android Git Automerger
parent 6575738251 d611fc1083
commit ecb8ebc8bb
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media/java/android/media/browse/MediaBrowser.java
View File

@@ -141,26 +141,31 @@ public final class MediaBrowser {
final ServiceConnection thisConnection = mServiceConnection = new MediaServiceConnection();
boolean bound = false;
try {
mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
if (mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)) {
bound = true;
}
} catch (Exception ex) {
Log.e(TAG, "Failed binding to service " + mServiceComponent);
}
if (!bound) {
// Tell them that it didn't work. We are already on the main thread,
// but we don't want to do callbacks inside of connect(). So post it,
// and then check that we are on the same ServiceConnection. We know
// we won't also get an onServiceConnected or onServiceDisconnected,
// so we won't be doing double callbacks.
mHandler.post(new Runnable() {
@Override
public void run() {
// Ensure that nobody else came in or tried to connect again.
if (thisConnection == mServiceConnection) {
forceCloseConnection();
mCallback.onConnectionFailed();
}
@Override
public void run() {
// Ensure that nobody else came in or tried to connect again.
if (thisConnection == mServiceConnection) {
forceCloseConnection();
mCallback.onConnectionFailed();
}
});
}
});
}
if (DBG) {