Rename CarPackageManager APIs.

CarPackageManager APIs isActivityAllowedWhileDriving and
isServiceAllowedWhileDriving are renamed to
isActivityDistractionOptimized and isServiceDistractionOptimized to
reflect the information that they actually provide.

Bug: 73064345
Test: compile, exercise the APIs and carservice_test.
Change-Id: I1063d13c672caa659735686ed0d8df4e5c20a1d3

2 files changed, 12 insertions, 8 deletions

diff --git a/car-lib/src/android/car/content/pm/CarPackageManager.java b/car-lib/src/android/car/content/pm/CarPackageManager.java
index 380432fe50..03c44ba462 100644
--- a/car-lib/src/android/car/content/pm/CarPackageManager.java
+++ b/car-lib/src/android/car/content/pm/CarPackageManager.java
@@ -150,15 +150,17 @@ public final class CarPackageManager implements CarManagerBase {
     }
 
     /**
-     * Check if given activity is allowed while driving.
+     * Check if given activity is distraction optimized, i.e, allowed in a
+     * restricted driving state
+     *
      * @param packageName
      * @param className
      * @return
      */
-    public boolean isActivityAllowedWhileDriving(String packageName, String className)
+    public boolean isActivityDistractionOptimized(String packageName, String className)
             throws CarNotConnectedException {
         try {
-            return mService.isActivityAllowedWhileDriving(packageName, className);
+            return mService.isActivityDistractionOptimized(packageName, className);
         } catch (IllegalStateException e) {
             CarApiUtil.checkCarNotConnectedExceptionFromCarService(e);
         } catch (RemoteException e) {
@@ -168,15 +170,17 @@ public final class CarPackageManager implements CarManagerBase {
     }
 
     /**
-     * Check if given service is allowed while driving.
+     * Check if given service is distraction optimized, i.e, allowed in a restricted
+     * driving state.
+     *
      * @param packageName
      * @param className
      * @return
      */
-    public boolean isServiceAllowedWhileDriving(String packageName, String className)
+    public boolean isServiceDistractionOptimized(String packageName, String className)
             throws CarNotConnectedException {
         try {
-            return mService.isServiceAllowedWhileDriving(packageName, className);
+            return mService.isServiceDistractionOptimized(packageName, className);
         } catch (IllegalStateException e) {
             CarApiUtil.checkCarNotConnectedExceptionFromCarService(e);
         } catch (RemoteException e) {
diff --git a/car-lib/src/android/car/content/pm/ICarPackageManager.aidl b/car-lib/src/android/car/content/pm/ICarPackageManager.aidl
index 306db6567c..8e31c73f0f 100644
--- a/car-lib/src/android/car/content/pm/ICarPackageManager.aidl
+++ b/car-lib/src/android/car/content/pm/ICarPackageManager.aidl
@@ -22,7 +22,7 @@ import android.content.ComponentName;
 /** @hide */
 interface ICarPackageManager {
     void setAppBlockingPolicy(in String packageName, in CarAppBlockingPolicy policy, int flags) = 0;
-    boolean isActivityAllowedWhileDriving(in String packageName, in String className) = 1;
-    boolean isServiceAllowedWhileDriving(in String packageName, in String className) = 2;
+    boolean isActivityDistractionOptimized(in String packageName, in String className) = 1;
+    boolean isServiceDistractionOptimized(in String packageName, in String className) = 2;
     boolean isActivityBackedBySafeActivity(in ComponentName activityName) = 3;
 }