Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9079c175 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Android (Google) Code Review
Browse files

Merge "Remove legacy style metalava suppression"

parents f32d4487 1394a019

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

+2 −2
Original line number Diff line number Diff line
@@ -6776,7 +6776,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public boolean isDeviceManaged() {

        try {

            return mService.hasDeviceOwner();
@@ -10487,7 +10487,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public @Nullable CharSequence getDeviceOwnerOrganizationName() {

        try {

            return mService.getDeviceOwnerOrganizationName();

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

+5 −5
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ public final class HdmiControlManager { 
     */

    @Nullable

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiClient getClient(int type) {

        if (mService == null) {

            return null;
@@ -610,7 +610,7 @@ public final class HdmiControlManager { 
     */

    @Nullable

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiPlaybackClient getPlaybackClient() {

        return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK);

    }
@@ -628,7 +628,7 @@ public final class HdmiControlManager { 
     */

    @Nullable

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiTvClient getTvClient() {

        return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV);

    }
@@ -646,7 +646,7 @@ public final class HdmiControlManager { 
     * @hide

     */

    @Nullable

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiAudioSystemClient getAudioSystemClient() {

        return (HdmiAudioSystemClient) getClient(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);

    }
@@ -661,7 +661,7 @@ public final class HdmiControlManager { 
     * @return {@link HdmiSwitchClient} instance. {@code null} on failure.

     */

    @Nullable

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiSwitchClient getSwitchClient() {

        return (HdmiSwitchClient) getClient(HdmiDeviceInfo.DEVICE_PURE_CEC_SWITCH);

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ public final class ContextHubManager { 
     *             register a {@link android.hardware.location.ContextHubClientCallback}.

     */

    @Deprecated

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public int registerCallback(@NonNull Callback callback) {

        return registerCallback(callback, null);

    }
@@ -688,7 +688,7 @@ public final class ContextHubManager { 
     *             register a {@link android.hardware.location.ContextHubClientCallback}.

     */

    @Deprecated

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public int registerCallback(Callback callback, Handler handler) {

        synchronized(this) {

            if (mCallback != null) {
@@ -892,7 +892,7 @@ public final class ContextHubManager { 
     * @deprecated Use {@link android.hardware.location.ContextHubClient#close()} to unregister

     *             a {@link android.hardware.location.ContextHubClientCallback}.

     */

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    @Deprecated

    public int unregisterCallback(@NonNull Callback callback) {

      synchronized(this) {

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

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ public class UsbDeviceConnection { 
     * @hide

     */

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public boolean resetDevice() {

        return native_reset_device();

    }

core/java/android/net/TrafficStats.java

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ public class TrafficStats { 
     * Changes only take effect during subsequent calls to

     * {@link #tagSocket(Socket)}.

     */

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public static void setThreadStatsUid(int uid) {

        NetworkManagementSocketTagger.setThreadSocketStatsUid(uid);

    }
@@ -339,7 +339,7 @@ public class TrafficStats { 
     *

     * @see #setThreadStatsUid(int)

     */

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public static void clearThreadStatsUid() {

        NetworkManagementSocketTagger.setThreadSocketStatsUid(-1);

    }