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

Commit 59cb2cf1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents f15005ee 861a3b2d

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

+42 −36
Original line number Diff line number Diff line
@@ -3930,6 +3930,11 @@ public final class ActivityManagerService extends ActivityManagerNative 
            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) {















                Iterator<WeakReference<PendingIntentRecord>> it















                        = mIntentSenderRecords.values().iterator();










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













                    }















                }















            }













        }





























        if (doit) {















            if (purgeCache && name != null) {