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

Commit 1e7a3e81 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use new UnsupportedAppUsage annotation." am: 9938c70f am: 1f8ff9d3 

Change-Id: I2aa7c78de32e8abb96150d43500ecb29ba9ebd15
parents 627480d9 1f8ff9d3

core/java/android/provider/ContactsInternal.java

+1 −2
Original line number Diff line number Diff line
@@ -15,15 +15,14 @@ 
 */

package android.provider;



import android.annotation.UnsupportedAppUsage;

import android.app.admin.DevicePolicyManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ActivityNotFoundException;

import android.content.ContentUris;

import android.content.Context;

import android.content.Intent;

import android.content.UriMatcher;

import android.net.Uri;

import android.os.Process;

import android.os.UserHandle;

import android.text.TextUtils;

import android.widget.Toast;

core/java/android/provider/DocumentsContract.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static com.android.internal.util.Preconditions.checkCollectionNotEmpty; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentInterface;

import android.content.ContentResolver;

import android.content.Context;

core/java/android/provider/Downloads.java

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


package android.provider;



import android.annotation.UnsupportedAppUsage;

import android.app.DownloadManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.net.NetworkPolicyManager;

import android.net.Uri;

core/java/android/provider/MediaStore.java

+1 −1
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import android.annotation.RequiresPermission; 
import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.app.Activity;

import android.app.AppGlobals;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ClipData;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.annotation.UserIdInt;

import android.app.ActivityThread;

import android.app.AppOpsManager;
@@ -46,6 +45,7 @@ import android.app.NotificationChannel; 
import android.app.NotificationManager;

import android.app.SearchManager;

import android.app.WallpaperManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentValues;