Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #3385054: HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb

Browse Source
This commit is contained in:
Dianne Hackborn
2011-01-24 22:51:18 -08:00
committed by Android (Google) Code Review
parent 89fca35170 c2d9c8e20b
commit 4989aa7da3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/LoadedApk.java
View File

@@ -567,6 +567,7 @@ final class LoadedApk {
} else {
rd.validate(context, handler);
}
rd.mForgotten = false;
return rd.getIIntentReceiver();
}
}
@@ -596,6 +597,7 @@ final class LoadedApk {
rd.setUnregisterLocation(ex);
holder.put(r, rd);
}
rd.mForgotten = true;
return rd.getIIntentReceiver();
}
}
@@ -666,6 +668,7 @@ final class LoadedApk {
final boolean mRegistered;
final IntentReceiverLeaked mLocation;
RuntimeException mUnregisterLocation;
boolean mForgotten;
final class Args extends BroadcastReceiver.PendingResult implements Runnable {
private Intent mCurIntent;
@@ -696,7 +699,7 @@ final class LoadedApk {
final Intent intent = mCurIntent;
mCurIntent = null;
if (receiver == null || !mRegistered) {
if (receiver == null || mForgotten) {
if (mRegistered && ordered) {
if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,
"Finishing null broadcast to " + mReceiver);