[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
This commit is contained in:
Jay Thomas Sullivan
2023-02-14 16:41:10 -08:00
committed by Jay Sullivan
parent 65785048a6
commit 9f8da1f9be

View File

@@ -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;
}
}