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

Commit a4fe1d80 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Include intent flags in BroadcastDeliveryEventReported atom. 

Bug: 254521331
Test: statsd_testdrive 475
Change-Id: Iaaebedd7fa0efe4c955841a43e2f571338b5feef
parent cdf342f2

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

+3 −2
Original line number Diff line number Diff line
@@ -617,7 +617,8 @@ public class BroadcastQueueImpl extends BroadcastQueue { 
                    r.curApp.info.packageName,

                    r.callerPackage,

                    r.calculateTypeForLogging(),

                    r.getDeliveryGroupPolicy());

                    r.getDeliveryGroupPolicy(),

                    r.intent.getFlags());

        }

        if (state == BroadcastRecord.IDLE) {

            Slog.w(TAG_BROADCAST, "finishReceiver [" + mQueueName + "] called but state is IDLE");
@@ -798,7 +799,7 @@ public class BroadcastQueueImpl extends BroadcastQueue { 
                    dispatchDelay, receiveDelay, 0 /* finish_delay */,

                    SERVICE_REQUEST_EVENT_REPORTED__PACKAGE_STOPPED_STATE__PACKAGE_STATE_NORMAL,

                    app != null ? app.info.packageName : null, callingPackage,

                    r.calculateTypeForLogging(), r.getDeliveryGroupPolicy());

                    r.calculateTypeForLogging(), r.getDeliveryGroupPolicy(), r.intent.getFlags());

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1932,7 +1932,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { 
            FrameworkStatsLog.write(BROADCAST_DELIVERY_EVENT_REPORTED, uid, senderUid, actionName,

                    receiverType, type, dispatchDelay, receiveDelay, finishDelay, packageState,

                    app != null ? app.info.packageName : null, r.callerPackage,

                    r.calculateTypeForLogging(), r.getDeliveryGroupPolicy());

                    r.calculateTypeForLogging(), r.getDeliveryGroupPolicy(), r.intent.getFlags());

        }

    }

services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ public final class BroadcastQueueModernImplTest { 
                eq(BROADCAST_DELIVERY_EVENT_REPORTED__RECEIVER_TYPE__MANIFEST),

                eq(BROADCAST_DELIVERY_EVENT_REPORTED__PROC_START_TYPE__PROCESS_START_TYPE_COLD),

                anyLong(), anyLong(), anyLong(), anyInt(), nullable(String.class),

                anyString(), anyInt(), anyInt()),

                anyString(), anyInt(), anyInt(), anyInt()),

                times(1));

    }