Merge "Cleanup privacy hub related flags" into main

This commit is contained in:
Richard MacGregor
2024-07-01 20:53:59 +00:00
committed by Android (Google) Code Review

View File

@@ -18,7 +18,6 @@ package com.android.settings.privacy;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.provider.DeviceConfig;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -30,7 +29,6 @@ import com.android.settings.core.BasePreferenceController;
* The preference controller for privacy hub top level preference. * The preference controller for privacy hub top level preference.
*/ */
public final class PrivacyHubPreferenceController extends BasePreferenceController { public final class PrivacyHubPreferenceController extends BasePreferenceController {
public static final String PROPERTY_PRIVACY_HUB_ENABLED = "privacy_hub_enabled";
public PrivacyHubPreferenceController(@NonNull Context context, @NonNull String key) { public PrivacyHubPreferenceController(@NonNull Context context, @NonNull String key) {
super(context, key); super(context, key);
@@ -38,8 +36,7 @@ public final class PrivacyHubPreferenceController extends BasePreferenceControll
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, return AVAILABLE;
PROPERTY_PRIVACY_HUB_ENABLED, true) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override