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

Commit 99179144 authored by Ashwini Oruganti's avatar Ashwini Oruganti Committed by Android (Google) Code Review
Browse files

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

parents 3c21f3d0 41c544c5

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

core/java/android/content/pm/ActivityInfo.java

+4 −3
Original line number Diff line number Diff line
@@ -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() {