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

Commit beb2aa5a authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

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

parents 165af035 88301fed

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

+0 −11
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ 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;
@@ -15030,16 +15029,6 @@ 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



+0
−11




























Original line number
Diff line number
Diff line








@@ -59,7 +59,6 @@ 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;










@@ -1075,16 +1074,6 @@ 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,