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

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

Snap for 6758226 from ca28a90b to rvc-qpr1-release

Change-Id: I846e1ae34c09cb997bf83316dd7acc2252b32eee
parents 267f3c2a ca28a90b
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -503,6 +503,10 @@ public class NetworkTemplate implements Parcelable {
        for (final int ratType : ratTypes) {
            collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(ratType));
        }
        // Add NETWORK_TYPE_5G_NSA to the returned list since 5G NSA is a virtual RAT type and
        // it is not in TelephonyManager#NETWORK_TYPE_* constants.
        // See {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}.
        collapsedRatTypes.add(NetworkTemplate.getCollapsedRatType(NETWORK_TYPE_5G_NSA));
        // Ensure that unknown type is returned.
        collapsedRatTypes.add(TelephonyManager.NETWORK_TYPE_UNKNOWN);
        return toIntArray(collapsedRatTypes);
+10 −4
Original line number Diff line number Diff line
@@ -1006,10 +1006,16 @@ public class Build {

        /**
         * Q.
         * <p>
         * <em>Why? Why, to give you a taste of your future, a preview of things
         * to come. Con permiso, Capitan. The hall is rented, the orchestra
         * engaged. It's now time to see if you can dance.</em>
         *
         * <p>Applications targeting this or a later release will get these new changes in behavior.
         * For more information about this release, see the
         * <a href="/about/versions/10">Android 10 overview</a>.</p>
         * <ul>
         * <li><a href="/about/versions/10/behavior-changes-all">Behavior changes: all apps</a></li>
         * <li><a href="/about/versions/10/behavior-changes-10">Behavior changes: apps targeting API
         * 29+</a></li>
         * </ul>
         *
         */
        public static final int Q = 29;

+11 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.app.Service;
import android.app.admin.DevicePolicyManager.PermissionGrantState;
import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
@@ -82,6 +84,15 @@ public abstract class PermissionControllerService extends Service {
     */
    public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";

    /**
     * A ChangeId indicating that this device supports camera and mic indicators. Will be "false"
     * if present, because the CompatChanges#isChangeEnabled method returns true if the change id
     * is not present.
     */
    @ChangeId
    @Disabled
    private static final long CAMERA_MIC_INDICATORS_NOT_PRESENT = 162547999L;

    /**
     * Revoke a set of runtime permissions for various apps.
     *
+1 −0
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ public class VolumeDialogImpl implements VolumeDialog,
    protected void onStateChangedH(State state) {
        if (D.BUG) Log.d(TAG, "onStateChangedH() state: " + state.toString());
        if (mState != null && state != null
                && mState.ringerModeInternal != -1
                && mState.ringerModeInternal != state.ringerModeInternal
                && state.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {
            mController.vibrate(VibrationEffect.get(VibrationEffect.EFFECT_HEAVY_CLICK));
+2 −1
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> {

                @Override
                public void onFailure(int requestId, CharSequence message) {
                    String errorMessage = message == null ? "" : String.valueOf(message);
                    fillRequest.completeExceptionally(
                            new RuntimeException(String.valueOf(message)));
                            new RuntimeException(errorMessage));
                }
            });
            return fillRequest;
Loading