diff options
| author | 2020-08-21 04:51:31 +0000 | |
|---|---|---|
| committer | 2020-08-21 04:51:31 +0000 | |
| commit | ed539a474dd1cc7629118935db0b8095e6346b2c (patch) | |
| tree | 2257855a6b730e3f76cfda8887b43ac0ff2b9d15 | |
| parent | 71418947091fc4683ca69ca5f8e8837101303221 (diff) | |
| parent | 1cf1586af8ed6e8a4deed3a0e8bbc2988b050858 (diff) | |
Merge "Rename pmInternal#getPackageUidInternal (3/4)"
| -rw-r--r-- | services/core/java/com/android/server/inputmethod/InputMethodManagerService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityStarter.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java index 9ab410d258cc..3fddd5ab91ee 100644 --- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java +++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java @@ -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); diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index f6158383d28a..4c93b9ef64de 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -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*/); |