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

Commit ed539a47 authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Rename pmInternal#getPackageUidInternal (3/4)"

parents 71418947 1cf1586a

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2591,7 +2591,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            if (mCurIntent != null && name.equals(mCurIntent.getComponent())) {

                mCurMethod = IInputMethod.Stub.asInterface(service);

                final String curMethodPackage = mCurIntent.getComponent().getPackageName();

                final int curMethodUid = mPackageManagerInternal.getPackageUidInternal(

                final int curMethodUid = mPackageManagerInternal.getPackageUid(

                        curMethodPackage, 0 /* flags */, mSettings.getCurrentUserId());

                if (curMethodUid < 0) {

                    Slog.e(TAG, "Failed to get UID for package=" + curMethodPackage);

services/core/java/com/android/server/wm/ActivityStarter.java

+3 −2
Original line number Diff line number Diff line
@@ -1693,8 +1693,9 @@ class ActivityStarter { 
            // we need to resolve resultTo to a uid as grantImplicitAccess deals explicitly in UIDs

            final PackageManagerInternal pmInternal =

                    mService.getPackageManagerInternalLocked();

            final int resultToUid = pmInternal.getPackageUidInternal(

                            mStartActivity.resultTo.info.packageName, 0, mStartActivity.mUserId);

            final int resultToUid = pmInternal.getPackageUid(

                    mStartActivity.resultTo.info.packageName, 0 /* flags */,

                    mStartActivity.mUserId);

            pmInternal.grantImplicitAccess(mStartActivity.mUserId, mIntent,

                    UserHandle.getAppId(mStartActivity.info.applicationInfo.uid) /*recipient*/,

                    resultToUid /*visible*/, true /*direct*/);