diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-10-02 18:27:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-02 18:27:28 +0000 |
| commit | 3ce2fc00ce709ed066f394d2fd00c7aee1b0342e (patch) | |
| tree | 1bc7f4237455da2997bd66f2329d2661dbdb552a /core/java | |
| parent | 6214ad9f5f02d21026a1c9e132f9e95a825359fc (diff) | |
| parent | afa8043cf5e6acd4670c3cce89a46ba702aa5e83 (diff) | |
Merge "Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am: dab9eff899" into oc-mr1-dev-plus-aosp am: bb268b9fd6"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index eb639bd98d49..e3a55cb617db 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -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(); } } |