summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2021-08-11 07:43:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-11 07:43:26 +0000
commit83f71f1227df4690a25719d01ca9b8e87898d05e (patch)
treef1a71537f1f497706590fb057b33522ed91400e7
parentb10d3c46098e017bf98f42cae63628c533bbdfb6 (diff)
parent935f5626b1862867f629b573719de2dd08b181fc (diff)
downloadbase-83f71f1227df4690a25719d01ca9b8e87898d05e.tar.gz
Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index bedcc3ba3ce9..a3fca92e74d7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18841,6 +18841,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())) {