Merge "Remove legacy style metalava suppression" (e1bb600f) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6680,7 +6680,7 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public boolean isDeviceManaged() {		public boolean isDeviceManaged() {
	try {		try {
	return mService.hasDeviceOwner();		return mService.hasDeviceOwner();
	@@ -10392,7 +10392,7 @@ public class DevicePolicyManager {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public @Nullable CharSequence getDeviceOwnerOrganizationName() {		public @Nullable CharSequence getDeviceOwnerOrganizationName() {
	try {		try {
	return mService.getDeviceOwnerOrganizationName();		return mService.getDeviceOwnerOrganizationName();

core/java/android/hardware/hdmi/HdmiControlManager.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -407,7 +407,7 @@ public final class HdmiControlManager {
	*/		*/
	@Nullable		@Nullable
	@SystemApi		@SystemApi
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public HdmiClient getClient(int type) {		public HdmiClient getClient(int type) {
	if (mService == null) {		if (mService == null) {
	return null;		return null;
	@@ -440,7 +440,7 @@ public final class HdmiControlManager {
	*/		*/
	@Nullable		@Nullable
	@SystemApi		@SystemApi
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public HdmiPlaybackClient getPlaybackClient() {		public HdmiPlaybackClient getPlaybackClient() {
	return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK);		return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK);
	}		}
	@@ -458,7 +458,7 @@ public final class HdmiControlManager {
	*/		*/
	@Nullable		@Nullable
	@SystemApi		@SystemApi
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public HdmiTvClient getTvClient() {		public HdmiTvClient getTvClient() {
	return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV);		return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV);
	}		}
	@@ -476,7 +476,7 @@ public final class HdmiControlManager {
	* @hide		* @hide
	*/		*/
	@Nullable		@Nullable
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public HdmiAudioSystemClient getAudioSystemClient() {		public HdmiAudioSystemClient getAudioSystemClient() {
	return (HdmiAudioSystemClient) getClient(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);		return (HdmiAudioSystemClient) getClient(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
	}		}
	@@ -491,7 +491,7 @@ public final class HdmiControlManager {
	* @return {@link HdmiSwitchClient} instance. {@code null} on failure.		* @return {@link HdmiSwitchClient} instance. {@code null} on failure.
	*/		*/
	@Nullable		@Nullable
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public HdmiSwitchClient getSwitchClient() {		public HdmiSwitchClient getSwitchClient() {
	return (HdmiSwitchClient) getClient(HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH);		return (HdmiSwitchClient) getClient(HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH);
	}		}

core/java/android/hardware/location/ContextHubManager.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -654,7 +654,7 @@ public final class ContextHubManager {
	* register a {@link android.hardware.location.ContextHubClientCallback}.		* register a {@link android.hardware.location.ContextHubClientCallback}.
	*/		*/
	@Deprecated		@Deprecated
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public int registerCallback(@NonNull Callback callback) {		public int registerCallback(@NonNull Callback callback) {
	return registerCallback(callback, null);		return registerCallback(callback, null);
	}		}
	@@ -688,7 +688,7 @@ public final class ContextHubManager {
	* register a {@link android.hardware.location.ContextHubClientCallback}.		* register a {@link android.hardware.location.ContextHubClientCallback}.
	*/		*/
	@Deprecated		@Deprecated
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public int registerCallback(Callback callback, Handler handler) {		public int registerCallback(Callback callback, Handler handler) {
	synchronized(this) {		synchronized(this) {
	if (mCallback != null) {		if (mCallback != null) {
	@@ -892,7 +892,7 @@ public final class ContextHubManager {
	* @deprecated Use {@link android.hardware.location.ContextHubClient#close()} to unregister		* @deprecated Use {@link android.hardware.location.ContextHubClient#close()} to unregister
	* a {@link android.hardware.location.ContextHubClientCallback}.		* a {@link android.hardware.location.ContextHubClientCallback}.
	*/		*/
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	@Deprecated		@Deprecated
	public int unregisterCallback(@NonNull Callback callback) {		public int unregisterCallback(@NonNull Callback callback) {
	synchronized(this) {		synchronized(this) {

core/java/android/hardware/usb/UsbDeviceConnection.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -299,7 +299,7 @@ public class UsbDeviceConnection {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public boolean resetDevice() {		public boolean resetDevice() {
	return native_reset_device();		return native_reset_device();
	}		}

core/java/android/net/TrafficStats.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -301,7 +301,7 @@ public class TrafficStats {
	* Changes only take effect during subsequent calls to		* Changes only take effect during subsequent calls to
	* {@link #tagSocket(Socket)}.		* {@link #tagSocket(Socket)}.
	*/		*/
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public static void setThreadStatsUid(int uid) {		public static void setThreadStatsUid(int uid) {
	NetworkManagementSocketTagger.setThreadSocketStatsUid(uid);		NetworkManagementSocketTagger.setThreadSocketStatsUid(uid);
	}		}
	@@ -339,7 +339,7 @@ public class TrafficStats {
	*		*
	* @see #setThreadStatsUid(int)		* @see #setThreadStatsUid(int)
	*/		*/
	@SuppressLint("Doclava125")		@SuppressLint("RequiresPermission")
	public static void clearThreadStatsUid() {		public static void clearThreadStatsUid() {
	NetworkManagementSocketTagger.setThreadSocketStatsUid(-1);		NetworkManagementSocketTagger.setThreadSocketStatsUid(-1);
	}		}