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

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

Merge "Use new UnsupportedAppUsage annotation." am: 39f329c5 am: 62169a75 

Change-Id: Ib94ae7e9f19c543d0180e3a547fc02f55c055ca7
parents dd605f0c 62169a75

core/java/android/view/Choreographer.java

+1 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


package android.view;



import static android.view.DisplayEventReceiver.CONFIG_CHANGED_EVENT_SUPPRESS;

import static android.view.DisplayEventReceiver.VSYNC_SOURCE_APP;

import static android.view.DisplayEventReceiver.VSYNC_SOURCE_SURFACE_FLINGER;



import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.graphics.FrameInfo;

import android.hardware.display.DisplayManagerGlobal;

import android.os.Build;

core/java/android/view/ContextThemeWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.view; 


import android.annotation.Nullable;

import android.annotation.StyleRes;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.ContextWrapper;

import android.content.res.AssetManager;

core/java/android/view/Display.java

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

import android.annotation.RequiresPermission;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.app.KeyguardManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

core/java/android/view/DisplayAdjustments.java

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


package android.view;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

core/java/android/view/DisplayEventReceiver.java

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


package android.view;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Looper;

import android.os.MessageQueue;

import android.util.Log;