From 01fe2cd61cce1e184674da71ab297a2eb806904b Mon Sep 17 00:00:00 2001 From: Bo Ye Date: Wed, 6 May 2020 18:03:02 +0800 Subject: [PATCH] Just print warning log instead of triggering WTF TrustManagerService.getUserId() not trigger WTF when receiving broadcast USER_STARTED with userID = 0. Bug: 155946337 Test: manual, flash AGO ENG image and then boot up Change-Id: Id2ea54d8f4c25bd97b6213c431d18e44908d7e11 --- .../core/java/com/android/server/trust/TrustManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 2394bafc09de1..fd3c1f97df8b9 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -1469,7 +1469,7 @@ public class TrustManagerService extends SystemService { if (userId > 0) { return userId; } else { - Slog.wtf(TAG, "EXTRA_USER_HANDLE missing or invalid, value=" + userId); + Log.w(TAG, "EXTRA_USER_HANDLE missing or invalid, value=" + userId); return -100; } }