Merge "replace hidden Context APIs" am: d363bc08e9

am: 255cd441c2

Change-Id: I277f8d134baa416543ec2fef48b85f57b587ca74
This commit is contained in:
Brad Ebinger
2019-11-22 14:54:22 -08:00
committed by android-build-merger

View File

@@ -195,7 +195,7 @@ public final class SmsApplication {
* @return
*/
private static int getIncomingUserId(Context context) {
int contextUserId = context.getUserId();
int contextUserId = UserHandle.myUserId();
final int callingUid = Binder.getCallingUid();
if (DEBUG_MULTIUSER) {
Log.i(LOG_TAG, "getIncomingUserHandle caller=" + callingUid + ", myuid="