commit f4f7063e457719e295eeb5e718e1e6295524a3d7
author Tyler Gunn <tgunn@google.com> Tue Mar 02 21:33:02 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 02 21:33:02 2021 +0000
tree c361b99c5135c3d0fdb4c7c272ae9adceb660ec6
parent 0e44b583b0629b3a437fbbd538739f5373f01603
parent 16f5dd95f315fcb22fd7bb753d2ec762c686084a

Merge "Call Diagnostic Service implementation"

Android.bp

diff --git a/Android.bp b/Android.bp
index 0d89b00..b7eb450 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,7 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 genrule {
     name: "statslog-telecom-java-gen",
     tools: ["stats-log-api-gen"],

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 af9ad3a..5097586 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(),

testapps/Android.bp

diff --git a/testapps/Android.bp b/testapps/Android.bp
index 26347fe..11ea474 100644
--- a/testapps/Android.bp
+++ b/testapps/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "TelecomTestApps",
     static_libs: [

testapps/carmodedialer/Android.bp

diff --git a/testapps/carmodedialer/Android.bp b/testapps/carmodedialer/Android.bp
index 7179b1f..9f65b8c 100644
--- a/testapps/carmodedialer/Android.bp
+++ b/testapps/carmodedialer/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "TelecomCarModeApp",
     static_libs: [