diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 11 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/BroadcastQueueModernImpl.java | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index bb29ed882612..b64a1cbd9044 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -314,6 +314,7 @@ import android.net.ConnectivityManager; import android.net.Proxy; import android.net.Uri; import android.os.AppZygote; +import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Binder; import android.os.BinderProxy; @@ -15040,6 +15041,16 @@ public class ActivityManagerService extends IActivityManager.Stub } } + // STOPSHIP(b/298884211): Remove this logging + if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) { + final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); + if (level < 0) { + Slog.wtf(BroadcastQueue.TAG, "Unexpected broadcast: " + intent + + "; callingUid: " + callingUid + ", callingPid: " + callingPid, + new Throwable()); + } + } + int[] users; if (userId == UserHandle.USER_ALL) { // Caller wants broadcast to go to all started users. diff --git a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java index 5d0fefc75a28..d5343a9777a7 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java @@ -59,6 +59,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.os.BatteryManager; import android.os.Bundle; import android.os.BundleMerger; import android.os.Handler; @@ -1074,6 +1075,16 @@ class BroadcastQueueModernImpl extends BroadcastQueue { queue.lastProcessState = app.mState.getCurProcState(); if (receiver instanceof BroadcastFilter) { notifyScheduleRegisteredReceiver(app, r, (BroadcastFilter) receiver); + // STOPSHIP(b/298884211): Remove this logging + if (Intent.ACTION_BATTERY_CHANGED.equals(receiverIntent.getAction())) { + int level = receiverIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1); + if (level < 0) { + Slog.wtf(TAG, "Dispatching unexpected broadcast: " + receiverIntent + + " to " + receiver + + "; callingUid: " + r.callingUid + + ", callingPid: " + r.callingPid); + } + } thread.scheduleRegisteredReceiver( ((BroadcastFilter) receiver).receiverList.receiver, receiverIntent, r.resultCode, r.resultData, r.resultExtras, |