Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove annotations from generated class until tests updated" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-07 16:20:32 +00:00
committed by Android (Google) Code Review
parent 0a9afe6246 79db6e5807
commit 402eb6529d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/AttributionSource.java
View File

@@ -21,15 +21,12 @@ import android.annotation.Nullable;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.app.AppGlobals;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.Process; import android.os.Process;
import android.os.RemoteException;
import android.os.UserHandle;
import android.permission.PermissionManager; import android.permission.PermissionManager;
import android.util.ArraySet; import android.util.ArraySet;
@@ -93,6 +90,8 @@ import java.util.Set;
// TODO: Codegen applies method level annotations to argument vs the generated member (@SystemApi) // TODO: Codegen applies method level annotations to argument vs the generated member (@SystemApi)
// TODO: Codegen doesn't properly read/write IBinder members // TODO: Codegen doesn't properly read/write IBinder members
// TODO: Codegen doesn't properly handle Set arguments // TODO: Codegen doesn't properly handle Set arguments
// TODO: Codegen requires @SystemApi annotations on fields which breaks
// android.signature.cts.api.AnnotationTest (need to update the test)
// @DataClass(genEqualsHashCode = true, genConstructor = false, genBuilder = true) // @DataClass(genEqualsHashCode = true, genConstructor = false, genBuilder = true)
public final class AttributionSource implements Parcelable { public final class AttributionSource implements Parcelable {
/** /**
@@ -153,8 +152,6 @@ public final class AttributionSource implements Parcelable {
* *
* @hide * @hide
*/ */
@SystemApi
@RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS)
@DataClass.ParcelWith(RenouncedPermissionsParcelling.class) @DataClass.ParcelWith(RenouncedPermissionsParcelling.class)
private @Nullable Set<String> mRenouncedPermissions = null; private @Nullable Set<String> mRenouncedPermissions = null;
@@ -516,7 +513,7 @@ public final class AttributionSource implements Parcelable {
private @Nullable String mPackageName; private @Nullable String mPackageName;
private @Nullable String mAttributionTag; private @Nullable String mAttributionTag;
private @Nullable IBinder mToken; private @Nullable IBinder mToken;
private @SystemApi @RequiresPermission(android.Manifest.permission.RENOUNCE_PERMISSIONS) @Nullable Set<String> mRenouncedPermissions; private @Nullable Set<String> mRenouncedPermissions;
private @Nullable AttributionSource mNext; private @Nullable AttributionSource mNext;
private long mBuilderFieldsSet = 0L; private long mBuilderFieldsSet = 0L;