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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15794990

Change-Id: Ifb7715687efdd043a0c908ea2dfb1dac12f0b519

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

@@ -45,6 +45,7 @@ import android.service.usb.UsbUidPermissionProto;
 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 @@ class UsbUserPermissionManager {
     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 @@ class UsbUserPermissionManager {
             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");
             }