Merge "use @SystemAPI for creating UserHandle"

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);

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);