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

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

Snap for 9290907 from 6f9c9792 to tm-qpr2-release 

Change-Id: I7ab6f54384c99cae35e47c67c59693e6bd2e99c0
parents 57edcb76 6f9c9792

core/java/android/os/SystemVibrator.java

+15 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.hardware.vibrator.IVibrator;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Range;
@@ -313,8 +314,14 @@ public class SystemVibrator extends Vibrator { 
        private static final float EPSILON = 1e-5f;



        public MultiVibratorInfo(VibratorInfo[] vibrators) {

            // Need to use an extra constructor to share the computation in super initialization.

            this(vibrators, frequencyProfileIntersection(vibrators));

        }



        private MultiVibratorInfo(VibratorInfo[] vibrators,

                VibratorInfo.FrequencyProfile mergedProfile) {

            super(/* id= */ -1,

                    capabilitiesIntersection(vibrators),

                    capabilitiesIntersection(vibrators, mergedProfile.isEmpty()),

                    supportedEffectsIntersection(vibrators),

                    supportedBrakingIntersection(vibrators),

                    supportedPrimitivesAndDurationsIntersection(vibrators),
@@ -323,14 +330,19 @@ public class SystemVibrator extends Vibrator { 
                    integerLimitIntersection(vibrators, VibratorInfo::getPwlePrimitiveDurationMax),

                    integerLimitIntersection(vibrators, VibratorInfo::getPwleSizeMax),

                    floatPropertyIntersection(vibrators, VibratorInfo::getQFactor),

                    frequencyProfileIntersection(vibrators));

                    mergedProfile);

        }



        private static int capabilitiesIntersection(VibratorInfo[] infos) {

        private static int capabilitiesIntersection(VibratorInfo[] infos,

                boolean frequencyProfileIsEmpty) {

            int intersection = ~0;

            for (VibratorInfo info : infos) {

                intersection &= info.getCapabilities();

            }

            if (frequencyProfileIsEmpty) {

                // Revoke frequency control if the merged frequency profile ended up empty.

                intersection &= ~IVibrator.CAP_FREQUENCY_CONTROL;

            }

            return intersection;

        }

core/java/android/provider/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -18441,6 +18441,9 @@ public final class Settings { 
    /**

     * Activity Action: For system or preinstalled apps to show their {@link Activity} embedded

     * in Settings app on large screen devices.

     *

     * Developers should resolve the Intent action before using it.

     *

     * <p>

     *     Input: {@link #EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI} must be included to

     * specify the intent for the activity which will be embedded in Settings app.

core/java/com/android/internal/widget/RemeasuringLinearLayout.java

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.internal.widget; 


import android.annotation.Nullable;

import android.content.Context;

import android.os.Trace;

import android.util.AttributeSet;

import android.view.View;

import android.widget.LinearLayout;
@@ -55,7 +54,6 @@ public class RemeasuringLinearLayout extends LinearLayout { 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        Trace.beginSection("RemeasuringLinearLayout#onMeasure");

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        int count = getChildCount();

        int height = 0;
@@ -88,6 +86,5 @@ public class RemeasuringLinearLayout extends LinearLayout { 
        }

        mMatchParentViews.clear();

        setMeasuredDimension(getMeasuredWidth(), height);

        Trace.endSection();

    }

}

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1914,6 +1914,10 @@ 
    -->

    <string name="config_defaultCaptivePortalLoginPackageName" translatable="false">com.android.captiveportallogin</string>



    <!-- The package name of the dock manager app. Must be granted the

         POST_NOTIFICATIONS permission. -->

    <string name="config_defaultDockManagerPackageName" translatable="false"></string>



    <!-- Whether to enable geocoder overlay which allows geocoder to be replaced

         by an app at run-time. When disabled, only the

         config_geocoderProviderPackageName package will be searched for

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -3466,6 +3466,9 @@ 
  <!-- Captive Portal Login -->

  <java-symbol type="string" name="config_defaultCaptivePortalLoginPackageName" />



  <!-- Dock Manager -->

  <java-symbol type="string" name="config_defaultDockManagerPackageName" />



  <!-- Optional IPsec algorithms -->

  <java-symbol type="array" name="config_optionalIpSecAlgorithms" />