commit 77b01841f1e73e926b0b43b6fe3464b249e51a49
author Shuo Qian <shuoq@google.com> Mon Mar 01 18:57:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 01 18:57:22 2021 +0000
tree f58febc5a668904d945a082e7ebac7cba54a95b1
parent 8c95afd563922c6fc127d5f70955b5e1d69f25a8
parent 0e44b583b0629b3a437fbbd538739f5373f01603

Rename API for Call Companion InCallService API Review am: 0e44b583b0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0e4c24359da2dcf771d60de544aa68e6898134d

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

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 3481558..3a44287 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -832,12 +832,12 @@
         }
 
         /**
-         * @see android.telecom.TelecomManager#hasCompanionInCallServiceAccess
+         * @see android.telecom.TelecomManager#hasManageOngoingCallsPermission
          */
         @Override
-        public boolean hasCompanionInCallServiceAccess(String callingPackage) {
+        public boolean hasManageOngoingCallsPermission(String callingPackage) {
             try {
-                Log.startSession("TSI.hCICSA");
+                Log.startSession("TSI.hMOCP");
                 return PermissionChecker.checkPermissionForPreflight(mContext,
                         Manifest.permission.MANAGE_ONGOING_CALLS,
                                 PermissionChecker.PID_UNKNOWN, Binder.getCallingUid(),