Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fce1eb3e authored by Dan Sandler's avatar Dan Sandler Committed by android-build-merger
Browse files

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

am: dab9eff8

Change-Id: Idfc6a98804928a177153492010e04ec75fa30755
parents 659cbdf9 dab9eff8

core/java/com/android/internal/app/ChooserActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

            }

        }