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

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

Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8 am: 068a9faf 

Change-Id: Ibad1c39310722d99f2de6bb0d9fad64caa5dbba1
parents d7c79c3a 068a9faf

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.annotation.UnsupportedAppUsage;

import android.compat.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.annotation.UnsupportedAppUsage;

import android.compat.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.annotation.UnsupportedAppUsage;

import android.compat.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

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


package android.mtp;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;



import java.util.ArrayList;

import java.util.List;