From c903f6ac26409d443000b602e56fdc854a372c28 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Thu, 3 Sep 2020 15:31:38 -0700 Subject: [PATCH] [telecom] system_server should not call non forUser Settings.Secure.get* methods BUG: 166312046 Test: builds Change-Id: I69e91c84ff170abd6e82e0ff322e168c11004daa --- telecomm/java/android/telecom/Logging/SessionManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/telecomm/java/android/telecom/Logging/SessionManager.java b/telecomm/java/android/telecom/Logging/SessionManager.java index 67e5eabf54eba..9d17219c1ae46 100644 --- a/telecomm/java/android/telecom/Logging/SessionManager.java +++ b/telecomm/java/android/telecom/Logging/SessionManager.java @@ -17,6 +17,7 @@ package android.telecom.Logging; import android.annotation.Nullable; +import android.content.ContentResolver; import android.content.Context; import android.os.Handler; import android.os.Looper; @@ -453,7 +454,9 @@ public class SessionManager { * perform a sweep to check and make sure that the session is still not incomplete (stale). */ private long getCleanupTimeout(Context context) { - return Settings.Secure.getLong(context.getContentResolver(), TIMEOUTS_PREFIX + - "stale_session_cleanup_timeout_millis", DEFAULT_SESSION_TIMEOUT_MS); + final ContentResolver cr = context.getContentResolver(); + return Settings.Secure.getLongForUser(cr, TIMEOUTS_PREFIX + + "stale_session_cleanup_timeout_millis", DEFAULT_SESSION_TIMEOUT_MS, + cr.getUserId()); } }