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

Commit 2de4b214 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace dalvik..UnsupportedAppUsage annotation."

parents 3ef8586f 9a5c3105

opengl/java/com/google/android/gles_jni/EGLImpl.java

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


package com.google.android.gles_jni;



import android.compat.annotation.UnsupportedAppUsage;

import android.graphics.SurfaceTexture;

import android.view.Surface;

import android.view.SurfaceHolder;

import android.view.SurfaceView;



import dalvik.annotation.compat.UnsupportedAppUsage;



import javax.microedition.khronos.egl.EGL10;

import javax.microedition.khronos.egl.EGLConfig;

import javax.microedition.khronos.egl.EGLContext;

opengl/java/com/google/android/gles_jni/GLImpl.java

+1 −2
Original line number Diff line number Diff line
@@ -20,14 +20,13 @@ 
package com.google.android.gles_jni;



import android.app.AppGlobals;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.pm.ApplicationInfo;

import android.content.pm.IPackageManager;

import android.os.Build;

import android.os.UserHandle;

import android.util.Log;



import dalvik.annotation.compat.UnsupportedAppUsage;



import java.nio.Buffer;



import javax.microedition.khronos.opengles.GL10;

telecomm/java/android/telecom/CallerInfoAsyncQuery.java

+1 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.telecom;



import android.app.ActivityManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.AsyncQueryHandler;

import android.content.ContentResolver;

import android.content.Context;
@@ -35,8 +36,6 @@ import android.telephony.PhoneNumberUtils; 
import android.telephony.SubscriptionManager;

import android.text.TextUtils;



import dalvik.annotation.compat.UnsupportedAppUsage;



import java.util.ArrayList;

import java.util.List;

telephony/common/com/android/internal/telephony/SmsApplication.java

+1 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.Manifest.permission; 
import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.role.RoleManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -40,7 +41,6 @@ import android.os.UserHandle; 
import android.provider.Telephony;

import android.provider.Telephony.Sms.Intents;

import android.telephony.PackageChangeReceiver;

import android.util.Log;

import android.telephony.TelephonyManager;

import android.util.Log;
@@ -48,8 +48,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;



import dalvik.annotation.compat.UnsupportedAppUsage;



import java.util.Collection;

import java.util.HashMap;

import java.util.List;

telephony/common/com/google/android/mms/ContentType.java

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


package com.google.android.mms;



import dalvik.annotation.compat.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;



import java.util.ArrayList;