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

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

Merge "Use new UnsupportedAppUsage annotation." am: 70129fc8 am: fe3063fb 

Change-Id: Iea82f97f0ba766ce3f435630175aea48ca47f12f
parents 62e56d9b fe3063fb

core/java/android/accessibilityservice/AccessibilityService.java

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

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.UnsupportedAppUsage;

import android.app.Service;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ParceledListSlice;

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static android.content.pm.PackageManager.FEATURE_FINGERPRINT; 


import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageManager;

core/java/android/accounts/Account.java

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


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Parcel;

import android.os.Parcelable;

core/java/android/accounts/AccountAndUser.java

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


package android.accounts;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;



/**

 * Used to store the Account and the UserId this account is associated with.

core/java/android/accounts/AccountAuthenticatorResponse.java

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package android.accounts;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Bundle;

import android.os.Parcelable;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;

import android.util.Log;