Ensure only test print services enabled - framework

Test: cts-tradefed run cts-dev -m CtsPrintTestCas

bug:62232727

Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
This commit is contained in:
Svetoslav Ganov
2017-06-07 18:50:02 -07:00
parent 58977d1035
commit 2dcedc1276
4 changed files with 16 additions and 0 deletions

View File

@@ -20,6 +20,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
import android.app.Activity;
import android.app.Application.ActivityLifecycleCallbacks;
import android.content.ComponentName;
@@ -141,6 +142,7 @@ public final class PrintManager {
* @see #getPrintServices
* @hide
*/
@TestApi
public static final int ALL_SERVICES = ENABLED_SERVICES | DISABLED_SERVICES;
/**
@@ -627,6 +629,7 @@ public final class PrintManager {
*
* @hide
*/
@TestApi
@SystemApi
public @NonNull List<PrintServiceInfo> getPrintServices(int selectionFlags) {
Preconditions.checkFlagsArgument(selectionFlags, ALL_SERVICES);

View File

@@ -18,6 +18,7 @@ package android.printservice;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -48,6 +49,7 @@ import java.io.IOException;
*
* @hide
*/
@TestApi
@SystemApi
public final class PrintServiceInfo implements Parcelable {

View File

@@ -5850,6 +5850,7 @@ public final class Settings {
*
* @hide
*/
@TestApi
public static final String DISABLED_PRINT_SERVICES =
"disabled_print_services";