diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-30 23:15:33 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-09-30 23:15:33 +0000 |
commit | 8b40176ea5c0230cdbec729fadc7364f0f0ff4de (patch) | |
tree | 7ba8f34f65b5660462fb7d0ad32e4ed2fb8910eb | |
parent | f5a8542bd307d3acddfd38dad5b7a2883d4f94da (diff) | |
parent | 0c52a7600f6cb1c35ab047d4ca78747693c52eda (diff) | |
download | base-8b40176ea5c0230cdbec729fadc7364f0f0ff4de.tar.gz |
Snap for 6875707 from 0c52a7600f6cb1c35ab047d4ca78747693c52eda to rvc-qpr1-release
Change-Id: Iba131a070eda4b202dcae75a89ee2758227e5704
-rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 2 | ||||
-rw-r--r-- | telephony/java/android/telephony/ims/aidl/IImsMmTelListener.aidl | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index dd7ef5b02877..d42c7eae18ce 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -25434,7 +25434,7 @@ public class PackageManagerService extends IPackageManager.Stub // This API is exposed temporarily to only the contacts provider. (b/158688602) final int callingUid = Binder.getCallingUid(); ProviderInfo contactsProvider = resolveContentProviderInternal( - ContactsContract.AUTHORITY, 0, UserHandle.USER_SYSTEM); + ContactsContract.AUTHORITY, 0, UserHandle.getUserId(callingUid)); if (contactsProvider == null || contactsProvider.applicationInfo == null || !UserHandle.isSameApp(contactsProvider.applicationInfo.uid, callingUid)) { throw new SecurityException(callingUid + " is not allow to call grantImplicitAccess"); diff --git a/telephony/java/android/telephony/ims/aidl/IImsMmTelListener.aidl b/telephony/java/android/telephony/ims/aidl/IImsMmTelListener.aidl index 7bbe30a444b9..52464703c608 100644 --- a/telephony/java/android/telephony/ims/aidl/IImsMmTelListener.aidl +++ b/telephony/java/android/telephony/ims/aidl/IImsMmTelListener.aidl @@ -27,8 +27,11 @@ import com.android.ims.internal.IImsCallSession; * See MmTelFeature#Listener for more information. * {@hide} */ -oneway interface IImsMmTelListener { + // This interface is not considered oneway because we need to ensure that these operations are + // processed by telephony before the control flow returns to the ImsService to perform + // operations on the IImsCallSession. +interface IImsMmTelListener { void onIncomingCall(IImsCallSession c, in Bundle extras); void onRejectedCall(in ImsCallProfile callProfile, in ImsReasonInfo reason); - void onVoiceMessageCountUpdate(int count); + oneway void onVoiceMessageCountUpdate(int count); } |