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

Commit 492f4d6f authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Start/Finish ap-op when telephony uses mic/camera am: 5a454d90 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1486301

Change-Id: Iece2bf29d53d900fd33fa2951b1cc874c6729648
parents 98123827 5a454d90

src/com/android/server/telecom/InCallController.java

+5 −0
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 


package com.android.server.telecom;



import static android.os.Process.myUid;



import android.Manifest;

import android.annotation.NonNull;

import android.app.AppOpsManager;

import android.app.Notification;

import android.app.NotificationManager;

import android.content.BroadcastReceiver;
@@ -926,6 +929,7 @@ public class InCallController extends CallsManagerListenerBase { 
    private final CallIdMapper mCallIdMapper = new CallIdMapper(Call::getId);



    private final Context mContext;

    private final AppOpsManager mAppOpsManager;

    private final TelecomSystem.SyncRoot mLock;

    private final CallsManager mCallsManager;

    private final SystemStateHelper mSystemStateHelper;
@@ -954,6 +958,7 @@ public class InCallController extends CallsManagerListenerBase { 
            EmergencyCallHelper emergencyCallHelper, CarModeTracker carModeTracker,

            ClockProxy clockProxy) {

        mContext = context;

        mAppOpsManager = context.getSystemService(AppOpsManager.class);

        mLock = lock;

        mCallsManager = callsManager;

        mSystemStateHelper = systemStateHelper;

tests/src/com/android/server/telecom/tests/InCallControllerTests.java

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.Manifest;

import android.app.AppOpsManager;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.UiModeManager;
@@ -61,7 +62,6 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.UserHandle;

import android.telecom.InCallService;

import android.telecom.Log;

import android.telecom.ParcelableCall;

import android.telecom.PhoneAccountHandle;

import android.telecom.TelecomManager;
@@ -113,6 +113,7 @@ public class InCallControllerTests extends TelecomTestCase { 
    @Mock PackageManager mMockPackageManager;

    @Mock Call mMockCall;

    @Mock Resources mMockResources;

    @Mock AppOpsManager mMockAppOpsManager;

    @Mock MockContext mMockContext;

    @Mock Timeouts.Adapter mTimeoutsAdapter;

    @Mock DefaultDialerCache mDefaultDialerCache;
@@ -158,6 +159,7 @@ public class InCallControllerTests extends TelecomTestCase { 
        MockitoAnnotations.initMocks(this);

        when(mMockCall.getAnalytics()).thenReturn(new Analytics.CallInfo());

        doReturn(mMockResources).when(mMockContext).getResources();

        doReturn(mMockAppOpsManager).when(mMockContext).getSystemService(AppOpsManager.class);

        doReturn(SYS_PKG).when(mMockResources).getString(

                com.android.internal.R.string.config_defaultDialer);

        doReturn(SYS_CLASS).when(mMockResources).getString(R.string.incall_default_class);

tests/src/com/android/server/telecom/tests/TelecomSystemTest.java

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.AppOpsManager;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -350,6 +351,8 @@ public class TelecomSystemTest extends TelecomTestCase { 
        doReturn(mSpyContext).when(mSpyContext).getApplicationContext();

        doNothing().when(mSpyContext).sendBroadcastAsUser(any(), any(), any());



        doReturn(mock(AppOpsManager.class)).when(mSpyContext).getSystemService(AppOpsManager.class);



        mHandlerThread = new HandlerThread("TelecomHandlerThread");

        mHandlerThread.start();