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

Commit f6253ef4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f am: 01928676 

Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083
parents 63f7141a 01928676

media/java/android/media/soundtrigger/SoundTriggerDetector.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.annotation.UnsupportedAppUsage;

import android.hardware.soundtrigger.IRecognitionStatusCallback;

import android.hardware.soundtrigger.SoundTrigger;

import android.hardware.soundtrigger.SoundTrigger.RecognitionConfig;

media/java/android/media/soundtrigger/SoundTriggerManager.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.compat.annotation.UnsupportedAppUsage;

import android.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;

import android.hardware.soundtrigger.SoundTrigger;

media/java/android/media/tv/TvInputInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.StringRes;

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

media/java/android/media/tv/TvInputService.java

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.app.ActivityManager;

import android.app.Service;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Intent;

import android.graphics.PixelFormat;

media/java/android/mtp/MtpPropertyList.java

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 


package android.mtp;



import android.compat.annotation.UnsupportedAppUsage;



import android.annotation.UnsupportedAppUsage;

import java.util.ArrayList;

import java.util.List;