resolve merge conflicts of 448489a to cw-f-dev

am: f2122f5f96

Change-Id: I9e8069d3e74399ed5c47da3b7a74a5c70702c0a8

services/core/java/com/android/server/am/BroadcastQueue.java

@@ -228,7 +228,8 @@ public final class BroadcastQueue {
     public final boolean replaceParallelBroadcastLocked(BroadcastRecord r) {
         final Intent intent = r.intent;
         for (int i = mParallelBroadcasts.size() - 1; i >= 0; i--) {
-            if (intent.filterEquals(mParallelBroadcasts.get(i).intent)) {
+            final Intent curIntent = mParallelBroadcasts.get(i).intent;
+            if (intent.filterEquals(curIntent)) {
                 if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST,
                         "***** DROPPING PARALLEL ["
                 + mQueueName + "]: " + intent);

services/core/java/com/android/server/am/BroadcastRecord.java

@@ -219,6 +219,9 @@ final class BroadcastRecord extends Binder {
             int _resultCode, String _resultData, Bundle _resultExtras, boolean _serialized,
             boolean _sticky, boolean _initialSticky,
             int _userId) {
+        if (_intent == null) {
+            throw new NullPointerException("Can't construct with a null intent");
+        }
         queue = _queue;
         intent = _intent;
         targetComp = _intent.getComponent();