From 9f8da1f9be22a499fb8fb9a112c18a8a9f7f9a2d Mon Sep 17 00:00:00 2001
From: Jay Thomas Sullivan <jaysullivan@google.com>
Date: Tue, 14 Feb 2023 16:41:10 -0800
Subject: [PATCH] [Safety Labels] Decouple safety label changes from permission
 rationale

Currently the "Safety Label Changes" feature is toggled on only when the
following two feature flags are enabled:

1. safety_label_change_notifications_enabled
2. permission_rationale_enabled

Remove the dependence on "permission_rationale_enabled", so that "Safety
Label Changes" only relies on the
"safety_label_change_notifications_enabled" flag.

Bug: 269330969
Test:  atest PermissionControllerMockingTests:SafetyLabelChangesJobServiceTest; atest CtsPermission3TestCases:SafetyLabelChangesJobServiceTest;atest CtsPermission3TestCases:AppDataSharingUpdatesTest
Change-Id: Ie82bf6a5b6fe1d8cbe6ab58d23085e01c748b5c3
---
 .../privacy/AppDataSharingUpdatesPreferenceController.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/com/android/settings/privacy/AppDataSharingUpdatesPreferenceController.java b/src/com/android/settings/privacy/AppDataSharingUpdatesPreferenceController.java
index d8a3fcead71..86b4d3bcd1b 100644
--- a/src/com/android/settings/privacy/AppDataSharingUpdatesPreferenceController.java
+++ b/src/com/android/settings/privacy/AppDataSharingUpdatesPreferenceController.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.privacy;
 
-import static android.safetylabel.SafetyLabelConstants.PERMISSION_RATIONALE_ENABLED;
 import static android.safetylabel.SafetyLabelConstants.SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED;
 
 import android.content.Context;
@@ -39,8 +38,6 @@ public class AppDataSharingUpdatesPreferenceController extends BasePreferenceCon
     public int getAvailabilityStatus() {
         return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
                 SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED, false)
-                && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
-                        PERMISSION_RATIONALE_ENABLED, false)
                 ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 }