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

Commit 547c20df authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627:... 

am 48f6b7e2: am 59cb2cf1: Merge "Revert fix to issue #6880627: PendingIntent.getService() returns..." into jb-mr1-dev

* commit '48f6b7e2':
  Revert fix to issue #6880627: PendingIntent.getService() returns...
parents 734a68fb 48f6b7e2

services/java/com/android/server/am/ActivityManagerService.java

+42 −36
Original line number Original line Diff line number Diff line
@@ -3930,6 +3930,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
            removeDyingProviderLocked(null, providers.get(i), true);

            removeDyingProviderLocked(null, providers.get(i), true);

        }

        }




















        if (name == null) {














            // Remove pending intents.  For now we only do this when force














            // stopping users, because we have some problems when doing this














            // for packages -- app widgets are not currently cleaned up for














            // such packages, so they can be left with bad pending intents.











            if (mIntentSenderRecords.size() > 0) {







            if (mIntentSenderRecords.size() > 0) {











                Iterator<WeakReference<PendingIntentRecord>> it







                Iterator<WeakReference<PendingIntentRecord>> it











                        = mIntentSenderRecords.values().iterator();







                        = mIntentSenderRecords.values().iterator();










@@ -3975,6 +3980,7 @@ public final class ActivityManagerService extends ActivityManagerNative









                    }







                    }











                }







                }











            }







            }














        }



























        if (doit) {







        if (doit) {











            if (purgeCache && name != null) {







            if (purgeCache && name != null) {