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

Commit 66574f22 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Automerger Merge Worker
Browse files

Merge "Remove legacy style metalava suppression" am: e1bb600f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1421698

Change-Id: I86186f315dbac925c11f99993dd71703bd12d6ca
parents 4ef05f5c e1bb600f

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

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

     */

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public boolean isDeviceManaged() {

        try {

            return mService.hasDeviceOwner();
@@ -10392,7 +10392,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
@@ -407,7 +407,7 @@ public final class HdmiControlManager { 
     */

    @Nullable

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiClient getClient(int type) {

        if (mService == null) {

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

    @Nullable

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiPlaybackClient getPlaybackClient() {

        return (HdmiPlaybackClient) getClient(HdmiDeviceInfo.DEVICE_PLAYBACK);

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

    @Nullable

    @SystemApi

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiTvClient getTvClient() {

        return (HdmiTvClient) getClient(HdmiDeviceInfo.DEVICE_TV);

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

     */

    @Nullable

    @SuppressLint("Doclava125")

    @SuppressLint("RequiresPermission")

    public HdmiAudioSystemClient getAudioSystemClient() {

        return (HdmiAudioSystemClient) getClient(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);

    }
@@ -491,7 +491,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);

    }