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

Merge "Make ActivityInfo#attributionTags public." into sc-dev

Browse Source
This commit is contained in:
Ashwini Oruganti
2021-04-21 17:27:41 +00:00
committed by Android (Google) Code Review
parent 3c21f3d0e1 41c544c592
commit 991791446c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -11870,6 +11870,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;

7
core/java/android/content/pm/ActivityInfo.java
View File

@@ -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;
@@ -1174,10 +1175,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() {