Enable/disable app blocking during restricted state.

Removed the dummy toggle button and reused it for enabling/disabling
driving restriction.

Bug:78603623
Test: App blocking is enabled or disabled accordingly.
Change-Id: I1c5c7c4e55b871e089ed9038ee970763db7c485a

2 files changed, 16 insertions, 0 deletions

diff --git a/car-lib/src/android/car/content/pm/CarPackageManager.java b/car-lib/src/android/car/content/pm/CarPackageManager.java
index 03c44ba462..0cbef44df2 100644
--- a/car-lib/src/android/car/content/pm/CarPackageManager.java
+++ b/car-lib/src/android/car/content/pm/CarPackageManager.java
@@ -18,6 +18,7 @@ package android.car.content.pm;
 
 import android.annotation.IntDef;
 import android.annotation.SystemApi;
+import android.annotation.TestApi;
 import android.car.CarApiUtil;
 import android.car.CarManagerBase;
 import android.car.CarNotConnectedException;
@@ -150,6 +151,20 @@ public final class CarPackageManager implements CarManagerBase {
     }
 
     /**
+     * Enable/Disable Activity Blocking.  This is to provide an option for toggling app blocking
+     * behavior for development purposes.
+     * @hide
+     */
+    @TestApi
+    public void setEnableActivityBlocking(boolean enable) {
+        try {
+            mService.setEnableActivityBlocking(enable);
+        } catch (RemoteException e) {
+            //ignore as CarApi will handle disconnection anyway.
+        }
+    }
+
+    /**
      * Check if given activity is distraction optimized, i.e, allowed in a
      * restricted driving state
      *
diff --git a/car-lib/src/android/car/content/pm/ICarPackageManager.aidl b/car-lib/src/android/car/content/pm/ICarPackageManager.aidl
index 8e31c73f0f..77d89ee952 100644
--- a/car-lib/src/android/car/content/pm/ICarPackageManager.aidl
+++ b/car-lib/src/android/car/content/pm/ICarPackageManager.aidl
@@ -25,4 +25,5 @@ interface ICarPackageManager {
     boolean isActivityDistractionOptimized(in String packageName, in String className) = 1;
     boolean isServiceDistractionOptimized(in String packageName, in String className) = 2;
     boolean isActivityBackedBySafeActivity(in ComponentName activityName) = 3;
+    void setEnableActivityBlocking(boolean enable) = 4;
 }