From ad79043436c96fb8b9d983b93cd425672112d3ed Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Sun, 27 Jun 2021 21:23:44 -0700 Subject: Add SafetyNet logging if a certain broadcast is received by apps. In case the broadcast intents "com.android.server.net.action.SNOOZE_WARNING" or "com.android.server.net.action.SNOOZE_RAPID" are dispatched to apps, then add a SafetyNet log. Bug: 177931370 Test: manual Change-Id: I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a Merged-In: I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a (cherry picked from commit a22e341ac2220de707ad37479e4a87a68281e6d1) --- .../core/java/com/android/server/am/ActivityManagerService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index deb8ea9a8d6e..d06caebc67a8 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -21010,6 +21010,15 @@ public class ActivityManagerService extends IActivityManager.Stub return sticky; } + // SafetyNet logging for b/177931370. If any process other than system_server tries to + // listen to this broadcast action, then log it. + if (callingPid != Process.myPid()) { + if (filter.hasAction("com.android.server.net.action.SNOOZE_WARNING") + || filter.hasAction("com.android.server.net.action.SNOOZE_RAPID")) { + EventLog.writeEvent(0x534e4554, "177931370", callingUid, ""); + } + } + synchronized (this) { if (callerApp != null && (callerApp.thread == null || callerApp.thread.asBinder() != caller.asBinder())) { -- cgit v1.2.3-59-g8ed1b