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

Commit c73c4a36 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android Git Automerger
Browse files

am b37f7e59: Merge changes I81fc2f90,I5e7fd759 

* commit 'b37f7e59':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
parents cffde30f b37f7e59

core/java/android/app/LocalActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ public class LocalActivityManager { 
        if (r != null) {

            win = performDestroy(r, finish);

            if (finish) {

                mActivities.remove(r);

                mActivities.remove(id);

            }

        }

        return win;

core/java/android/text/util/Linkify.java

+0 −4
Original line number Diff line number Diff line
@@ -498,10 +498,6 @@ public class Linkify { 


                return 0;

            }



            public final boolean equals(Object o) {

                return false;

            }

        };



        Collections.sort(links, c);