Replace flag check to sdk version check

This change replace flag check to sdk version check to fix the problem
that when the new module is installed on the new version of mainline the
exported flags will have inconsistent flag value.

Test: m
Flag: EXEMPT remove flag call
Relnote: M0
Bug: 401592182
Change-Id: Ib768880af8eddc96db44a35860042e1e0a0d99a7

2 files changed, 8 insertions, 13 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java
index 026f108fa..39ca24a71 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java
@@ -182,10 +182,8 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment
         if (SdkLevel.isAtLeastV()) {
             mSensorPrivacyManager = requireContext().getSystemService(SensorPrivacyManager.class);
             mCameraPrivacyAllowlist = mSensorPrivacyManager.getCameraPrivacyAllowlist();
-            if (Flags.addBannersToPrivacySensitiveAppsForAaos()) {
-                mAutomotiveLocationBypassAllowlist =
-                        LocationUtils.getAutomotiveLocationBypassAllowlist(requireContext());
-            }
+            mAutomotiveLocationBypassAllowlist =
+                    LocationUtils.getAutomotiveLocationBypassAllowlist(requireContext());
         }
     }
 
@@ -317,13 +315,11 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment
             if (Manifest.permission_group.CAMERA.equals(mPermGroupName)) {
                 mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus);
             }
-            if (Flags.addBannersToPrivacySensitiveAppsForAaos()) {
-                if (Manifest.permission_group.LOCATION.equals(mPermGroupName)) {
-                    mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus);
-                }
-                if (Manifest.permission_group.MICROPHONE.equals(mPermGroupName)) {
-                    mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus);
-                }
+            if (Manifest.permission_group.LOCATION.equals(mPermGroupName)) {
+                mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus);
+            }
+            if (Manifest.permission_group.MICROPHONE.equals(mPermGroupName)) {
+                mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus);
             }
         }
 
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java
index 3d1e44b6a..76ce9b273 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java
@@ -40,7 +40,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
 import com.android.modules.utils.build.SdkLevel;
-import com.android.permission.flags.Flags;
 import com.android.permissioncontroller.PermissionControllerApplication;
 import com.android.permissioncontroller.R;
 
@@ -117,7 +116,7 @@ public class LocationUtils {
     /** Checks if the provided package is an automotive location bypass allowlisted package. */
     public static boolean isAutomotiveLocationBypassAllowlistedPackage(
             Context context, String packageName) {
-        return SdkLevel.isAtLeastV() && Flags.addBannersToPrivacySensitiveAppsForAaos()
+        return SdkLevel.isAtLeastV()
                 && getAutomotiveLocationBypassAllowlist(context).contains(packageName);
     }