summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Wei <jameswei@google.com>2021-09-09 20:33:05 +0800
committerJames Wei <jameswei@google.com>2021-09-09 21:06:35 +0800
commitda0cc0a308802d02813b12b1d013eb8cab45c038 (patch)
treedd55f78996fc6f474048363e8cb6aadd10888c92
parent2195d4448f4b06f5f0933cf72bad225169565acd (diff)
USB: Adjust exception message in dealing with permission check #2
Add SafetyNet logging Bug: 180104273 Test: CtsVerifier USB Device Test Change-Id: I88fca08da5a3b4c1693fcd5b5e90af12a43cb482
-rw-r--r--services/usb/java/com/android/server/usb/UsbUserPermissionManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java b/services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
index 49ea9df5b26f..0c65cc40bd82 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.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");
}