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

Commit 59d58f5c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use new UnsupportedAppUsage annotation." am: 93958879 am: 8081ee1b 

Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
parents 74cc5401 8081ee1b

core/java/android/database/AbstractCursor.java

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



import android.annotation.NonNull;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentResolver;

import android.net.Uri;

import android.os.Build;

core/java/android/database/AbstractWindowedCursor.java

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


package android.database;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;



/**

 * A base class for Cursors that store their data in {@link CursorWindow}s.

core/java/android/database/BulkCursorNative.java

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


package android.database;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Binder;

import android.os.Bundle;

import android.os.IBinder;

core/java/android/database/ContentObserver.java

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


package android.database;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.Uri;

import android.os.Handler;

import android.os.UserHandle;

core/java/android/database/CursorWindow.java

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



import android.annotation.BytesLong;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.res.Resources;

import android.database.sqlite.SQLiteClosable;

import android.database.sqlite.SQLiteException;