Merge "Add changeId to gate R-QPR tests behind" into rvc-qpr-dev am: ca28a90bec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12354903

Change-Id: Iba0da404f44cdbcdc2a7c4fff1a6789ca789ccbf
This commit is contained in:
TreeHugger Robot
2020-08-12 17:55:24 +00:00
committed by Automerger Merge Worker

View File

@@ -35,6 +35,8 @@ import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.app.Service; import android.app.Service;
import android.app.admin.DevicePolicyManager.PermissionGrantState; import android.app.admin.DevicePolicyManager.PermissionGrantState;
import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -82,6 +84,15 @@ public abstract class PermissionControllerService extends Service {
*/ */
public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService"; public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";
/**
* A ChangeId indicating that this device supports camera and mic indicators. Will be "false"
* if present, because the CompatChanges#isChangeEnabled method returns true if the change id
* is not present.
*/
@ChangeId
@Disabled
private static final long CAMERA_MIC_INDICATORS_NOT_PRESENT = 162547999L;
/** /**
* Revoke a set of runtime permissions for various apps. * Revoke a set of runtime permissions for various apps.
* *