Snap for 7316203 from f9851ddc58eee639d66776af7aab434f2655d3e1 to rvc-platform-releaseandroid-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r40android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android11-platform-release

Change-Id: I9fb793bd3cba6181a4aacaf223a8a932f2a71b01

6 files changed, 33 insertions, 5 deletions

diff --git a/library/main/res/values-w1280dp-land/config.xml b/library/main/res/values-w1240dp-land/config.xml
index 98343f3..98343f3 100644
--- a/library/main/res/values-w1280dp-land/config.xml
+++ b/library/main/res/values-w1240dp-land/config.xml
diff --git a/library/main/res/values-w1280dp-land/dimens.xml b/library/main/res/values-w1240dp-land/dimens.xml
index 1ed491e..257d03a 100644
--- a/library/main/res/values-w1280dp-land/dimens.xml
+++ b/library/main/res/values-w1240dp-land/dimens.xml
@@ -16,7 +16,7 @@
   -->
 
 <resources>
-    <dimen name="suw_page_margin_horizontal">80dp</dimen>
+    <dimen name="suw_page_margin_horizontal">64dp</dimen>
     <!-- The column inner padding of a two-column layout -->
     <dimen name="suw_column_inner_padding_horizontal">48dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/library/main/res/values-w1280dp/dimens.xml b/library/main/res/values-w1280dp-port/dimens.xml
index 1a3d98e..1a3d98e 100644
--- a/library/main/res/values-w1280dp/dimens.xml
+++ b/library/main/res/values-w1280dp-port/dimens.xml
diff --git a/library/main/src/com/android/car/setupwizardlib/summary/PartnerSummaryActionsCollector.java b/library/main/src/com/android/car/setupwizardlib/summary/PartnerSummaryActionsCollector.java
index ed556cd..95f81e9 100644
--- a/library/main/src/com/android/car/setupwizardlib/summary/PartnerSummaryActionsCollector.java
+++ b/library/main/src/com/android/car/setupwizardlib/summary/PartnerSummaryActionsCollector.java
@@ -309,7 +309,7 @@ public class PartnerSummaryActionsCollector {
                 if (deferredAction != null) {
                     deferredActions.add(deferredAction);
                 }
-            } catch (NullPointerException e) {
+            } catch (NullPointerException | IllegalArgumentException e) {
                 Log.e(
                         TAG,
                         "Unable to load the completion or config state for deferred action: "
diff --git a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
index ef4d231..c58e352 100644
--- a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
+++ b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
@@ -248,8 +248,18 @@ public class CarDrivingStateMonitor implements
     }
 
     private boolean checkIsSetupRestricted(@Nullable CarUxRestrictions restrictionInfo) {
-        return restrictionInfo != null && (restrictionInfo.getActiveRestrictions()
-                & CarUxRestrictions.UX_RESTRICTIONS_NO_SETUP) != 0;
+        if (restrictionInfo == null) {
+            if (isVerboseLoggable()) {
+                Log.v(TAG, "checkIsSetupRestricted restrictionInfo is null, returning false");
+            }
+            return false;
+        }
+        int activeRestrictions = restrictionInfo.getActiveRestrictions();
+        if (isVerboseLoggable()) {
+            Log.v(TAG, "activeRestrictions are " + activeRestrictions);
+        }
+        // There must be at least some restriction in place.
+        return activeRestrictions != 0;
     }
 
     @Override
@@ -343,5 +353,4 @@ public class CarDrivingStateMonitor implements
         intent.putExtra(INTENT_EXTRA_REASON, REASON_GEAR_REVERSAL);
         mContext.sendBroadcast(intent);
     }
-
 }
diff --git a/library/main/tests/robotests/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitorTest.java b/library/main/tests/robotests/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitorTest.java
index 0afc469..4d0f860 100644
--- a/library/main/tests/robotests/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitorTest.java
+++ b/library/main/tests/robotests/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitorTest.java
@@ -127,6 +127,25 @@ public class CarDrivingStateMonitorTest extends BaseRobolectricTest {
     }
 
     @Test
+    public void testOnUxRestrictionsChangedForNonSetup_triggersExit() {
+        mCarDrivingStateMonitor.startMonitor();
+        doReturn(CarUxRestrictions.UX_RESTRICTIONS_NO_VIDEO).when(mMockRestrictions)
+                .getActiveRestrictions();
+        mCarDrivingStateMonitor.onUxRestrictionsChanged(mMockRestrictions);
+        assertThat(mShadowApplication.getBroadcastIntents().get(0).getAction())
+                .isEqualTo(CarDrivingStateMonitor.EXIT_BROADCAST_ACTION);
+    }
+
+    @Test
+    public void testStartMonitorWhileDrivingForNonSetup_triggersExit() {
+        doReturn(CarUxRestrictions.UX_RESTRICTIONS_NO_VIDEO).when(mMockRestrictions)
+                .getActiveRestrictions();
+        mCarDrivingStateMonitor.startMonitor();
+        assertThat(mShadowApplication.getBroadcastIntents().get(0).getAction())
+                .isEqualTo(CarDrivingStateMonitor.EXIT_BROADCAST_ACTION);
+    }
+
+    @Test
     public void testStartMonitor_clearsStopMonitorRunnable() {
         mCarDrivingStateMonitor.startMonitor();
         ShadowCar.setIsConnected(true);