Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fbe02f1 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "use @SystemAPI for creating UserHandle" am: 420bf712 am: e207bff2 

am: e62f727f

Change-Id: I6f297afa39e33df333284b9d27abcbb155a1d06d
parents b92ef484 e62f727f

telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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);