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

Commit 26adb9f0 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11987757 from 1da8dde8 to 24Q4-release 

Change-Id: I2d0d24a9d96a362f4f65c85207ee1eed0927507f
parents 7d9634d2 1da8dde8

api/StubLibraries.bp

+1 −0
Original line number Diff line number Diff line
@@ -922,6 +922,7 @@ java_defaults { 
        "i18n.module.public.api.stubs.source.system.api.contribution",

        "i18n.module.public.api.stubs.source.module_lib.api.contribution",

    ],

    previous_api: ":android.api.public.latest",

}



// Java API library definitions per API surface

core/api/system-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -12886,7 +12886,14 @@ package android.service.notification { 
    field public static final String KEY_SENSITIVE_CONTENT = "key_sensitive_content";

    field public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";

    field public static final String KEY_TEXT_REPLIES = "key_text_replies";

    field @FlaggedApi("android.service.notification.notification_classification") public static final String KEY_TYPE = "key_type";

    field public static final String KEY_USER_SENTIMENT = "key_user_sentiment";

    field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_CONTENT_RECOMMENDATION = 4; // 0x4

    field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_NEWS = 3; // 0x3

    field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_OTHER = 0; // 0x0

    field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_PROMOTION = 1; // 0x1

    field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_SOCIAL_MEDIA = 2; // 0x2

    field @FlaggedApi("android.service.notification.notification_classification") public static final int TYPE_UNKNOWN = -1; // 0xffffffff

  }















  public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {

























core/api/test-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -379,6 +379,10 @@ package android.app {













    method public void setImportantConversation(boolean);















    method public void setOriginalImportance(int);















    method public void setUserVisibleTaskShown(boolean);













    field @FlaggedApi("android.service.notification.notification_classification") public static final String NEWS_ID = "android.app.news";













    field @FlaggedApi("android.service.notification.notification_classification") public static final String PROMOTIONS_ID = "android.app.promotions";













    field @FlaggedApi("android.service.notification.notification_classification") public static final String RECS_ID = "android.app.recs";













    field @FlaggedApi("android.service.notification.notification_classification") public static final String SOCIAL_MEDIA_ID = "android.app.social";















  }































  public final class NotificationChannelGroup implements android.os.Parcelable {

































core/java/android/app/Activity.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -3701,7 +3701,7 @@ public class Activity extends ContextThemeWrapper













     * @see View#findViewById(int)















     * @see Activity#requireViewById(int)















     */













    @Nullable













    /* TODO(b/347672184): Re-add @Nullable */















    public <T extends View> T findViewById(@IdRes int id) {















        return getWindow().findViewById(id);















    }

































core/java/android/app/Dialog.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -565,7 +565,7 @@ public class Dialog implements DialogInterface, Window.Callback,













     * @see View#findViewById(int)















     * @see Dialog#requireViewById(int)















     */













    @Nullable













    /* TODO(b/347672184): Re-add @Nullable */















    public <T extends View> T findViewById(@IdRes int id) {















        return mWindow.findViewById(id);















    }