Merge "replace hidden Context APIs"

am: d363bc08e9 Change-Id: I22caa30c96fc7bc64c99d73d5697f63a597de32d
2019-11-22 14:48:41 -08:00
parent 87119ab3e2 d363bc08e9
commit 255cd441c2
1 changed files with 1 additions and 1 deletions
--- a/telephony/common/com/android/internal/telephony/SmsApplication.java
+++ b/telephony/common/com/android/internal/telephony/SmsApplication.java
@@ -195,7 +195,7 @@ public final class SmsApplication {
     * @return
     */
    private static int getIncomingUserId(Context context) {
-        int contextUserId = context.getUserId();
+        int contextUserId = UserHandle.myUserId();
        final int callingUid = Binder.getCallingUid();
        if (DEBUG_MULTIUSER) {
            Log.i(LOG_TAG, "getIncomingUserHandle caller=" + callingUid + ", myuid="