From 8505e098bd92a100492b59b1f6752e0635b32351 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 3 Jan 2018 09:50:28 +0900 Subject: [PATCH] Remove @SystemApi annotation from private or package-private members Some private or package-private members have been marked as @SystemApi, which do not make sense as they aren't accessible to apps due to the access modifier. Having annotation on such members hasn't been harmful, but will soon trigger CTS failures when we do the exact match for SystemAPIs; a runtime entity annotated as @SystemApi have to exist in the documented API (e.g. system-current.txt). So, removing the bogus annotations. Bug: 67891551 Test: m -j does not require m update-system-api Change-Id: I0083475ef5435cf9a582c2ce1be469c92328fe69 --- core/java/android/app/backup/BackupManager.java | 1 - core/java/android/hardware/hdmi/HdmiTimerRecordSources.java | 1 - core/java/android/view/WindowManagerPolicyConstants.java | 3 --- 3 files changed, 5 deletions(-) diff --git a/core/java/android/app/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java index 6512b98ca085..3a6a5b20edf7 100644 --- a/core/java/android/app/backup/BackupManager.java +++ b/core/java/android/app/backup/BackupManager.java @@ -707,7 +707,6 @@ public class BackupManager { * redirects them into main-thread actions. This serializes the backup * progress callbacks nicely within the usual main-thread lifecycle pattern. */ - @SystemApi private class BackupObserverWrapper extends IBackupObserver.Stub { final Handler mHandler; final BackupObserver mObserver; diff --git a/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java b/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java index 6fe13ca8e375..d7c2e1b3dcbb 100644 --- a/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java +++ b/core/java/android/hardware/hdmi/HdmiTimerRecordSources.java @@ -187,7 +187,6 @@ public class HdmiTimerRecordSources { * Base class for time-related information. * @hide */ - @SystemApi /* package */ static class TimeUnit { /* package */ final int mHour; /* package */ final int mMinute; diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java index 21943bd6ba31..9c1c9e34cfb4 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -18,8 +18,6 @@ package android.view; import static android.view.Display.DEFAULT_DISPLAY; -import android.annotation.SystemApi; - /** * Constants for interfacing with WindowManagerService and WindowManagerPolicyInternal. * @hide @@ -62,7 +60,6 @@ public interface WindowManagerPolicyConstants { * Set to {@code true} when intent was invoked from pressing the home key. * @hide */ - @SystemApi String EXTRA_FROM_HOME_KEY = "android.intent.extra.FROM_HOME_KEY"; // TODO: move this to a more appropriate place. -- 2.11.0