Snap for 4801384 from 5d1ddac6b5c186e2884a632b2afac32d30ecc922 to pi-release

Change-Id: Id7c6491091eb30ceafcebc08a3604255179fa3fe

5 files changed, 52 insertions, 19 deletions

diff --git a/car-lib/src/android/car/drivingstate/CarUxRestrictions.java b/car-lib/src/android/car/drivingstate/CarUxRestrictions.java
index 81dae979..c6c22bc3 100644
--- a/car-lib/src/android/car/drivingstate/CarUxRestrictions.java
+++ b/car-lib/src/android/car/drivingstate/CarUxRestrictions.java
@@ -63,9 +63,8 @@ public class CarUxRestrictions implements Parcelable {
 
     // Default fallback values for the restriction related parameters if the information is
     // not available from the underlying service.
-    // TODO(b/77606226): Finalize default values.
-    private static final int DEFAULT_MAX_LENGTH = 80;
-    private static final int DEFAULT_MAX_CUMULATIVE_ITEMS = 50;
+    private static final int DEFAULT_MAX_LENGTH = 120;
+    private static final int DEFAULT_MAX_CUMULATIVE_ITEMS = 21;
     private static final int DEFAULT_MAX_CONTENT_DEPTH = 3;
 
     /**
diff --git a/car-lib/src/android/car/user/CarUserManagerHelper.java b/car-lib/src/android/car/user/CarUserManagerHelper.java
index 49ec5afb..ece0ac22 100644
--- a/car-lib/src/android/car/user/CarUserManagerHelper.java
+++ b/car-lib/src/android/car/user/CarUserManagerHelper.java
@@ -88,6 +88,15 @@ public class CarUserManagerHelper {
     }
 
     /**
+     * Gets UserInfo for the system user.
+     *
+     * @return {@link UserInfo} for the system user.
+     */
+    public UserInfo getSystemUserInfo() {
+        return mUserManager.getUserInfo(UserHandle.USER_SYSTEM);
+    }
+
+    /**
      * Gets UserInfo for the current foreground user.
      *
      * Concept of foreground user is relevant for the multi-user deployment. Foreground user
@@ -149,13 +158,22 @@ public class CarUserManagerHelper {
     }
 
     /**
+     * Temporary method: Gets all the users that includes system user.
+     *
+     * @return List of {@code UserInfo} for users that associated with a real person.
+     */
+    public List<UserInfo> getAllUsersIncludingSystemUser() {
+        return mUserManager.getUsers(/*excludeDying=*/true);
+    }
+
+    /**
      * Get all the users except system user and the one with userId passed in.
      *
      * @param userId of the user not to be returned.
      * @return All users other than user with userId.
      */
     private List<UserInfo> getAllUsersExceptSystemUserAndSpecifiedUser(int userId) {
-        List<UserInfo> users = mUserManager.getUsers(true);
+        List<UserInfo> users = mUserManager.getUsers(/*excludeDying=*/true);
 
         for (Iterator<UserInfo> iterator = users.iterator(); iterator.hasNext(); ) {
             UserInfo userInfo = iterator.next();
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index 294bd3b9..45e6e0b8 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -39,10 +39,14 @@
     <!--  Activity to be presented when un-safe activity is launched. Take a look at the javadoc of the
           default implementation. -->
     <string name="activityBlockingActivity">com.android.car/com.android.car.pm.ActivityBlockingActivity</string>
-    <!--  Comma separated list of activities that will be allowed. Format of each entry is either
-          to specify package name to whitelist the whole package or use format of
-          "packagename/activity_classname" for tagging each activities.-->
-    <string name="activityWhitelist">com.android.systemui,com.android.car.dialer,com.android.car.hvac,com.android.car.media,com.android.car.radio,com.android.support.car.lenspicker,com.google.android.setupwizard,com.android.car.home,com.android.car.carlauncher,com.google.android.apps.gmm.fishfood,com.google.android.car.bugreport,com.android.contacts,com.google.android.car.kitchensink,com.google.android.googlequicksearchbox,com.android.settings,com.android.car.messenger</string>
+    <!--  Comma separated list of activities that need to be exempted from getting
+          blocked in a UX restricted state.
+          Format of each entry is either to specify package name to whitelist the whole package or
+          use format of "packagename/activity_classname" for tagging each activities.
+          The current implementations expects the following system packages/activities to be
+          whitelisted. For general guidelines to design distraction optimized apps, please refer
+          to Android Auto Driver Distraction Guidelines. -->
+    <string name="activityWhitelist">com.android.systemui,com.google.android.packageinstaller/com.android.packageinstaller.permission.ui.GrantPermissionsActivity</string>
     <!--  Comma separated list of activities that will be blocked during restricted state.
           Format of each entry is either to specify package name to whitelist the whole package
           or use format of "packagename/activity_classname" for tagging each activities.-->
diff --git a/service/res/xml/car_ux_restrictions_map.xml b/service/res/xml/car_ux_restrictions_map.xml
index 017f2b78..385869ad 100644
--- a/service/res/xml/car_ux_restrictions_map.xml
+++ b/service/res/xml/car_ux_restrictions_map.xml
@@ -31,7 +31,7 @@ Note:
         </DrivingState>
 
         <DrivingState car:state="idling">
-            <Restrictions car:requiresDistractionOptimization="true" car:uxr="baseline"/>
+            <Restrictions car:requiresDistractionOptimization="false" car:uxr="baseline"/>
         </DrivingState>
 
         <!-- This is to illustrate how to add multiple speed ranges.  The restrictions here
@@ -61,9 +61,9 @@ Note:
     <!-- Configure restriction parameters here-->
     <RestrictionParameters>
         <!-- Parameters to express displayed String related restrictions -->
-        <StringRestrictions car:maxLength="80"/>
+        <StringRestrictions car:maxLength="120"/>
         <!-- Parameters to express content related restrictions -->
-        <ContentRestrictions car:maxCumulativeItems="50" car:maxDepth="3"/>
+        <ContentRestrictions car:maxCumulativeItems="21" car:maxDepth="3"/>
     </RestrictionParameters>
 
 </UxRestrictions>
\ No newline at end of file
diff --git a/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java b/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
index ff93e668..38fd4b10 100644
--- a/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
+++ b/tests/carservice_test/src/com/android/car/CarDrivingRestrictionsTest.java
@@ -17,6 +17,7 @@ package com.android.car;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -88,7 +89,6 @@ public class CarDrivingRestrictionsTest extends MockedCarTestBase {
                         .build());
 
         // Test Parked state and corresponding restrictions based on car_ux_restrictions_map.xml
-        //listener.reset();
         getMockedVehicleHal().injectEvent(
                 VehiclePropValueBuilder.newBuilder(VehicleProperty.GEAR_SELECTION)
                         .addIntValue(VehicleGear.GEAR_PARK)
@@ -98,7 +98,8 @@ public class CarDrivingRestrictionsTest extends MockedCarTestBase {
         assertNotNull(drivingEvent);
         assertThat(drivingEvent.eventValue).isEqualTo(CarDrivingStateEvent.DRIVING_STATE_PARKED);
 
-        // Test Idling state and corresponding restrictions based on car_ux_restrictions_map.xml
+        // Switch gear to drive.  Driving state changes to Idling but the UX restrictions don't
+        // change between parked and idling.
         listener.reset();
         getMockedVehicleHal().injectEvent(
                 VehiclePropValueBuilder.newBuilder(VehicleProperty.GEAR_SELECTION)
@@ -108,12 +109,6 @@ public class CarDrivingRestrictionsTest extends MockedCarTestBase {
         drivingEvent = listener.waitForDrivingStateChange();
         assertNotNull(drivingEvent);
         assertThat(drivingEvent.eventValue).isEqualTo(CarDrivingStateEvent.DRIVING_STATE_IDLING);
-        restrictions = listener.waitForUxRestrictionsChange();
-        assertNotNull(restrictions);
-        assertTrue(restrictions.isRequiresDistractionOptimization());
-        assertThat(restrictions.getActiveRestrictions())
-                .isEqualTo(CarUxRestrictions.UX_RESTRICTIONS_BASELINE);
-
 
         // Test Moving state and corresponding restrictions based on car_ux_restrictions_map.xml
         listener.reset();
@@ -130,6 +125,23 @@ public class CarDrivingRestrictionsTest extends MockedCarTestBase {
         assertTrue(restrictions.isRequiresDistractionOptimization());
         assertThat(restrictions.getActiveRestrictions())
                 .isEqualTo(CarUxRestrictions.UX_RESTRICTIONS_FULLY_RESTRICTED);
+
+        // Test Idling state and corresponding restrictions based on car_ux_restrictions_map.xml
+        listener.reset();
+        getMockedVehicleHal().injectEvent(
+                VehiclePropValueBuilder.newBuilder(VehicleProperty.PERF_VEHICLE_SPEED)
+                        .addFloatValue(0.0f)
+                        .setTimestamp(SystemClock.elapsedRealtimeNanos())
+                        .build());
+        drivingEvent = listener.waitForDrivingStateChange();
+        assertNotNull(drivingEvent);
+        assertThat(drivingEvent.eventValue).isEqualTo(CarDrivingStateEvent.DRIVING_STATE_IDLING);
+        restrictions = listener.waitForUxRestrictionsChange();
+        assertNotNull(restrictions);
+        assertFalse(restrictions.isRequiresDistractionOptimization());
+        assertThat(restrictions.getActiveRestrictions())
+                .isEqualTo(CarUxRestrictions.UX_RESTRICTIONS_BASELINE);
+
     }
 
     /**