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

Commit 0d0012ef authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 54af78a3: Merge change 5950 into donut 

Merge commit '54af78a3'

* commit '54af78a3':
  Fix memory leaks in system_server
parents 1c502a46 54af78a3

core/java/android/app/ActivityThread.java

+8 −2
Original line number Diff line number Diff line
@@ -3981,7 +3981,10 @@ public final class ActivityThread { 
            ProviderRecord pr = mProviderMap.get(name);

            if (pr.mProvider.asBinder() == provider.asBinder()) {

                Log.i(TAG, "Removing dead content provider: " + name);

                mProviderMap.remove(name);

                ProviderRecord removed = mProviderMap.remove(name);

                if (removed != null) {

                    removed.mProvider.asBinder().unlinkToDeath(removed, 0);

                }

            }

        }

    }
@@ -3990,7 +3993,10 @@ public final class ActivityThread { 
        ProviderRecord pr = mProviderMap.get(name);

        if (pr.mProvider.asBinder() == provider.asBinder()) {

            Log.i(TAG, "Removing dead content provider: " + name);

            mProviderMap.remove(name);

            ProviderRecord removed = mProviderMap.remove(name);

            if (removed != null) {

                removed.mProvider.asBinder().unlinkToDeath(removed, 0);

            }

        }

    }

location/java/com/android/internal/location/GpsLocationProvider.java

+3 −0
Original line number Diff line number Diff line
@@ -616,6 +616,9 @@ public class GpsLocationProvider extends ILocationProvider.Stub { 
            synchronized(mListeners) {

                mListeners.remove(this);

            }

            if (mListener != null) {

                mListener.asBinder().unlinkToDeath(this, 0);

            }

        }

    }

location/java/com/android/internal/location/LocationProviderProxy.java

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ public class LocationProviderProxy implements IBinder.DeathRecipient { 
        }

    }



    public void unlinkProvider() {

        if (mProvider != null) {

            mProvider.asBinder().unlinkToDeath(this, 0);

        }

    }



    public String getName() {

        return mName;

    }
@@ -255,5 +261,6 @@ public class LocationProviderProxy implements IBinder.DeathRecipient { 
    public void binderDied() {

        Log.w(TAG, "Location Provider " + mName + " died");

        mDead = true;

        mProvider.asBinder().unlinkToDeath(this, 0);

    }

}

services/java/com/android/server/LocationManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 


    private void removeProvider(LocationProviderProxy provider) {

        mProviders.remove(provider);

        provider.unlinkProvider();

        mProvidersByName.remove(provider.getName());

    }

services/java/com/android/server/PowerManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -709,7 +709,10 @@ class PowerManagerService extends IPowerManager.Stub implements LocalPowerManage 
                    p.awakeOnSet = true;

                }

            } else {

                mPokeLocks.remove(token);

                PokeLock rLock = mPokeLocks.remove(token);

                if (rLock != null) {

                    token.unlinkToDeath(rLock, 0);

                }

            }



            int oldPokey = mPokey;