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

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

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

This reverts commit 1cdfa801.

Reason for revert: not needed any more

Change-Id: I2dfca6cbe9e79cbfcde5b4e6f77ce483b5d93642
parent 1cdfa801

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

+0 −11
Original line number Original line Diff line number Diff line
@@ -314,7 +314,6 @@ import android.net.ConnectivityManager; 
import android.net.Proxy;

import android.net.Proxy;

import android.net.Uri;

import android.net.Uri;

import android.os.AppZygote;

import android.os.AppZygote;

import android.os.BatteryManager;

import android.os.BatteryStats;

import android.os.BatteryStats;

import android.os.Binder;

import android.os.Binder;

import android.os.BinderProxy;

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;







        int[] users;











        if (userId == UserHandle.USER_ALL) {







        if (userId == UserHandle.USER_ALL) {











            // Caller wants broadcast to go to all started users.







            // Caller wants broadcast to go to all started users.

























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



+0
−11




























Original line number
Original line
Diff line number
Diff line








@@ -59,7 +59,6 @@ import android.content.pm.ActivityInfo;









import android.content.pm.ApplicationInfo;







import android.content.pm.ApplicationInfo;











import android.content.pm.PackageManager;







import android.content.pm.PackageManager;











import android.content.pm.ResolveInfo;







import android.content.pm.ResolveInfo;











import android.os.BatteryManager;














import android.os.Bundle;







import android.os.Bundle;











import android.os.BundleMerger;







import android.os.BundleMerger;











import android.os.Handler;







import android.os.Handler;










@@ -1075,16 +1074,6 @@ class BroadcastQueueModernImpl extends BroadcastQueue {









                queue.lastProcessState = app.mState.getCurProcState();







                queue.lastProcessState = app.mState.getCurProcState();











                if (receiver instanceof BroadcastFilter) {







                if (receiver instanceof BroadcastFilter) {











                    notifyScheduleRegisteredReceiver(app, r, (BroadcastFilter) receiver);







                    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(







                    thread.scheduleRegisteredReceiver(











                        ((BroadcastFilter) receiver).receiverList.receiver,







                        ((BroadcastFilter) receiver).receiverList.receiver,











                        receiverIntent, r.resultCode, r.resultData, r.resultExtras,







                        receiverIntent, r.resultCode, r.resultData, r.resultExtras,