commit 8173263d78e19e5b1091d0d91be00dc7f8e7d21a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 10 06:03:13 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 10 06:03:13 2021 +0000
tree 261d9aa89aae52287234cf518cb0299ce30d1812
parent c98d5a9d97614e8ba5fcc50b7a3b4c006741c328
parent da0cc0a308802d02813b12b1d013eb8cab45c038

Merge "USB: Adjust exception message in dealing with permission check #2" into sc-qpr1-dev

services/usb/java/com/android/server/usb/UsbUserPermissionManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
index 49ea9df..0c65cc4 100644
--- a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
+++ b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
@@ -45,6 +45,7 @@
 import android.service.usb.UsbUserPermissionsManagerProto;
 import android.util.ArrayMap;
 import android.util.AtomicFile;
+import android.util.EventLog;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
 import android.util.TypedXmlPullParser;
@@ -74,6 +75,8 @@
     private static final String TAG = UsbUserPermissionManager.class.getSimpleName();
     private static final boolean DEBUG = false;
 
+    private static final int SNET_EVENT_LOG_ID = 0x534e4554;
+
     @GuardedBy("mLock")
     /** Mapping of USB device name to list of UIDs with permissions for the device
      * Each entry lasts until device is disconnected*/
@@ -691,6 +694,7 @@
             if (aInfo.uid != uid) {
                 Slog.w(TAG, "package " + packageName
                         + " does not match caller's uid " + uid);
+                EventLog.writeEvent(SNET_EVENT_LOG_ID, "180104273", -1, "");
                 throw new IllegalArgumentException("package " + packageName
                         + " not found");
             }