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

Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-02 17:44:57 +00:00
committed by Android (Google) Code Review
parent 2174056518 fcd7fae5e6
commit dab9eff899
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -1585,8 +1585,8 @@ public class ChooserActivity extends ResolverActivity {
} catch (RemoteException e) {
Log.e(TAG, "Querying ChooserTargetService " + name + " failed.", e);
mChooserActivity.unbindService(this);
destroy();
mChooserActivity.mServiceConnections.remove(this);
destroy();
}
}
}
@@ -1602,7 +1602,6 @@ public class ChooserActivity extends ResolverActivity {
}
mChooserActivity.unbindService(this);
destroy();
mChooserActivity.mServiceConnections.remove(this);
if (mChooserActivity.mServiceConnections.isEmpty()) {
mChooserActivity.mChooserHandler.removeMessages(
@@ -1610,6 +1609,7 @@ public class ChooserActivity extends ResolverActivity {
mChooserActivity.sendVoiceChoicesIfNeeded();
}
mConnectedComponent = null;
destroy();
}
}