Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9a67467 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Add temporary logging to root cause an issue." into udc-qpr-dev am:... 

Merge "Add temporary logging to root cause an issue." into udc-qpr-dev am: 90195666 am: c1ba8b16

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24788682



Change-Id: If8b3507f30cc5dbefa0abdfb08c1f287cce7f5dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d788cbb c1ba8b16

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

+11 −0
Original line number Diff line number Diff line
@@ -315,6 +315,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;
@@ -15145,6 +15146,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.

























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



+11
−0




























Original line number
Diff line number
Diff line








@@ -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;










@@ -1077,6 +1078,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,