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

Commit 420c0bd1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7007636 from 18d29c0d to rvc-qpr2-release 

Change-Id: I29d59b14ea8dbbe666eb661839b8e56fd3549db3
parents b05fd5bf 18d29c0d

core/java/android/content/pm/PackageManager.java

+5 −0
Original line number Diff line number Diff line
@@ -92,6 +92,11 @@ import java.util.Set; 
 * packages that are currently installed on the device.

 *

 * You can find this class through {@link Context#getPackageManager}.

 *

 * <p class="note"><strong>Note: </strong>If your app targets Android 11 (API level 30) or

 * higher, the methods in this class each return a filtered list of apps. Learn more about how to

 * <a href="/training/basics/intents/package-visibility">manage package visibility</a>.

 * </p>

 */

public abstract class PackageManager {

    private static final String TAG = "PackageManager";

core/java/android/hardware/camera2/CameraDevice.java

+6 −6
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * @see StreamConfigurationMap#getOutputFormats()

     * @see StreamConfigurationMap#getOutputSizes(int)

     * @see StreamConfigurationMap#getOutputSizes(Class)

     * @deprecated Please use @{link

     * @deprecated Please use {@link

     *      #createCaptureSession(android.hardware.camera2.params.SessionConfiguration)} for the

     *      full set of configuration options available.

     */
@@ -250,7 +250,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     *

     * @see #createCaptureSession

     * @see OutputConfiguration

     * @deprecated Please use @{link

     * @deprecated Please use {@link

     *      #createCaptureSession(android.hardware.camera2.params.SessionConfiguration)} for the

     *      full set of configuration options available.

     */
@@ -286,7 +286,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * @see StreamConfigurationMap#getOutputSizes

     * @see android.media.ImageWriter

     * @see android.media.ImageReader

     * @deprecated Please use @{link

     * @deprecated Please use {@link

     *      #createCaptureSession(android.hardware.camera2.params.SessionConfiguration)} for the

     *      full set of configuration options available.

     */
@@ -303,7 +303,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     *

     * @see #createReprocessableCaptureSession

     * @see OutputConfiguration

     * @deprecated Please use @{link

     * @deprecated Please use {@link

     *      #createCaptureSession(android.hardware.camera2.params.SessionConfiguration)} for the

     *      full set of configuration options available.

     */
@@ -341,7 +341,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * @see CameraCaptureSession#captureBurst

     * @see CameraCaptureSession#setRepeatingBurst

     * @see CameraConstrainedHighSpeedCaptureSession#createHighSpeedRequestList

     * @deprecated Please use @{link

     * @deprecated Please use {@link

     *      #createCaptureSession(android.hardware.camera2.params.SessionConfiguration)} for the

     *      full set of configuration options available.

     */
@@ -417,7 +417,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * @see #createReprocessableCaptureSession

     * @see CameraCaptureSession

     * @see OutputConfiguration

     * @deprecated Please use @{link

     * @deprecated Please use {@link

     *      #createCaptureSession(android.hardware.camera2.params.SessionConfiguration)} for the

     *      full set of configuration options available.

     * @hide

core/java/android/hardware/display/DisplayManager.java

+47 −8
Original line number Diff line number Diff line
@@ -875,37 +875,76 @@ public final class DisplayManager { 
    public interface DeviceConfig {



        /**

         * Key for refresh rate in the zone defined by thresholds.

         * Key for refresh rate in the low zone defined by thresholds.

         *

         * Note that the name and value don't match because they were added before we had a high

         * zone to consider.

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.integer#config_defaultZoneBehavior

         */

        String KEY_REFRESH_RATE_IN_ZONE = "refresh_rate_in_zone";

        String KEY_REFRESH_RATE_IN_LOW_ZONE = "refresh_rate_in_zone";



        /**

         * Key for accessing the display brightness thresholds for the configured refresh rate zone.

         * Key for accessing the low display brightness thresholds for the configured refresh

         * rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).

         *

         * Note that the name and value don't match because they were added before we had a high

         * zone to consider.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_brightnessThresholdsOfPeakRefreshRate

         * @hide

         */

        String KEY_PEAK_REFRESH_RATE_DISPLAY_BRIGHTNESS_THRESHOLDS =

        String KEY_FIXED_REFRESH_RATE_LOW_DISPLAY_BRIGHTNESS_THRESHOLDS =

                "peak_refresh_rate_brightness_thresholds";



        /**

         * Key for accessing the ambient brightness thresholds for the configured refresh rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in lux.

         * Key for accessing the low ambient brightness thresholds for the configured refresh

         * rate zone. The value will be a pair of comma separated integers representing the minimum

         * and maximum thresholds of the zone, respectively, in lux.

         *

         * Note that the name and value don't match because they were added before we had a high

         * zone to consider.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_ambientThresholdsOfPeakRefreshRate

         * @hide

         */

        String KEY_PEAK_REFRESH_RATE_AMBIENT_BRIGHTNESS_THRESHOLDS =

        String KEY_FIXED_REFRESH_RATE_LOW_AMBIENT_BRIGHTNESS_THRESHOLDS =

                "peak_refresh_rate_ambient_thresholds";

        /**

         * Key for refresh rate in the high zone defined by thresholds.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.integer#config_fixedRefreshRateInHighZone

         */

        String KEY_REFRESH_RATE_IN_HIGH_ZONE = "refresh_rate_in_high_zone";



        /**

         * Key for accessing the display brightness thresholds for the configured refresh rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in display backlight units (i.e. [0, 255]).

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_brightnessHighThresholdsOfFixedRefreshRate

         * @hide

         */

        String KEY_FIXED_REFRESH_RATE_HIGH_DISPLAY_BRIGHTNESS_THRESHOLDS =

                "fixed_refresh_rate_high_display_brightness_thresholds";



        /**

         * Key for accessing the ambient brightness thresholds for the configured refresh rate zone.

         * The value will be a pair of comma separated integers representing the minimum and maximum

         * thresholds of the zone, respectively, in lux.

         *

         * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER

         * @see android.R.array#config_ambientHighThresholdsOfFixedRefreshRate

         * @hide

         */

        String KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS =

                "fixed_refresh_rate_high_ambient_brightness_thresholds";

        /**

         * Key for default peak refresh rate

         *

core/proto/android/app/settings_enums.proto

+3 −0
Original line number Diff line number Diff line
@@ -2688,4 +2688,7 @@ enum PageId { 
    // CATEGORY: SETTINGS

    // OS: R QPR

    ADAPTIVE_CONNECTIVITY_CATEGORY = 1850;



    // OS: R QPR2

    BLUETOOTH_PAIRING_RECEIVER = 1851;

}

core/res/res/values-ca/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1792,8 +1792,8 @@ 
    <string name="package_updated_device_owner" msgid="7560272363805506941">"Actualitzat per l\'administrador"</string>

    <string name="package_deleted_device_owner" msgid="2292335928930293023">"Suprimit per l\'administrador"</string>

    <string name="confirm_battery_saver" msgid="5247976246208245754">"D\'acord"</string>

    <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Per allargar la durada de la bateria, la funció Estalvi de bateria fa el següent:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\".\n\n"<annotation id="url">"Més informació"</annotation></string>

    <string name="battery_saver_description" msgid="6794188153647295212">"Per allargar la durada de la bateria, la funció Estalvi de bateria fa el següent:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\"."</string>

    <string name="battery_saver_description_with_learn_more" msgid="4424488535318105801">"Per allargar la durada de la bateria, la funció Estalvi de bateria:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\".\n\n"<annotation id="url">"Més informació"</annotation></string>

    <string name="battery_saver_description" msgid="6794188153647295212">"Per allargar la durada de la bateria, la funció Estalvi de bateria:\n\n• Activa el tema fosc.\n• Desactiva o restringeix l\'activitat en segon pla, alguns efectes visuals i altres funcions com \"Ok Google\"."</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Per reduir l\'ús de dades, la funció Economitzador de dades evita que determinades aplicacions enviïn o rebin dades en segon pla. L\'aplicació que estiguis fent servir podrà accedir a les dades, però menys sovint. Això vol dir, per exemple, que les imatges no es mostraran fins que no les toquis."</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"Activar l\'Economitzador de dades?"</string>

    <string name="data_saver_enable_button" msgid="4399405762586419726">"Activa"</string>