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

Commit 16e8588d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5687443 from 0b8cb86f to qt-c2f2-release 

Change-Id: I223e1dba9d8fae1605f71f5d5c4e3c4a7d358f13
parents 6b495029 0b8cb86f

core/java/android/hardware/camera2/impl/CameraConstrainedHighSpeedCaptureSessionImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.hardware.camera2.params.OutputConfiguration; 
import android.hardware.camera2.params.StreamConfigurationMap;

import android.hardware.camera2.utils.SurfaceUtils;

import android.os.Handler;

import android.os.ConditionVariable;

import android.util.Range;

import android.view.Surface;
@@ -51,6 +52,7 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl 
        extends CameraConstrainedHighSpeedCaptureSession implements CameraCaptureSessionCore {

    private final CameraCharacteristics mCharacteristics;

    private final CameraCaptureSessionImpl mSessionImpl;

    private final ConditionVariable mInitialized = new ConditionVariable();



    /**

     * Create a new CameraCaptureSession.
@@ -68,6 +70,7 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl 
        CameraCaptureSession.StateCallback wrapperCallback = new WrapperCallback(callback);

        mSessionImpl = new CameraCaptureSessionImpl(id, /*input*/null, wrapperCallback,

                stateExecutor, deviceImpl, deviceStateExecutor, configureSuccess);

        mInitialized.open();

    }



    @Override
@@ -321,11 +324,13 @@ public class CameraConstrainedHighSpeedCaptureSessionImpl 


        @Override

        public void onConfigured(CameraCaptureSession session) {

            mInitialized.block();

            mCallback.onConfigured(CameraConstrainedHighSpeedCaptureSessionImpl.this);

        }



        @Override

        public void onConfigureFailed(CameraCaptureSession session) {

            mInitialized.block();

            mCallback.onConfigureFailed(CameraConstrainedHighSpeedCaptureSessionImpl.this);

        }

core/java/android/os/IVibratorService.aidl

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os;



import android.media.AudioAttributes;

import android.os.VibrationEffect;



/** {@hide} */
@@ -23,8 +24,8 @@ interface IVibratorService 
{

    boolean hasVibrator();

    boolean hasAmplitudeControl();

    void vibrate(int uid, String opPkg, in VibrationEffect effect, int usageHint, String reason,

            IBinder token);

    void vibrate(int uid, String opPkg, in VibrationEffect effect, in AudioAttributes attributes,

            String reason, IBinder token);

    void cancelVibrate(IBinder token);

}

core/java/android/os/SystemVibrator.java

+1 −5
Original line number Diff line number Diff line
@@ -77,16 +77,12 @@ public class SystemVibrator extends Vibrator { 
            return;

        }

        try {

            mService.vibrate(uid, opPkg, effect, usageForAttributes(attributes), reason, mToken);

            mService.vibrate(uid, opPkg, effect, attributes, reason, mToken);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to vibrate.", e);

        }

    }



    private static int usageForAttributes(AudioAttributes attributes) {

        return attributes != null ? attributes.getUsage() : AudioAttributes.USAGE_UNKNOWN;

    }



    @Override

    public void cancel() {

        if (mService == null) {

core/java/com/android/internal/app/ChooserActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -2327,10 +2327,12 @@ public class ChooserActivity extends ResolverActivity { 


        private static final int MAX_SUGGESTED_APP_TARGETS = 4;

        private static final int MAX_CHOOSER_TARGETS_PER_APP = 2;

        private static final int MAX_SHORTCUT_TARGETS_PER_APP = 8;



        private static final int MAX_SERVICE_TARGETS = 8;



        private final int mMaxShortcutTargetsPerApp =

                getResources().getInteger(R.integer.config_maxShortcutTargetsPerApp);



        private int mNumShortcutResults = 0;



        // Reserve spots for incoming direct share targets by adding placeholders
@@ -2648,7 +2650,7 @@ public class ChooserActivity extends ResolverActivity { 
            final float baseScore = getBaseScore(origTarget, isShortcutResult);

            Collections.sort(targets, mBaseTargetComparator);



            final int maxTargets = isShortcutResult ? MAX_SHORTCUT_TARGETS_PER_APP

            final int maxTargets = isShortcutResult ? mMaxShortcutTargetsPerApp

                                       : MAX_CHOOSER_TARGETS_PER_APP;

            float lastScore = 0;

            boolean shouldNotify = false;

core/java/com/android/internal/util/function/pooled/PooledLambdaImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object, 
        private static String argCountPrefix(int argCount) {

            switch (argCount) {

                case MASK_ARG_COUNT: return "";

                case 0: return "";

                case 1: return "";

                case 2: return "Bi";

                case 3: return "Tri";
@@ -646,7 +647,7 @@ final class PooledLambdaImpl<R> extends OmniFunction<Object, 
                case 7: return "Hept";

                case 8: return "Oct";

                case 9: return "Nona";

                default: throw new IllegalArgumentException("" + argCount);

                default: return "" + argCount + "arg";

            }

        }