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

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

Snap for 4959688 from 121d4eee to pi-qpr1-release 

Change-Id: If4f6a0077880729a11015a2164b6b887bad368a1
parents be8bf8b1 121d4eee

core/java/android/hardware/camera2/CameraMetadata.java

+5 −5
Original line number Diff line number Diff line
@@ -819,11 +819,11 @@ public abstract class CameraMetadata<TKey> { 
     * camera in the list of supported camera devices.</p>

     * <p>This capability requires the camera device to support the following:</p>

     * <ul>

     * <li>This camera device must list the following static metadata entries in {@link android.hardware.camera2.CameraCharacteristics }:<ul>

     * <li>android.logicalMultiCamera.physicalIds</li>

     * <li>{@link CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE android.logicalMultiCamera.sensorSyncType}</li>

     * </ul>

     * </li>

     * <li>The IDs of underlying physical cameras are returned via

     *   {@link android.hardware.camera2.CameraCharacteristics#getPhysicalCameraIds }.</li>

     * <li>This camera device must list static metadata

     *   {@link CameraCharacteristics#LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE android.logicalMultiCamera.sensorSyncType} in

     *   {@link android.hardware.camera2.CameraCharacteristics }.</li>

     * <li>The underlying physical cameras' static metadata must list the following entries,

     *   so that the application can correlate pixels from the physical streams:<ul>

     * <li>{@link CameraCharacteristics#LENS_POSE_REFERENCE android.lens.poseReference}</li>

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,15 @@ public class CarrierConfigManager { 
    public static final String KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL =

            "always_play_remote_hold_tone_bool";



    /**

     * When true, the Telephony stack will automatically turn off airplane mode and retry a wifi

     * emergency call over the cell network if the initial attempt at dialing was met with a SIP 308

     * error.

     * @hide

     */

    public static final String KEY_AUTO_RETRY_FAILED_WIFI_EMERGENCY_CALL =

            "auto_retry_failed_wifi_emergency_call";



    /**

     * When true, indicates that adding a call is disabled when there is an ongoing video call

     * or when there is an ongoing call on wifi which was downgraded from video and VoWifi is
@@ -2016,6 +2025,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);

        sDefaults.putBoolean(KEY_AUTO_RETRY_FAILED_WIFI_EMERGENCY_CALL, false);

        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);

        sDefaults.putStringArray(KEY_UNLOGGABLE_NUMBERS_STRING_ARRAY, null);