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

Commit 11481ec9 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12715656 from 6fff756d to 25Q1-release 

Change-Id: Ie0d6da92c448431f98ecc3eaf13fd74baab610a6
parents ef8cd003 6fff756d

AconfigFlags.bp

+7 −0
Original line number Diff line number Diff line
@@ -966,6 +966,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.app.flags-aconfig-java-host",

    aconfig_declarations: "android.app.flags-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Broadcast Radio

aconfig_declarations {

    name: "android.hardware.radio.flags-aconfig",

core/api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -24854,6 +24854,7 @@ package android.media { 
    method @NonNull public String getId();

    method @NonNull public CharSequence getName();

    method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") public int getSuitabilityStatus();

    method @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") public int getSupportedRoutingTypes();

    method public int getType();

    method public int getVolume();

    method public int getVolumeHandling();
@@ -24869,6 +24870,8 @@ package android.media { 
    field public static final String FEATURE_REMOTE_AUDIO_PLAYBACK = "android.media.route.feature.REMOTE_AUDIO_PLAYBACK";

    field public static final String FEATURE_REMOTE_PLAYBACK = "android.media.route.feature.REMOTE_PLAYBACK";

    field public static final String FEATURE_REMOTE_VIDEO_PLAYBACK = "android.media.route.feature.REMOTE_VIDEO_PLAYBACK";

    field @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") public static final int FLAG_ROUTING_TYPE_REMOTE = 4; // 0x4

    field @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") public static final int FLAG_ROUTING_TYPE_SYSTEM_AUDIO = 1; // 0x1

    field public static final int PLAYBACK_VOLUME_FIXED = 0; // 0x0

    field public static final int PLAYBACK_VOLUME_VARIABLE = 1; // 0x1

    field @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") public static final int SUITABILITY_STATUS_NOT_SUITABLE_FOR_TRANSFER = 2; // 0x2
@@ -24919,6 +24922,7 @@ package android.media { 
    method @NonNull public android.media.MediaRoute2Info.Builder setExtras(@Nullable android.os.Bundle);

    method @NonNull public android.media.MediaRoute2Info.Builder setIconUri(@Nullable android.net.Uri);

    method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") @NonNull public android.media.MediaRoute2Info.Builder setSuitabilityStatus(int);

    method @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") @NonNull public android.media.MediaRoute2Info.Builder setSupportedRoutingTypes(int);

    method @NonNull public android.media.MediaRoute2Info.Builder setType(int);

    method @NonNull public android.media.MediaRoute2Info.Builder setVisibilityPublic();

    method @NonNull public android.media.MediaRoute2Info.Builder setVisibilityRestricted(@NonNull java.util.Set<java.lang.String>);
@@ -37616,6 +37620,10 @@ package android.provider { 
    field public static final String TERTIARY_PHONE_TYPE = "tertiary_phone_type";

  }













  @FlaggedApi("android.provider.new_default_account_api_enabled") public static class ContactsContract.LocalSimContactsWriteException extends java.lang.IllegalArgumentException {













    ctor public ContactsContract.LocalSimContactsWriteException(@NonNull String);













  }



























  public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns {















    field public static final android.net.Uri CONTENT_FILTER_URI;















    field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI;

























core/api/system-current.txt



+2
−2






























Original line number
Diff line number
Diff line








@@ -7779,7 +7779,7 @@ package android.media {













  }





























  public final class MediaCas implements java.lang.AutoCloseable {













    method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceHolderRetain(boolean);













    method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceOwnershipRetention(boolean);















    method @FlaggedApi("android.media.tv.flags.mediacas_update_client_profile_priority") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public boolean updateResourcePriority(int, int);















  }
























@@ -8692,8 +8692,8 @@ package android.media.tv.tuner {













    method public int setLnaEnabled(boolean);















    method public int setMaxNumberOfFrontends(int, @IntRange(from=0) int);















    method public void setOnTuneEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.frontend.OnTuneEventListener);













    method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceHolderRetain(boolean);















    method public void setResourceLostListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.tuner.Tuner.OnResourceLostListener);













    method @FlaggedApi("android.media.tv.flags.set_resource_holder_retain") @RequiresPermission("android.permission.TUNER_RESOURCE_ACCESS") public void setResourceOwnershipRetention(boolean);















    method public void shareFrontendFromTuner(@NonNull android.media.tv.tuner.Tuner);















    method public int transferOwner(@NonNull android.media.tv.tuner.Tuner);















    method public int tune(@NonNull android.media.tv.tuner.frontend.FrontendSettings);

























core/java/android/app/IActivityManager.aidl



+10
−0






























Original line number
Diff line number
Diff line








@@ -1028,4 +1028,14 @@ interface IActivityManager {













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.DEVICE_POWER)")















    void noteAppRestrictionEnabled(in String packageName, int uid, int restrictionType,















            boolean enabled, int reason, in String subReason, int source, long threshold);



























    /**













     * Creates and returns a new IntentCreatorToken that keeps the creatorUid and refreshes key













     * fields of the intent passed in.













     *













     * @param intent The intent with key fields out of sync of the IntentCreatorToken it contains.













     * @hide













     */













    @EnforcePermission("INTERACT_ACROSS_USERS_FULL")













    IBinder refreshIntentCreatorToken(in Intent intent);















}
























core/java/android/app/Notification.java



+49
−18






























Original line number
Diff line number
Diff line








@@ -821,14 +821,14 @@ public class Notification implements Parcelable













                     R.layout.notification_2025_template_collapsed_call,















                     R.layout.notification_2025_template_expanded_call,















                     R.layout.notification_2025_template_collapsed_messaging,













                     R.layout.notification_2025_template_expanded_messaging,















                     R.layout.notification_2025_template_collapsed_media,













                     R.layout.notification_template_material_big_picture,













                     R.layout.notification_template_material_big_text,













                     R.layout.notification_template_material_inbox,













                     R.layout.notification_template_material_big_messaging,













                     R.layout.notification_template_material_big_media,













                     R.layout.notification_template_header -> true;













                case R.layout.notification_template_material_progress -> Flags.apiRichOngoing();













                     R.layout.notification_2025_template_expanded_media,













                     R.layout.notification_2025_template_expanded_big_picture,













                     R.layout.notification_2025_template_expanded_big_text,













                     R.layout.notification_2025_template_expanded_inbox -> true;













                case R.layout.notification_2025_template_expanded_progress













                        -> Flags.apiRichOngoing();















                default -> false;















            };















        }










@@ -5964,7 +5964,7 @@ public class Notification implements Parcelable



























        private static void setHeaderlessVerticalMargins(RemoteViews contentView,















                StandardTemplateParams p, boolean hasSecondLine) {













            if (!p.mHeaderless) {













            if (Flags.notificationsRedesignTemplates() || !p.mHeaderless) {















                return;















            }















            int marginDimen = hasSecondLine










@@ -6445,10 +6445,13 @@ public class Notification implements Parcelable













                // Clear view padding to allow buttons to start on the left edge.















                // This must be done before 'setEmphasizedMode' which sets top/bottom margins.















                big.setViewPadding(R.id.actions, 0, 0, 0, 0);













                // Add an optional indent that will make buttons start at the correct column when













                // there is enough space to do so (and fall back to the left edge if not).













                if (!Flags.notificationsRedesignTemplates()) {













                    // Add an optional indent that will make buttons start at the correct column













                    // when there is enough space to do so (and fall back to the left edge if not).













                    // This is handled directly in NotificationActionListLayout in the new design.















                    big.setInt(R.id.actions, "setCollapsibleIndentDimen",















                            R.dimen.call_notification_collapsible_indent);













                }















                if (evenlyDividedCallStyleActionLayout()) {















                    if (CallStyle.DEBUG_NEW_ACTION_LAYOUT) {















                        Log.d(TAG, "setting evenly divided mode on action list");










@@ -7561,16 +7564,28 @@ public class Notification implements Parcelable













        }





























        private int getBigPictureLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_big_picture;













            } else {















                return R.layout.notification_template_material_big_picture;















            }













        }





























        private int getBigTextLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_big_text;













            } else {















                return R.layout.notification_template_material_big_text;















            }













        }





























        private int getInboxLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_inbox;













            } else {















                return R.layout.notification_template_material_inbox;















            }













        }





























        private int getCollapsedMessagingLayoutResource() {















            if (Flags.notificationsRedesignTemplates()) {









@@ -7581,8 +7596,12 @@ public class Notification implements Parcelable













        }





























        private int getExpandedMessagingLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_messaging;













            } else {















                return R.layout.notification_template_material_big_messaging;















            }













        }





























        private int getCollapsedMediaLayoutResource() {















            if (Flags.notificationsRedesignTemplates()) {









@@ -7592,6 +7611,14 @@ public class Notification implements Parcelable













            }















        }



























        private int getExpandedMediaLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_media;













            } else {













                return R.layout.notification_template_material_big_media;













            }













        }



























        private int getConversationLayoutResource() {















            if (Flags.notificationsRedesignTemplates()) {















                return R.layout.notification_2025_template_conversation;









@@ -7617,8 +7644,12 @@ public class Notification implements Parcelable













        }





























        private int getProgressLayoutResource() {













            if (Flags.notificationsRedesignTemplates()) {













                return R.layout.notification_2025_template_expanded_progress;













            } else {















                return R.layout.notification_template_material_progress;















            }













        }





























        private int getActionLayoutResource() {















            return R.layout.notification_material_action;










@@ -10541,7 +10572,7 @@ public class Notification implements Parcelable













                    .fillTextsFrom(mBuilder);















            TemplateBindResult result = new TemplateBindResult();















            RemoteViews template = mBuilder.applyStandardTemplate(













                    R.layout.notification_template_material_big_media, p , result);













                    mBuilder.getExpandedMediaLayoutResource(), p , result);





























            for (int i = 0; i < MAX_MEDIA_BUTTONS; i++) {















                if (i < actionCount) {