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

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

Merge "Revert "Add temporary logging to root cause an issue."" into... 

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

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



Change-Id: I7200280a68adadd37ed38068fb21cc8c59ff394e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c3d334b 784fd136

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

+0 −11
Original line number Diff line number Diff line
@@ -315,7 +315,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;
@@ -15096,16 +15095,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;










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