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

am 802fb15d: am 9476f045: Merge "Fix issue #3215261: NPE in WiFi Settings" into honeycomb

Browse Source 
* commit '802fb15d2a9d6e094627c561100aabbac3689d94':
  Fix issue #3215261: NPE in WiFi Settings
This commit is contained in:
Dianne Hackborn
2011-01-23 17:50:23 -08:00
committed by Android Git Automerger
parent bb5536015a 802fb15d2a
commit ee18bc7e3c
7 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -696,7 +696,7 @@ final class LoadedApk {
final Intent intent = mCurIntent;
mCurIntent = null;
if (receiver == null) {
if (receiver == null || !mRegistered) {
if (mRegistered && ordered) {
if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG,
"Finishing null broadcast to " + mReceiver);