From 925f0a51a3c54031df9052b2852c490703c163a2 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 10 Dec 2019 15:41:47 +0000 Subject: [PATCH] Hide Status @IntDef Typedefs aren't meant to be exposed in the stubs Bug: 145982314 Test: m Change-Id: Ied82f8fe225bb74506e24ffdcb45d34edb71570c --- api/system-current.txt | 3 --- api/test-current.txt | 3 --- api/test-lint-baseline.txt | 2 -- core/java/android/os/HwParcel.java | 1 + 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 6a88822ac8da3..be5018629d9d4 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8592,9 +8592,6 @@ package android.os { field public static final int STATUS_SUCCESS = 0; // 0x0 } - @IntDef(prefix={"STATUS_"}, value={android.os.HwParcel.STATUS_SUCCESS}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface HwParcel.Status { - } - public interface IHwBinder { method public boolean linkToDeath(android.os.IHwBinder.DeathRecipient, long); method public android.os.IHwInterface queryLocalInterface(String); diff --git a/api/test-current.txt b/api/test-current.txt index e7a0cf6c2f4d9..93237540f4c7b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2204,9 +2204,6 @@ package android.os { field public static final int STATUS_SUCCESS = 0; // 0x0 } - @IntDef(prefix={"STATUS_"}, value={android.os.HwParcel.STATUS_SUCCESS}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface HwParcel.Status { - } - public interface IHwBinder { method public boolean linkToDeath(android.os.IHwBinder.DeathRecipient, long); method public android.os.IHwInterface queryLocalInterface(String); diff --git a/api/test-lint-baseline.txt b/api/test-lint-baseline.txt index a9c18363d8b03..f53548b68a45c 100644 --- a/api/test-lint-baseline.txt +++ b/api/test-lint-baseline.txt @@ -2451,8 +2451,6 @@ ProtectedMember: android.view.ViewGroup#resetResolvedDrawables(): -PublicTypedef: android.os.HwParcel.Status: - PublicTypedef: android.telephony.ims.feature.MmTelFeature.MmTelCapabilities.MmTelCapability: PublicTypedef: android.telephony.ims.feature.MmTelFeature.ProcessCallResult: diff --git a/core/java/android/os/HwParcel.java b/core/java/android/os/HwParcel.java index fb36e6f6978f5..228548ad7802b 100644 --- a/core/java/android/os/HwParcel.java +++ b/core/java/android/os/HwParcel.java @@ -38,6 +38,7 @@ import java.util.Arrays; public class HwParcel { private static final String TAG = "HwParcel"; + /** @hide */ @IntDef(prefix = { "STATUS_" }, value = { STATUS_SUCCESS, })