diff options
| author | Todd Kennedy <toddke@google.com> | 2015-01-30 17:59:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-30 17:59:19 +0000 |
| commit | 14dc3c900febb05cca89ffe610ebf7fb970e552b (patch) | |
| tree | 20e896b1c55fbcfc00816c4712cbb76873bcf215 | |
| parent | aab56dbc1ef5c91afad1e61d633305bb3aa3cb1b (diff) | |
| parent | d2f1511f2896e09db35bd92e0aab02ba89888a04 (diff) | |
| download | frameworks_base-14dc3c900febb05cca89ffe610ebf7fb970e552b.zip frameworks_base-14dc3c900febb05cca89ffe610ebf7fb970e552b.tar.gz frameworks_base-14dc3c900febb05cca89ffe610ebf7fb970e552b.tar.bz2 | |
Merge "Don't get extras from the Intent"
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 15 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/BroadcastQueue.java | 15 |
2 files changed, 11 insertions, 19 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 366a5bb..69198a2 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -7057,7 +7057,6 @@ public final class ActivityManagerService extends ActivityManagerNative return; } - final IPackageManager pm = AppGlobals.getPackageManager(); final String authority = uri.getAuthority(); final ProviderInfo pi = getProviderInfoLocked(authority, userId); if (pi == null) { @@ -15784,14 +15783,14 @@ public final class ActivityManagerService extends ActivityManagerNative callerPackage, callingPid, callingUid, resolvedType, requiredPermission, appOp, receivers, resultTo, resultCode, resultData, map, ordered, sticky, false, userId); + if (DEBUG_BROADCAST) Slog.v( TAG, "Enqueueing ordered broadcast " + r + ": prev had " + queue.mOrderedBroadcasts.size()); - if (DEBUG_BROADCAST) { - int seq = r.intent.getIntExtra("seq", -1); - Slog.i(TAG, "Enqueueing broadcast " + r.intent.getAction() + " seq=" + seq); - } - boolean replaced = replacePending && queue.replaceOrderedBroadcastLocked(r); + if (DEBUG_BROADCAST) Slog.i( + TAG, "Enqueueing broadcast " + r.intent.getAction()); + + boolean replaced = replacePending && queue.replaceOrderedBroadcastLocked(r); if (!replaced) { queue.enqueueOrderedBroadcastLocked(r); queue.scheduleBroadcastsLocked(); @@ -18352,8 +18351,8 @@ public final class ActivityManagerService extends ActivityManagerNative } } - private Set getProfileIdsLocked(int userId) { - Set userIds = new HashSet<Integer>(); + private Set<Integer> getProfileIdsLocked(int userId) { + Set<Integer> userIds = new HashSet<Integer>(); final List<UserInfo> profiles = getUserManagerLocked().getProfiles( userId, false /* enabledOnly */); for (UserInfo user : profiles) { diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 9b7d0b2..7ab3794 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -513,11 +513,7 @@ public final class BroadcastQueue { } } try { - if (DEBUG_BROADCAST_LIGHT) { - int seq = r.intent.getIntExtra("seq", -1); - Slog.i(TAG, "Delivering to " + filter - + " (seq=" + seq + "): " + r); - } + if (DEBUG_BROADCAST_LIGHT) Slog.i(TAG, "Delivering to " + filter + " : " + r); performReceiveLocked(filter.receiverList.app, filter.receiverList.receiver, new Intent(r.intent), r.resultCode, r.resultData, r.resultExtras, r.ordered, r.initialSticky, r.userId); @@ -662,12 +658,9 @@ public final class BroadcastQueue { // result if requested... if (r.resultTo != null) { try { - if (DEBUG_BROADCAST) { - int seq = r.intent.getIntExtra("seq", -1); - Slog.i(TAG, "Finishing broadcast [" - + mQueueName + "] " + r.intent.getAction() - + " seq=" + seq + " app=" + r.callerApp); - } + if (DEBUG_BROADCAST) Slog.i(TAG, + "Finishing broadcast [" + mQueueName + "] " + + r.intent.getAction() + " app=" + r.callerApp); performReceiveLocked(r.callerApp, r.resultTo, new Intent(r.intent), r.resultCode, r.resultData, r.resultExtras, false, false, r.userId); |