From e5ea21aa3b8be095d89b494f0e06f2edcccdd9e0 Mon Sep 17 00:00:00 2001
From: Chen Xu <fionaxu@google.com>
Date: Mon, 5 Aug 2019 11:39:13 -0700
Subject: use @SystemAPI for creating UserHandle

Bug: 137202333
Test: Build & Unit test
Merged-In: Id2a696bed6a80c92291c8f968f3aaa8db6bb83df
Change-Id: Id2a696bed6a80c92291c8f968f3aaa8db6bb83df
(cherry picked from commit 59d76e97bb3302353ede5f433ce8e8f4b4a31776)
---
 telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java | 2 +-
 telephony/java/com/android/internal/telephony/SmsApplication.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
index af993be51556..e9a177defd26 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
@@ -115,7 +115,7 @@ public class CallerInfoAsyncQuery {
             final Context otherContext;
             try {
                 otherContext = context.createPackageContextAsUser(context.getPackageName(),
-                        /* flags =*/ 0, new UserHandle(currentUser));
+                        /* flags =*/ 0, UserHandle.of(currentUser));
                 return otherContext.getContentResolver();
             } catch (NameNotFoundException e) {
                 Rlog.e(LOG_TAG, "Can't find self package", e);
diff --git a/telephony/java/com/android/internal/telephony/SmsApplication.java b/telephony/java/com/android/internal/telephony/SmsApplication.java
index 98f52cbf93da..a469ae771821 100644
--- a/telephony/java/com/android/internal/telephony/SmsApplication.java
+++ b/telephony/java/com/android/internal/telephony/SmsApplication.java
@@ -806,7 +806,7 @@ public final class SmsApplication {
             if (userId != UserHandle.USER_SYSTEM) {
                 try {
                     userContext = mContext.createPackageContextAsUser(mContext.getPackageName(), 0,
-                            new UserHandle(userId));
+                        UserHandle.of(userId));
                 } catch (NameNotFoundException nnfe) {
                     if (DEBUG_MULTIUSER) {
                         Log.w(LOG_TAG, "Unable to create package context for user " + userId);
-- 
cgit v1.2.3-59-g8ed1b