Merge "Remove system property flag" into rvc-qpr-dev am: 9a86fef59a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/13306380

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibca3927790cc9b5687e462b8507edcbe50a96b28

1 files changed, 2 insertions, 21 deletions

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 cd907f0..5bf7bf7 100644
--- a/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
+++ b/library/main/src/com/android/car/setupwizardlib/util/CarDrivingStateMonitor.java
@@ -27,7 +27,6 @@ import android.content.ServiceConnection;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.SystemProperties;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
@@ -47,10 +46,6 @@ public class CarDrivingStateMonitor implements
     private static final String TAG = "CarDrivingStateMonitor";
     private static final long DISCONNECT_DELAY_MS = 700;
 
-    // System property used to enabled the UX_RESTRICTIONS_NO_SETUP check
-    private static final String KEY_ENABLE_UX_RESTRICTIONS_NO_SETUP_CHECK =
-             "aae.suw.ux_no_setup_check";
-
     private Car mCar;
     private CarUxRestrictionsManager mRestrictionsManager;
     // Need to track the number of times the monitor is started so a single stopMonitor call does
@@ -237,20 +232,11 @@ public class CarDrivingStateMonitor implements
             return false;
         }
         int activeRestrictions = restrictionInfo.getActiveRestrictions();
-        if (isUxRestrictionsNoSetupCheckEnabled()) {
-            if (isVerboseLoggable()) {
-                Log.v(TAG, "checkIsSetupRestricted UX_RESTRICTIONS_NO_SETUP enabled "
-                        + "activeRestrictions " + activeRestrictions);
-            }
-            return (restrictionInfo.getActiveRestrictions()
-                    & CarUxRestrictions.UX_RESTRICTIONS_NO_SETUP) != 0;
-        }
         if (isVerboseLoggable()) {
-            Log.v(TAG, "checkIsSetupRestricted UX_RESTRICTIONS_NO_SETUP disabled "
-                    + "activeRestrictions " + activeRestrictions);
+            Log.v(TAG, "activeRestrictions are " + activeRestrictions);
         }
         // There must be at least some restriction in place.
-        return restrictionInfo.getActiveRestrictions() != 0;
+        return activeRestrictions != 0;
     }
 
     @Override
@@ -300,9 +286,4 @@ public class CarDrivingStateMonitor implements
         CarHelperRegistry.getRegistry(context).putHelper(CarDrivingStateMonitor.class, monitor);
     }
 
-    private boolean isUxRestrictionsNoSetupCheckEnabled() {
-        return SystemProperties.getBoolean(KEY_ENABLE_UX_RESTRICTIONS_NO_SETUP_CHECK, false)
-                || SystemProperties.getBoolean(
-                "persist." + KEY_ENABLE_UX_RESTRICTIONS_NO_SETUP_CHECK, false);
-    }
 }