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

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

Snap for 12710726 from b5664e8e to 25Q1-release 

Change-Id: Ida07a2b7435be619d13c6f37796bfba715c05398
parents 2d58a336 b5664e8e

AconfigFlags.bp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ aconfig_declarations_group { 
        "aconfig_mediacodec_flags_java_lib",

        "aconfig_settingslib_flags_java_lib",

        "aconfig_trade_in_mode_flags_java_lib",

        "android-sdk-flags-java",

        "android.adaptiveauth.flags-aconfig-java",

        "android.app.appfunctions.flags-aconfig-java",

        "android.app.assist.flags-aconfig-java",
@@ -63,6 +62,7 @@ aconfig_declarations_group { 
        "android.os.vibrator.flags-aconfig-java",

        "android.permission.flags-aconfig-java",

        "android.provider.flags-aconfig-java",

        "android.sdk.flags-aconfig-java",

        "android.security.flags-aconfig-java",

        "android.server.app.flags-aconfig-java",

        "android.service.autofill.flags-aconfig-java",

android-sdk-flags/Android.bp

+10 −3
Original line number Diff line number Diff line
@@ -17,14 +17,21 @@ package { 
}



aconfig_declarations {

    name: "android-sdk-flags",

    name: "android.sdk.flags-aconfig",

    package: "android.sdk",

    container: "system",

    srcs: ["flags.aconfig"],

}



java_aconfig_library {

    name: "android-sdk-flags-java",

    aconfig_declarations: "android-sdk-flags",

    name: "android.sdk.flags-aconfig-java",

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

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

}



java_aconfig_library {

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

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

    host_supported: true,

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

}

core/api/current.txt

+5 −4
Original line number Diff line number Diff line
@@ -1203,6 +1203,7 @@ package android { 
    field public static final int minResizeHeight = 16843670; // 0x1010396

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field @FlaggedApi("android.content.pm.support_minor_versions_in_minsdkversion") public static final int minSdkVersionFull;

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e
@@ -10089,10 +10090,10 @@ package android.companion { 
    method @FlaggedApi("android.companion.unpair_associated_device") @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeBond(int);

    method public void requestNotificationAccess(android.content.ComponentName);

    method @FlaggedApi("android.companion.association_tag") public void setAssociationTag(int, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @Deprecated @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    method public void startSystemDataTransfer(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.companion.CompanionException>) throws android.companion.DeviceNotAssociatedException;

    method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @Deprecated @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;

    method @FlaggedApi("android.companion.device_presence") @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull android.companion.ObservingDevicePresenceRequest);

    field public static final String EXTRA_ASSOCIATION = "android.companion.extra.ASSOCIATION";

    field @Deprecated public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";
@@ -10120,9 +10121,9 @@ package android.companion { 
    method @RequiresPermission(android.Manifest.permission.DELIVER_COMPANION_MESSAGES) public final void detachSystemDataTransport(int) throws android.companion.DeviceNotAssociatedException;

    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);

    method @Deprecated @MainThread public void onDeviceAppeared(@NonNull String);

    method @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);

    method @Deprecated @FlaggedApi("android.companion.device_presence") @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);

    method @Deprecated @MainThread public void onDeviceDisappeared(@NonNull String);

    method @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);

    method @Deprecated @FlaggedApi("android.companion.device_presence") @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);

    method @FlaggedApi("android.companion.device_presence") @MainThread public void onDevicePresenceEvent(@NonNull android.companion.DevicePresenceEvent);

    field public static final String SERVICE_INTERFACE = "android.companion.CompanionDeviceService";

  }

core/api/test-current.txt

+11 −0
Original line number Diff line number Diff line
@@ -541,7 +541,9 @@ package android.app { 
    method @Nullable public android.graphics.Rect peekBitmapDimensions();

    method @Nullable public android.graphics.Rect peekBitmapDimensions(int);

    method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithCrops(@Nullable android.graphics.Bitmap, @NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>, boolean, int) throws java.io.IOException;

    method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithDescription(@Nullable android.graphics.Bitmap, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;

    method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithCrops(@NonNull java.io.InputStream, @NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>, boolean, int) throws java.io.IOException;

    method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull java.io.InputStream, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException;

    method public void setWallpaperZoomOut(@NonNull android.os.IBinder, float);

    method public boolean shouldEnableWideColorGamut();

    method public boolean wallpaperSupportsWcg(int);
@@ -907,6 +909,15 @@ package android.app.usage { 


}



package android.app.wallpaper {



  public static final class WallpaperDescription.Builder {

    method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setCropHints(@NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>);

    method @NonNull public android.app.wallpaper.WallpaperDescription.Builder setCropHints(@NonNull android.util.SparseArray<android.graphics.Rect>);

  }



}



package android.appwidget {



  public class AppWidgetManager {

core/java/android/app/BroadcastStickyCache.java

0 → 100644
+215 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.app;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.content.Context.RegisterReceiverFlags;

import android.content.Intent;

import android.content.IntentFilter;

import android.hardware.usb.UsbManager;

import android.media.AudioManager;

import android.net.ConnectivityManager;

import android.net.TetheringManager;

import android.net.nsd.NsdManager;

import android.net.wifi.WifiManager;

import android.net.wifi.p2p.WifiP2pManager;

import android.os.IpcDataCache;

import android.os.IpcDataCache.Config;

import android.os.UpdateLock;

import android.telephony.TelephonyManager;

import android.util.ArrayMap;

import android.view.WindowManagerPolicyConstants;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;



/** @hide */

public class BroadcastStickyCache {



    @VisibleForTesting

    public static final String[] STICKY_BROADCAST_ACTIONS = {

            AudioManager.ACTION_HDMI_AUDIO_PLUG,

            AudioManager.ACTION_HEADSET_PLUG,

            AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED,

            AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED,

            AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION,

            AudioManager.RINGER_MODE_CHANGED_ACTION,

            ConnectivityManager.CONNECTIVITY_ACTION,

            Intent.ACTION_BATTERY_CHANGED,

            Intent.ACTION_DEVICE_STORAGE_FULL,

            Intent.ACTION_DEVICE_STORAGE_LOW,

            Intent.ACTION_SIM_STATE_CHANGED,

            NsdManager.ACTION_NSD_STATE_CHANGED,

            TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED,

            TetheringManager.ACTION_TETHER_STATE_CHANGED,

            UpdateLock.UPDATE_LOCK_CHANGED,

            UsbManager.ACTION_USB_STATE,

            WifiManager.ACTION_WIFI_SCAN_AVAILABILITY_CHANGED,

            WifiManager.NETWORK_STATE_CHANGED_ACTION,

            WifiManager.SUPPLICANT_STATE_CHANGED_ACTION,

            WifiManager.WIFI_STATE_CHANGED_ACTION,

            WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION,

            WindowManagerPolicyConstants.ACTION_HDMI_PLUGGED,

            "android.net.conn.INET_CONDITION_ACTION" // ConnectivityManager.INET_CONDITION_ACTION

    };



    @VisibleForTesting

    public static final ArrayMap<String, String> sActionApiNameMap = new ArrayMap<>();



    private static final ArrayMap<String, IpcDataCache.Config> sActionConfigMap = new ArrayMap<>();



    private static final ArrayMap<StickyBroadcastFilter, IpcDataCache<Void, Intent>>

            sFilterCacheMap = new ArrayMap<>();



    static {

        sActionApiNameMap.put(AudioManager.ACTION_HDMI_AUDIO_PLUG, "hdmi_audio_plug");

        sActionApiNameMap.put(AudioManager.ACTION_HEADSET_PLUG, "headset_plug");

        sActionApiNameMap.put(AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED,

                "sco_audio_state_changed");

        sActionApiNameMap.put(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED,

                "action_sco_audio_state_updated");

        sActionApiNameMap.put(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION,

                "internal_ringer_mode_changed_action");

        sActionApiNameMap.put(AudioManager.RINGER_MODE_CHANGED_ACTION,

                "ringer_mode_changed");

        sActionApiNameMap.put(ConnectivityManager.CONNECTIVITY_ACTION,

                "connectivity_change");

        sActionApiNameMap.put(Intent.ACTION_BATTERY_CHANGED, "battery_changed");

        sActionApiNameMap.put(Intent.ACTION_DEVICE_STORAGE_FULL, "device_storage_full");

        sActionApiNameMap.put(Intent.ACTION_DEVICE_STORAGE_LOW, "device_storage_low");

        sActionApiNameMap.put(Intent.ACTION_SIM_STATE_CHANGED, "sim_state_changed");

        sActionApiNameMap.put(NsdManager.ACTION_NSD_STATE_CHANGED, "nsd_state_changed");

        sActionApiNameMap.put(TelephonyManager.ACTION_SERVICE_PROVIDERS_UPDATED,

                "service_providers_updated");

        sActionApiNameMap.put(TetheringManager.ACTION_TETHER_STATE_CHANGED,

                "tether_state_changed");

        sActionApiNameMap.put(UpdateLock.UPDATE_LOCK_CHANGED, "update_lock_changed");

        sActionApiNameMap.put(UsbManager.ACTION_USB_STATE, "usb_state");

        sActionApiNameMap.put(WifiManager.ACTION_WIFI_SCAN_AVAILABILITY_CHANGED,

                "wifi_scan_availability_changed");

        sActionApiNameMap.put(WifiManager.NETWORK_STATE_CHANGED_ACTION,

                "network_state_change");

        sActionApiNameMap.put(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION,

                "supplicant_state_change");

        sActionApiNameMap.put(WifiManager.WIFI_STATE_CHANGED_ACTION, "wifi_state_changed");

        sActionApiNameMap.put(

                WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION, "wifi_p2p_state_changed");

        sActionApiNameMap.put(

                WindowManagerPolicyConstants.ACTION_HDMI_PLUGGED, "hdmi_plugged");

        sActionApiNameMap.put(

                "android.net.conn.INET_CONDITION_ACTION", "inet_condition_action");

    }



    /**

     * Checks whether we can use caching for the given filter.

     */

    public static boolean useCache(@Nullable IntentFilter filter) {

        return Flags.useStickyBcastCache()

                && filter != null

                && filter.safeCountActions() == 1

                && ArrayUtils.contains(STICKY_BROADCAST_ACTIONS, filter.getAction(0));

    }



    public static void invalidateCache(@NonNull String action) {

        if (!Flags.useStickyBcastCache()

                || !ArrayUtils.contains(STICKY_BROADCAST_ACTIONS, action)) {

            return;

        }

        IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM,

                sActionApiNameMap.get(action));

    }



    public static void invalidateAllCaches() {

        for (int i = sActionApiNameMap.size() - 1; i >= 0; i--) {

            IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM,

                    sActionApiNameMap.valueAt(i));

        }

    }



    /**

     * Returns the cached {@link Intent} based on the filter, if exits otherwise

     * fetches the value from the service.

     */

    @Nullable

    public static Intent getIntent(

            @NonNull IApplicationThread applicationThread,

            @NonNull String mBasePackageName,

            @Nullable String attributionTag,

            @NonNull IntentFilter filter,

            @Nullable String broadcastPermission,

            @UserIdInt int userId,

            @RegisterReceiverFlags int flags) {

        IpcDataCache<Void, Intent> intentDataCache = findIpcDataCache(filter);



        if (intentDataCache == null) {

            final String action = filter.getAction(0);

            final StickyBroadcastFilter stickyBroadcastFilter =

                    new StickyBroadcastFilter(filter, action);

            final Config config = getConfig(action);



            intentDataCache =

                    new IpcDataCache<>(config,

                            (query) -> ActivityManager.getService().registerReceiverWithFeature(

                                    applicationThread,

                                    mBasePackageName,

                                    attributionTag,

                                    /* receiverId= */ "null",

                                    /* receiver= */ null,

                                    filter,

                                    broadcastPermission,

                                    userId,

                                    flags));

            sFilterCacheMap.put(stickyBroadcastFilter, intentDataCache);

        }

        return intentDataCache.query(null);

    }



    @VisibleForTesting

    public static void clearCacheForTest() {

        sFilterCacheMap.clear();

    }



    @Nullable

    private static IpcDataCache<Void, Intent> findIpcDataCache(

            @NonNull IntentFilter filter) {

        for (int i = sFilterCacheMap.size() - 1; i >= 0; i--) {

            StickyBroadcastFilter existingFilter = sFilterCacheMap.keyAt(i);

            if (filter.getAction(0).equals(existingFilter.action())

                    && IntentFilter.filterEquals(existingFilter.filter(), filter)) {

                return sFilterCacheMap.valueAt(i);

            }

        }

        return null;

    }



    @NonNull

    private static IpcDataCache.Config getConfig(@NonNull String action) {

        if (!sActionConfigMap.containsKey(action)) {

            // We only need 1 entry per cache but just to be on the safer side we are choosing 32

            // although we don't expect more than 1.

            sActionConfigMap.put(action,

                    new Config(32, IpcDataCache.MODULE_SYSTEM, sActionApiNameMap.get(action)));

        }



        return sActionConfigMap.get(action);

    }



    @VisibleForTesting

    private record StickyBroadcastFilter(@NonNull IntentFilter filter, @NonNull String action) {

    }

}