Merge "Check a flag to see whether or not to show permission usage information."

This commit is contained in:
TreeHugger Robot
2019-02-05 15:23:13 +00:00
committed by Android (Google) Code Review
6 changed files with 71 additions and 9 deletions

View File

@@ -18,6 +18,7 @@ import static java.util.concurrent.TimeUnit.DAYS;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.provider.DeviceConfig;
import android.view.View;
import androidx.annotation.VisibleForTesting;
@@ -60,7 +61,9 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
@Override
public boolean isAvailable() {
return true;
return Boolean.parseBoolean(
DeviceConfig.getProperty(DeviceConfig.Privacy.NAMESPACE,
DeviceConfig.Privacy.PROPERTY_PERMISSIONS_HUB_ENABLED));
}
@Override

View File

@@ -26,6 +26,7 @@ import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.permission.PermissionControllerManager;
import android.permission.RuntimePermissionUsageInfo;
import android.provider.DeviceConfig;
import android.util.Log;
import android.view.View;
@@ -62,7 +63,10 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
@Override
public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE;
return Boolean.parseBoolean(
DeviceConfig.getProperty(DeviceConfig.Privacy.NAMESPACE,
DeviceConfig.Privacy.PROPERTY_PERMISSIONS_HUB_ENABLED)) ?
AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
@Override