commit 222a2af548958c39f95d30dcca8870cb0aaaba57
author Svetoslav Ganov <svetoslavganov@google.com> Mon Mar 29 21:03:07 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 29 21:03:07 2021 +0000
tree 5d7594f1e66d0604db0a65c6b02bd00b18f2d4e0
parent f4d4c5a05dacbf88dd2a83651fc3634910bc808e
parent f8b614ca2865434fa917c608f868346f6dff8c8b

Merge "Runtime permission attribution improvements" into sc-dev

tests/src/com/android/services/telephony/TestTelephonyConnection.java

diff --git a/tests/src/com/android/services/telephony/TestTelephonyConnection.java b/tests/src/com/android/services/telephony/TestTelephonyConnection.java
index 940d8bb..817e9a7 100644
--- a/tests/src/com/android/services/telephony/TestTelephonyConnection.java
+++ b/tests/src/com/android/services/telephony/TestTelephonyConnection.java
@@ -16,7 +16,9 @@
 
 package com.android.services.telephony;
 
+import android.content.AttributionSource;
 import android.content.ContentResolver;
+import android.os.Process;
 import android.os.UserHandle;
 import android.telephony.TelephonyManager;
 
@@ -48,6 +50,8 @@
 
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -124,6 +128,9 @@
         super(null, null, android.telecom.Call.Details.DIRECTION_INCOMING);
         MockitoAnnotations.initMocks(this);
 
+        AttributionSource attributionSource = new AttributionSource.Builder(
+                Process.myUid()).build();
+
         mIsImsConnection = false;
         mIsImsExternalConnection = false;
         mMockPhone = mock(Phone.class);
@@ -152,7 +159,9 @@
         when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);
         when(mMockContext.getSystemService(Context.TELEPHONY_SERVICE))
                 .thenReturn(mMockTelephonyManager);
+        when(mMockContext.getAttributionSource()).thenReturn(attributionSource);
         when(mMockContentResolver.getUserId()).thenReturn(UserHandle.USER_CURRENT);
+        when(mMockContentResolver.getAttributionSource()).thenReturn(attributionSource);
         when(mMockResources.getBoolean(anyInt())).thenReturn(false);
         when(mMockPhone.getDefaultPhone()).thenReturn(mMockPhone);
         when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_IMS);