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

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

Browse Source 
Change-Id: Idaff9ccaf74bf0ec82c6346eb383295b508c7324
This commit is contained in:
Nimrod Gileadi
2016-10-06 19:25:11 +01:00
parent f0b51e9db7 448489a991
commit f2122f5f96
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/BroadcastQueue.java
View File

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

3
services/core/java/com/android/server/am/BroadcastRecord.java
View File

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