From 41c544c5924212b06883991af255e9f220e9296d Mon Sep 17 00:00:00 2001
From: Ashwini Oruganti <ashfall@google.com>
Date: Tue, 20 Apr 2021 13:22:11 -0700
Subject: [PATCH] Make ActivityInfo#attributionTags public.

Bug: 182979908
Test: TH
Change-Id: Ifefefe02c27481d3de9a3c1f0b82953278705fcf
---
 core/api/current.txt                           | 1 +
 core/java/android/content/pm/ActivityInfo.java | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 04207145673fa..271c12545e9fa 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -11862,6 +11862,7 @@ package android.content.pm {
     field public static final int SCREEN_ORIENTATION_USER_LANDSCAPE = 11; // 0xb
     field public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; // 0xc
     field public static final int UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW = 1; // 0x1
+    field public String[] attributionTags;
     field public int colorMode;
     field public int configChanges;
     field public int documentLaunchMode;
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index fa9142ca94494..5cca8fe5ec1e2 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -17,6 +17,7 @@
 package android.content.pm;
 
 import android.annotation.IntDef;
+import android.annotation.SuppressLint;
 import android.annotation.TestApi;
 import android.app.compat.CompatChanges;
 import android.compat.annotation.ChangeId;
@@ -1151,10 +1152,10 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
     public WindowLayout windowLayout;
 
     /**
-     * Attribution tags for finer grained calls if a {@android.content.Context#sendBroadcast(Intent,
-     * String)} is used with a permission.
-     * @hide
+     * Attribution tags for finer grained calls if a {@link
+     * android.content.Context#sendBroadcast(Intent, String)} is used with a permission.
      */
+    @SuppressLint("MissingNullability")
     public String[] attributionTags;
 
     public ActivityInfo() {