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

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

Snap for 8972412 from 7811c2b7 to tm-qpr1-release 

Change-Id: I27913a4e43ca010a8f1691529783d7c100161bd9
parents da349ce9 7811c2b7

core/java/android/attention/AttentionManagerInternal.java

+2 −2
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ public abstract class AttentionManagerInternal { 
    }



    /** Internal interface for proximity callback. */

    public abstract static class ProximityUpdateCallbackInternal {

    public interface ProximityUpdateCallbackInternal {

        /**

         * @param distance the estimated distance of the user (in meter)

         * The distance will be PROXIMITY_UNKNOWN if the proximity sensing was inconclusive.

         */

        public abstract void onProximityUpdate(double distance);

        void onProximityUpdate(double distance);

    }

}

core/java/android/hardware/soundtrigger/SoundTrigger.java

+1 −10
Original line number Diff line number Diff line
@@ -1963,7 +1963,6 @@ public class SoundTrigger { 
    }



    private static Object mServiceLock = new Object();

    private static ISoundTriggerMiddlewareService mService;



    /**

     * Translate an exception thrown from interaction with the underlying service to an error code.
@@ -2217,20 +2216,12 @@ public class SoundTrigger { 
                    binder =

                            ServiceManager.getServiceOrThrow(

                                    Context.SOUND_TRIGGER_MIDDLEWARE_SERVICE);

                    binder.linkToDeath(() -> {

                        synchronized (mServiceLock) {

                            mService = null;

                        }

                    }, 0);

                    mService = ISoundTriggerMiddlewareService.Stub.asInterface(binder);

                    break;

                    return ISoundTriggerMiddlewareService.Stub.asInterface(binder);

                } catch (Exception e) {

                    Log.e(TAG, "Failed to bind to soundtrigger service", e);

                }

            }

            return  mService;

        }



    }



    /**

core/java/android/service/voice/HotwordDetectedResult.java

+53 −4
Original line number Diff line number Diff line
@@ -95,6 +95,16 @@ public final class HotwordDetectedResult implements Parcelable { 
    /** Limits the max value for the triggered audio channel. */

    private static final int LIMIT_AUDIO_CHANNEL_MAX_VALUE = 63;



    /**

     * The bundle key for proximity value

     *

     * TODO(b/238896013): Move the proximity logic out of bundle to proper API.

     *

     * @hide

     */

    public static final String EXTRA_PROXIMITY_METERS =

            "android.service.voice.extra.PROXIMITY_METERS";



    /** Confidence level in the trigger outcome. */

    @HotwordConfidenceLevelValue

    private final int mConfidenceLevel;
@@ -197,6 +207,14 @@ public final class HotwordDetectedResult implements Parcelable { 
     * <p>The use of this method is discouraged, and support for it will be removed in future

     * versions of Android.

     *

     * <p>After the trigger happens, a special case of proximity-related extra, with the key of

     * 'android.service.voice.extra.PROXIMITY_METERS' and the value of distance in meters (double),

     * will be stored to enable proximity logic. The proximity meters is provided by the system,

     * on devices that support detecting proximity of nearby users, to help disambiguate which

     * nearby device should respond. When the proximity is unknown, the proximity value will not

     * be stored. This mapping will be excluded from the max bundle size calculation because this

     * mapping is included after the result is returned from the hotword detector service.

     *

     * <p>This is a PersistableBundle so it doesn't allow any remotable objects or other contents

     * that can be used to communicate with other processes.

     */
@@ -315,8 +333,23 @@ public final class HotwordDetectedResult implements Parcelable { 
                    "audioChannel");

        }

        if (!mExtras.isEmpty()) {

            Preconditions.checkArgumentInRange(getParcelableSize(mExtras), 0, getMaxBundleSize(),

                    "extras");

            // Remove the proximity key from the bundle before checking the bundle size. The

            // proximity value is added after the privileged module and can avoid the

            // maxBundleSize limitation.

            if (mExtras.containsKey(EXTRA_PROXIMITY_METERS)) {

                double proximityMeters = mExtras.getDouble(EXTRA_PROXIMITY_METERS);

                mExtras.remove(EXTRA_PROXIMITY_METERS);

                // Skip checking parcelable size if the new bundle size is 0. Newly empty bundle

                // has parcelable size of 4, but the default bundle has parcelable size of 0.

                if (mExtras.size() > 0) {

                    Preconditions.checkArgumentInRange(getParcelableSize(mExtras), 0,

                            getMaxBundleSize(), "extras");

                }

                mExtras.putDouble(EXTRA_PROXIMITY_METERS, proximityMeters);

            } else {

                Preconditions.checkArgumentInRange(getParcelableSize(mExtras), 0,

                        getMaxBundleSize(), "extras");

            }

        }

    }
@@ -513,6 +546,14 @@ public final class HotwordDetectedResult implements Parcelable { 
     * <p>The use of this method is discouraged, and support for it will be removed in future

     * versions of Android.

     *

     * <p>After the trigger happens, a special case of proximity-related extra, with the key of

     * 'android.service.voice.extra.PROXIMITY_METERS' and the value of distance in meters (double),

     * will be stored to enable proximity logic. The proximity meters is provided by the system,

     * on devices that support detecting proximity of nearby users, to help disambiguate which

     * nearby device should respond. When the proximity is unknown, the proximity value will not

     * be stored. This mapping will be excluded from the max bundle size calculation because this

     * mapping is included after the result is returned from the hotword detector service.

     *

     * <p>This is a PersistableBundle so it doesn't allow any remotable objects or other contents

     * that can be used to communicate with other processes.

     */
@@ -813,6 +854,14 @@ public final class HotwordDetectedResult implements Parcelable { 
         * <p>The use of this method is discouraged, and support for it will be removed in future

         * versions of Android.

         *

         * <p>After the trigger happens, a special case of proximity-related extra, with the key of

         * 'android.service.voice.extra.PROXIMITY_METERS' and the value of distance in meters (double),

         * will be stored to enable proximity logic. The proximity meters is provided by the system,

         * on devices that support detecting proximity of nearby users, to help disambiguate which

         * nearby device should respond. When the proximity is unknown, the proximity value will not

         * be stored. This mapping will be excluded from the max bundle size calculation because this

         * mapping is included after the result is returned from the hotword detector service.

         *

         * <p>This is a PersistableBundle so it doesn't allow any remotable objects or other contents

         * that can be used to communicate with other processes.

         */
@@ -882,10 +931,10 @@ public final class HotwordDetectedResult implements Parcelable { 
    }



    @DataClass.Generated(

            time = 1625541522353L,

            time = 1658357814396L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/service/voice/HotwordDetectedResult.java",

            inputSignatures = "public static final  int CONFIDENCE_LEVEL_NONE\npublic static final  int CONFIDENCE_LEVEL_LOW\npublic static final  int CONFIDENCE_LEVEL_LOW_MEDIUM\npublic static final  int CONFIDENCE_LEVEL_MEDIUM\npublic static final  int CONFIDENCE_LEVEL_MEDIUM_HIGH\npublic static final  int CONFIDENCE_LEVEL_HIGH\npublic static final  int CONFIDENCE_LEVEL_VERY_HIGH\npublic static final  int HOTWORD_OFFSET_UNSET\npublic static final  int AUDIO_CHANNEL_UNSET\nprivate static final  int LIMIT_HOTWORD_OFFSET_MAX_VALUE\nprivate static final  int LIMIT_AUDIO_CHANNEL_MAX_VALUE\nprivate final @android.service.voice.HotwordDetectedResult.HotwordConfidenceLevelValue int mConfidenceLevel\nprivate @android.annotation.Nullable android.media.MediaSyncEvent mMediaSyncEvent\nprivate  int mHotwordOffsetMillis\nprivate  int mHotwordDurationMillis\nprivate  int mAudioChannel\nprivate  boolean mHotwordDetectionPersonalized\nprivate final  int mScore\nprivate final  int mPersonalizedScore\nprivate final  int mHotwordPhraseId\nprivate final @android.annotation.NonNull android.os.PersistableBundle mExtras\nprivate static  int sMaxBundleSize\nprivate static  int defaultConfidenceLevel()\nprivate static  int defaultScore()\nprivate static  int defaultPersonalizedScore()\npublic static  int getMaxScore()\nprivate static  int defaultHotwordPhraseId()\npublic static  int getMaxHotwordPhraseId()\nprivate static  android.os.PersistableBundle defaultExtras()\npublic static  int getMaxBundleSize()\npublic @android.annotation.Nullable android.media.MediaSyncEvent getMediaSyncEvent()\npublic static  int getParcelableSize(android.os.Parcelable)\npublic static  int getUsageSize(android.service.voice.HotwordDetectedResult)\nprivate static  int bitCount(long)\nprivate  void onConstructed()\nclass HotwordDetectedResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)")

            inputSignatures = "public static final  int CONFIDENCE_LEVEL_NONE\npublic static final  int CONFIDENCE_LEVEL_LOW\npublic static final  int CONFIDENCE_LEVEL_LOW_MEDIUM\npublic static final  int CONFIDENCE_LEVEL_MEDIUM\npublic static final  int CONFIDENCE_LEVEL_MEDIUM_HIGH\npublic static final  int CONFIDENCE_LEVEL_HIGH\npublic static final  int CONFIDENCE_LEVEL_VERY_HIGH\npublic static final  int HOTWORD_OFFSET_UNSET\npublic static final  int AUDIO_CHANNEL_UNSET\nprivate static final  int LIMIT_HOTWORD_OFFSET_MAX_VALUE\nprivate static final  int LIMIT_AUDIO_CHANNEL_MAX_VALUE\npublic static final  java.lang.String EXTRA_PROXIMITY_METERS\nprivate final @android.service.voice.HotwordDetectedResult.HotwordConfidenceLevelValue int mConfidenceLevel\nprivate @android.annotation.Nullable android.media.MediaSyncEvent mMediaSyncEvent\nprivate  int mHotwordOffsetMillis\nprivate  int mHotwordDurationMillis\nprivate  int mAudioChannel\nprivate  boolean mHotwordDetectionPersonalized\nprivate final  int mScore\nprivate final  int mPersonalizedScore\nprivate final  int mHotwordPhraseId\nprivate final @android.annotation.NonNull android.os.PersistableBundle mExtras\nprivate static  int sMaxBundleSize\nprivate static  int defaultConfidenceLevel()\nprivate static  int defaultScore()\nprivate static  int defaultPersonalizedScore()\npublic static  int getMaxScore()\nprivate static  int defaultHotwordPhraseId()\npublic static  int getMaxHotwordPhraseId()\nprivate static  android.os.PersistableBundle defaultExtras()\npublic static  int getMaxBundleSize()\npublic @android.annotation.Nullable android.media.MediaSyncEvent getMediaSyncEvent()\npublic static  int getParcelableSize(android.os.Parcelable)\npublic static  int getUsageSize(android.service.voice.HotwordDetectedResult)\nprivate static  int bitCount(long)\nprivate  void onConstructed()\nclass HotwordDetectedResult extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genBuilder=true, genEqualsHashCode=true, genHiddenConstDefs=true, genParcelable=true, genToString=true)")

    @Deprecated

    private void __metadata() {}

core/java/android/view/SurfaceControlViewHost.java

+2 −8
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.RemoteException;

import android.util.Log;

import android.window.WindowTokenClient;

import android.view.accessibility.IAccessibilityEmbeddedConnection;

import android.window.WindowTokenClient;



import java.util.Objects;
@@ -271,14 +271,8 @@ public class SurfaceControlViewHost { 
    /** @hide */

    public SurfaceControlViewHost(@NonNull Context c, @NonNull Display d,

            @NonNull WindowlessWindowManager wwm) {

        this(c, d, wwm, false /* useSfChoreographer */);

    }



    /** @hide */

    public SurfaceControlViewHost(@NonNull Context c, @NonNull Display d,

            @NonNull WindowlessWindowManager wwm, boolean useSfChoreographer) {

        mWm = wwm;

        mViewRoot = new ViewRootImpl(c, d, mWm, new WindowlessWindowLayout(), useSfChoreographer);

        mViewRoot = new ViewRootImpl(c, d, mWm, new WindowlessWindowLayout());

        addConfigCallback(c, d);



        WindowManagerGlobal.getInstance().addWindowlessRoot(mViewRoot);

core/java/android/view/ViewRootImpl.java

+2 −9
Original line number Diff line number Diff line
@@ -905,17 +905,11 @@ public final class ViewRootImpl implements ViewParent, 
    private String mTag = TAG;



    public ViewRootImpl(Context context, Display display) {

        this(context, display, WindowManagerGlobal.getWindowSession(), new WindowLayout(),

                false /* useSfChoreographer */);

        this(context, display, WindowManagerGlobal.getWindowSession(), new WindowLayout());

    }



    public ViewRootImpl(@UiContext Context context, Display display, IWindowSession session,

            WindowLayout windowLayout) {

        this(context, display, session, windowLayout, false /* useSfChoreographer */);

    }



    public ViewRootImpl(@UiContext Context context, Display display, IWindowSession session,

            WindowLayout windowLayout, boolean useSfChoreographer) {

        mContext = context;

        mWindowSession = session;

        mWindowLayout = windowLayout;
@@ -947,8 +941,7 @@ public final class ViewRootImpl implements ViewParent, 
        mNoncompatDensity = context.getResources().getDisplayMetrics().noncompatDensityDpi;

        mFallbackEventHandler = new PhoneFallbackEventHandler(context);

        // TODO(b/222696368): remove getSfInstance usage and use vsyncId for transactions

        mChoreographer = useSfChoreographer

                ? Choreographer.getSfInstance() : Choreographer.getInstance();

        mChoreographer = Choreographer.getInstance();

        mDisplayManager = (DisplayManager)context.getSystemService(Context.DISPLAY_SERVICE);

        mInsetsController = new InsetsController(new ViewRootInsetsControllerHost(this));

        mHandwritingInitiator = new HandwritingInitiator(mViewConfiguration,