diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2017-06-07 18:50:02 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2017-06-07 18:50:05 -0700 |
| commit | 2dcedc1276aee3e4e044b1d4ecafc34462fefb7c (patch) | |
| tree | c21117cc0686b752b24edeeac4e8cb2be0eeedb0 /core/java | |
| parent | 58977d10353000e3edaf90ab447d6de92ad075a2 (diff) | |
Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas
bug:62232727
Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/print/PrintManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/printservice/PrintServiceInfo.java | 2 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/print/PrintManager.java b/core/java/android/print/PrintManager.java index e8ff2e2cee98..52dccb432766 100644 --- a/core/java/android/print/PrintManager.java +++ b/core/java/android/print/PrintManager.java @@ -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); diff --git a/core/java/android/printservice/PrintServiceInfo.java b/core/java/android/printservice/PrintServiceInfo.java index 57f122923c69..5ef93193c67c 100644 --- a/core/java/android/printservice/PrintServiceInfo.java +++ b/core/java/android/printservice/PrintServiceInfo.java @@ -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 { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6a17ed1500bd..f1ce9d52e920 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5850,6 +5850,7 @@ public final class Settings { * * @hide */ + @TestApi public static final String DISABLED_PRINT_SERVICES = "disabled_print_services"; |