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

Commit 5914de41 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7435440 from 9027059b to sc-release 

Change-Id: Iada1eb1fa34157128ade8b98b3bcd653f9640957
parents c4925caa 9027059b

core/java/android/app/IActivityManager.aidl

+8 −0
Original line number Original line Diff line number Diff line
@@ -685,6 +685,14 @@ interface IActivityManager { 
     */

     */

    boolean enableAppFreezer(in boolean enable);

    boolean enableAppFreezer(in boolean enable);





    /**

     * Suppress or reenable the rate limit on foreground service notification deferral.

     * This is for use within CTS and is protected by android.permission.WRITE_DEVICE_CONFIG.

     *

     * @param enable false to suppress rate-limit policy; true to reenable it.

     */

    boolean enableFgsNotificationRateLimit(in boolean enable);



    /**

    /**

     * Holds the AM lock for the specified amount of milliseconds.

     * Holds the AM lock for the specified amount of milliseconds.

     * This is intended for use by the tests that need to imitate lock contention.

     * This is intended for use by the tests that need to imitate lock contention.

core/java/android/net/vcn/VcnGatewayConnectionConfig.java

+0 −93
Original line number Original line Diff line number Diff line
@@ -166,9 +166,6 @@ public final class VcnGatewayConnectionConfig { 
    private static final String EXPOSED_CAPABILITIES_KEY = "mExposedCapabilities";

    private static final String EXPOSED_CAPABILITIES_KEY = "mExposedCapabilities";

    @NonNull private final SortedSet<Integer> mExposedCapabilities;

    @NonNull private final SortedSet<Integer> mExposedCapabilities;





    private static final String UNDERLYING_CAPABILITIES_KEY = "mUnderlyingCapabilities";

    @NonNull private final SortedSet<Integer> mUnderlyingCapabilities;



    private static final String MAX_MTU_KEY = "mMaxMtu";

    private static final String MAX_MTU_KEY = "mMaxMtu";

    private final int mMaxMtu;

    private final int mMaxMtu;
@@ -180,13 +177,11 @@ public final class VcnGatewayConnectionConfig { 
            @NonNull String gatewayConnectionName,

            @NonNull String gatewayConnectionName,

            @NonNull IkeTunnelConnectionParams tunnelConnectionParams,

            @NonNull IkeTunnelConnectionParams tunnelConnectionParams,

            @NonNull Set<Integer> exposedCapabilities,

            @NonNull Set<Integer> exposedCapabilities,

            @NonNull Set<Integer> underlyingCapabilities,

            @NonNull long[] retryIntervalsMs,

            @NonNull long[] retryIntervalsMs,

            @IntRange(from = MIN_MTU_V6) int maxMtu) {

            @IntRange(from = MIN_MTU_V6) int maxMtu) {

        mGatewayConnectionName = gatewayConnectionName;

        mGatewayConnectionName = gatewayConnectionName;

        mTunnelConnectionParams = tunnelConnectionParams;

        mTunnelConnectionParams = tunnelConnectionParams;

        mExposedCapabilities = new TreeSet(exposedCapabilities);

        mExposedCapabilities = new TreeSet(exposedCapabilities);

        mUnderlyingCapabilities = new TreeSet(underlyingCapabilities);

        mRetryIntervalsMs = retryIntervalsMs;

        mRetryIntervalsMs = retryIntervalsMs;

        mMaxMtu = maxMtu;

        mMaxMtu = maxMtu;
@@ -203,16 +198,12 @@ public final class VcnGatewayConnectionConfig { 




        final PersistableBundle exposedCapsBundle =

        final PersistableBundle exposedCapsBundle =

                in.getPersistableBundle(EXPOSED_CAPABILITIES_KEY);

                in.getPersistableBundle(EXPOSED_CAPABILITIES_KEY);

        final PersistableBundle underlyingCapsBundle =

                in.getPersistableBundle(UNDERLYING_CAPABILITIES_KEY);





        mGatewayConnectionName = in.getString(GATEWAY_CONNECTION_NAME_KEY);

        mGatewayConnectionName = in.getString(GATEWAY_CONNECTION_NAME_KEY);

        mTunnelConnectionParams =

        mTunnelConnectionParams =

                TunnelConnectionParamsUtils.fromPersistableBundle(tunnelConnectionParamsBundle);

                TunnelConnectionParamsUtils.fromPersistableBundle(tunnelConnectionParamsBundle);

        mExposedCapabilities = new TreeSet<>(PersistableBundleUtils.toList(

        mExposedCapabilities = new TreeSet<>(PersistableBundleUtils.toList(

                exposedCapsBundle, PersistableBundleUtils.INTEGER_DESERIALIZER));

                exposedCapsBundle, PersistableBundleUtils.INTEGER_DESERIALIZER));

        mUnderlyingCapabilities = new TreeSet<>(PersistableBundleUtils.toList(

                underlyingCapsBundle, PersistableBundleUtils.INTEGER_DESERIALIZER));

        mRetryIntervalsMs = in.getLongArray(RETRY_INTERVAL_MS_KEY);

        mRetryIntervalsMs = in.getLongArray(RETRY_INTERVAL_MS_KEY);

        mMaxMtu = in.getInt(MAX_MTU_KEY);

        mMaxMtu = in.getInt(MAX_MTU_KEY);
@@ -311,36 +302,6 @@ public final class VcnGatewayConnectionConfig { 
        return Collections.unmodifiableSet(mExposedCapabilities);

        return Collections.unmodifiableSet(mExposedCapabilities);

    }

    }





    /**

     * Returns all capabilities required of underlying networks.

     *

     * <p>The returned integer-value capabilities will be sorted in ascending numerical order.

     *

     * @see Builder#addRequiredUnderlyingCapability(int)

     * @see Builder#removeRequiredUnderlyingCapability(int)

     * @hide

     */

    // TODO(b/182219992): Remove, and add when per-transport capabilities are supported

    @NonNull

    public int[] getRequiredUnderlyingCapabilities() {

        // Sorted set guarantees ordering

        return ArrayUtils.convertToIntArray(new ArrayList<>(mUnderlyingCapabilities));

    }



    /**

     * Returns all capabilities required of underlying networks.

     *

     * <p>Left to prevent the need to make major changes while changes are actively in flight.

     *

     * @deprecated use getRequiredUnderlyingCapabilities() instead

     * @hide

     */

    @Deprecated

    @NonNull

    public Set<Integer> getAllUnderlyingCapabilities() {

        return Collections.unmodifiableSet(mUnderlyingCapabilities);

    }



    /**

    /**

     * Retrieves the configured retry intervals.

     * Retrieves the configured retry intervals.

     *

     *
@@ -377,15 +338,10 @@ public final class VcnGatewayConnectionConfig { 
                PersistableBundleUtils.fromList(

                PersistableBundleUtils.fromList(

                        new ArrayList<>(mExposedCapabilities),

                        new ArrayList<>(mExposedCapabilities),

                        PersistableBundleUtils.INTEGER_SERIALIZER);

                        PersistableBundleUtils.INTEGER_SERIALIZER);

        final PersistableBundle underlyingCapsBundle =

                PersistableBundleUtils.fromList(

                        new ArrayList<>(mUnderlyingCapabilities),

                        PersistableBundleUtils.INTEGER_SERIALIZER);





        result.putString(GATEWAY_CONNECTION_NAME_KEY, mGatewayConnectionName);

        result.putString(GATEWAY_CONNECTION_NAME_KEY, mGatewayConnectionName);

        result.putPersistableBundle(TUNNEL_CONNECTION_PARAMS_KEY, tunnelConnectionParamsBundle);

        result.putPersistableBundle(TUNNEL_CONNECTION_PARAMS_KEY, tunnelConnectionParamsBundle);

        result.putPersistableBundle(EXPOSED_CAPABILITIES_KEY, exposedCapsBundle);

        result.putPersistableBundle(EXPOSED_CAPABILITIES_KEY, exposedCapsBundle);

        result.putPersistableBundle(UNDERLYING_CAPABILITIES_KEY, underlyingCapsBundle);

        result.putLongArray(RETRY_INTERVAL_MS_KEY, mRetryIntervalsMs);

        result.putLongArray(RETRY_INTERVAL_MS_KEY, mRetryIntervalsMs);

        result.putInt(MAX_MTU_KEY, mMaxMtu);

        result.putInt(MAX_MTU_KEY, mMaxMtu);
@@ -397,7 +353,6 @@ public final class VcnGatewayConnectionConfig { 
        return Objects.hash(

        return Objects.hash(

                mGatewayConnectionName,

                mGatewayConnectionName,

                mExposedCapabilities,

                mExposedCapabilities,

                mUnderlyingCapabilities,

                Arrays.hashCode(mRetryIntervalsMs),

                Arrays.hashCode(mRetryIntervalsMs),

                mMaxMtu);

                mMaxMtu);

    }

    }
@@ -411,7 +366,6 @@ public final class VcnGatewayConnectionConfig { 
        final VcnGatewayConnectionConfig rhs = (VcnGatewayConnectionConfig) other;

        final VcnGatewayConnectionConfig rhs = (VcnGatewayConnectionConfig) other;

        return mGatewayConnectionName.equals(rhs.mGatewayConnectionName)

        return mGatewayConnectionName.equals(rhs.mGatewayConnectionName)

                && mExposedCapabilities.equals(rhs.mExposedCapabilities)

                && mExposedCapabilities.equals(rhs.mExposedCapabilities)

                && mUnderlyingCapabilities.equals(rhs.mUnderlyingCapabilities)

                && Arrays.equals(mRetryIntervalsMs, rhs.mRetryIntervalsMs)

                && Arrays.equals(mRetryIntervalsMs, rhs.mRetryIntervalsMs)

                && mMaxMtu == rhs.mMaxMtu;

                && mMaxMtu == rhs.mMaxMtu;

    }

    }
@@ -423,7 +377,6 @@ public final class VcnGatewayConnectionConfig { 
        @NonNull private final String mGatewayConnectionName;

        @NonNull private final String mGatewayConnectionName;

        @NonNull private final IkeTunnelConnectionParams mTunnelConnectionParams;

        @NonNull private final IkeTunnelConnectionParams mTunnelConnectionParams;

        @NonNull private final Set<Integer> mExposedCapabilities = new ArraySet();

        @NonNull private final Set<Integer> mExposedCapabilities = new ArraySet();

        @NonNull private final Set<Integer> mUnderlyingCapabilities = new ArraySet();

        @NonNull private long[] mRetryIntervalsMs = DEFAULT_RETRY_INTERVALS_MS;

        @NonNull private long[] mRetryIntervalsMs = DEFAULT_RETRY_INTERVALS_MS;

        private int mMaxMtu = DEFAULT_MAX_MTU;

        private int mMaxMtu = DEFAULT_MAX_MTU;
@@ -494,51 +447,6 @@ public final class VcnGatewayConnectionConfig { 
            return this;

            return this;

        }

        }





        /**

         * Require a capability for Networks underlying this VCN Gateway Connection.

         *

         * @param underlyingCapability the capability that a network MUST have in order to be an

         *     underlying network for this VCN Gateway Connection.

         * @return this {@link Builder} instance, for chaining

         * @see VcnGatewayConnectionConfig for a list of capabilities may be required of underlying

         *     networks

         * @hide

         */

        // TODO(b/182219992): Remove, and add when per-transport capabilities are supported

        @NonNull

        public Builder addRequiredUnderlyingCapability(

                @VcnSupportedCapability int underlyingCapability) {

            checkValidCapability(underlyingCapability);



            mUnderlyingCapabilities.add(underlyingCapability);

            return this;

        }



        /**

         * Remove a requirement of a capability for Networks underlying this VCN Gateway Connection.

         *

         * <p>Calling this method will allow Networks that do NOT have this capability to be

         * selected as an underlying network for this VCN Gateway Connection. However, underlying

         * networks MAY still have the removed capability.

         *

         * @param underlyingCapability the capability that a network DOES NOT need to have in order

         *     to be an underlying network for this VCN Gateway Connection.

         * @return this {@link Builder} instance, for chaining

         * @see VcnGatewayConnectionConfig for a list of capabilities may be required of underlying

         *     networks

         * @hide

         */

        // TODO(b/182219992): Remove, and add when per-transport capabilities are supported

        @NonNull

        @SuppressLint("BuilderSetStyle") // For consistency with NetCaps.Builder add/removeCap

        public Builder removeRequiredUnderlyingCapability(

                @VcnSupportedCapability int underlyingCapability) {

            checkValidCapability(underlyingCapability);



            mUnderlyingCapabilities.remove(underlyingCapability);

            return this;

        }



        /**

        /**

         * Set the retry interval between VCN establishment attempts upon successive failures.

         * Set the retry interval between VCN establishment attempts upon successive failures.

         *

         *
@@ -603,7 +511,6 @@ public final class VcnGatewayConnectionConfig { 
                    mGatewayConnectionName,

                    mGatewayConnectionName,

                    mTunnelConnectionParams,

                    mTunnelConnectionParams,

                    mExposedCapabilities,

                    mExposedCapabilities,

                    mUnderlyingCapabilities,

                    mRetryIntervalsMs,

                    mRetryIntervalsMs,

                    mMaxMtu);

                    mMaxMtu);

        }

        }

core/java/android/service/wallpaper/WallpaperService.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -1764,6 +1764,7 @@ public abstract class WallpaperService extends Service { 
                float finalStep = step;

                float finalStep = step;

                int finalPageIndx = pageIndx;

                int finalPageIndx = pageIndx;

                Bitmap screenShot = page.getBitmap();

                Bitmap screenShot = page.getBitmap();

                if (screenShot == null) screenShot = mLastScreenshot;

                if (screenShot == null || screenShot.isRecycled()) {

                if (screenShot == null || screenShot.isRecycled()) {

                    if (DEBUG) {

                    if (DEBUG) {

                        Log.d(TAG, "invalid bitmap " + screenShot

                        Log.d(TAG, "invalid bitmap " + screenShot

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -1866,8 +1866,7 @@ 
    <string name="package_updated_device_owner" msgid="7560272363805506941">"Opgedateer deur jou administrateur"</string>

    <string name="package_updated_device_owner" msgid="7560272363805506941">"Opgedateer deur jou administrateur"</string>

    <string name="package_deleted_device_owner" msgid="2292335928930293023">"Uitgevee deur jou administrateur"</string>

    <string name="package_deleted_device_owner" msgid="2292335928930293023">"Uitgevee deur jou administrateur"</string>

    <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string>

    <string name="confirm_battery_saver" msgid="5247976246208245754">"OK"</string>

    <!-- no translation found for battery_saver_description_with_learn_more (5444908404021316250) -->

    <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"Batterybespaarder skakel Donkertema aan en beperk of skakel agtergrondaktiwiteit, sommige visuele effekte, sekere kenmerke en sommige netwerkverbindings af"</string>

    <skip />

    <string name="battery_saver_description" msgid="8518809702138617167">"Batterybespaarder skakel Donkertema aan en beperk of skakel agtergrondaktiwiteit, sommige visuele effekte, sekere kenmerke en sommige netwerkverbindings af"</string>

    <string name="battery_saver_description" msgid="8518809702138617167">"Batterybespaarder skakel Donkertema aan en beperk of skakel agtergrondaktiwiteit, sommige visuele effekte, sekere kenmerke en sommige netwerkverbindings af"</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Databespaarder verhoed sommige programme om data in die agtergrond te stuur of te aanvaar om datagebruik te help verminder. \'n Program wat jy tans gebruik kan by data ingaan, maar sal dit dalk minder gereeld doen. Dit kan byvoorbeeld beteken dat prente nie wys voordat jy op hulle tik nie."</string>

    <string name="data_saver_description" msgid="4995164271550590517">"Databespaarder verhoed sommige programme om data in die agtergrond te stuur of te aanvaar om datagebruik te help verminder. \'n Program wat jy tans gebruik kan by data ingaan, maar sal dit dalk minder gereeld doen. Dit kan byvoorbeeld beteken dat prente nie wys voordat jy op hulle tik nie."</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"Skakel Databespaarder aan?"</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"Skakel Databespaarder aan?"</string>

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -1866,8 +1866,7 @@ 
    <string name="package_updated_device_owner" msgid="7560272363805506941">"በእርስዎ አስተዳዳሪ ተዘምኗል"</string>

    <string name="package_updated_device_owner" msgid="7560272363805506941">"በእርስዎ አስተዳዳሪ ተዘምኗል"</string>

    <string name="package_deleted_device_owner" msgid="2292335928930293023">"በእርስዎ አስተዳዳሪ ተሰርዟል"</string>

    <string name="package_deleted_device_owner" msgid="2292335928930293023">"በእርስዎ አስተዳዳሪ ተሰርዟል"</string>

    <string name="confirm_battery_saver" msgid="5247976246208245754">"እሺ"</string>

    <string name="confirm_battery_saver" msgid="5247976246208245754">"እሺ"</string>

    <!-- no translation found for battery_saver_description_with_learn_more (5444908404021316250) -->

    <string name="battery_saver_description_with_learn_more" msgid="5444908404021316250">"ባትሪ ቆጣቢ ጠቆር ያለ ገጽታን ያበራል እና የጀርባ እንቅስቃሴን፣ አንዳንድ ዕይታዊ ውጤቶችን፣ አንዳንድ ባህሪዎችን፣ እና አንዳንድ የአውታረ መረብ ግንኙነቶችን ይገድባል ወይም ያጠፋል።"</string>

    <skip />

    <string name="battery_saver_description" msgid="8518809702138617167">"ባትሪ ቆጣቢ ጠቆር ያለ ገጽታን ያበራል እና የጀርባ እንቅስቃሴን፣ አንዳንድ ዕይታዊ ውጤቶችን፣ አንዳንድ ባህሪዎችን፣ እና አንዳንድ የአውታረ መረብ ግንኙነቶችን ይገድባል ወይም ያጠፋል።"</string>

    <string name="battery_saver_description" msgid="8518809702138617167">"ባትሪ ቆጣቢ ጠቆር ያለ ገጽታን ያበራል እና የጀርባ እንቅስቃሴን፣ አንዳንድ ዕይታዊ ውጤቶችን፣ አንዳንድ ባህሪዎችን፣ እና አንዳንድ የአውታረ መረብ ግንኙነቶችን ይገድባል ወይም ያጠፋል።"</string>

    <string name="data_saver_description" msgid="4995164271550590517">"የውሂብ አጠቃቀም እንዲቀንስ ለማገዝ ውሂብ ቆጣቢ አንዳንድ መተግበሪያዎች ከበስተጀርባ ሆነው ውሂብ እንዳይልኩ ወይም እንዳይቀበሉ ይከለክላቸዋል። በአሁኑ ጊዜ እየተጠቀሙበት ያለ መተግበሪያ ውሂብ ሊደርስ ይችላል፣ ነገር ግን ባነሰ ተደጋጋሚነት ሊሆን ይችላል። ይሄ ማለት ለምሳሌ ምስሎችን መታ እስኪያደርጓቸው ድረስ ላይታዩ ይችላሉ ማለት ነው።"</string>

    <string name="data_saver_description" msgid="4995164271550590517">"የውሂብ አጠቃቀም እንዲቀንስ ለማገዝ ውሂብ ቆጣቢ አንዳንድ መተግበሪያዎች ከበስተጀርባ ሆነው ውሂብ እንዳይልኩ ወይም እንዳይቀበሉ ይከለክላቸዋል። በአሁኑ ጊዜ እየተጠቀሙበት ያለ መተግበሪያ ውሂብ ሊደርስ ይችላል፣ ነገር ግን ባነሰ ተደጋጋሚነት ሊሆን ይችላል። ይሄ ማለት ለምሳሌ ምስሎችን መታ እስኪያደርጓቸው ድረስ ላይታዩ ይችላሉ ማለት ነው።"</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"ውሂብ ቆጣቢ ይጥፋ?"</string>

    <string name="data_saver_enable_title" msgid="7080620065745260137">"ውሂብ ቆጣቢ ይጥፋ?"</string>