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

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

Snap for 6689685 from 647d9fb7 to rvc-qpr1-release

Change-Id: Ifb2a3205761ea235ed0e09f00407a1f034bde522
parents e0b95e1e 647d9fb7
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -5178,6 +5178,12 @@ message DataUsageBytesTransfer {
    // record is combined across opportunistic data subscriptions.
    // See {@link SubscriptionManager#setOpportunistic}.
    optional DataSubscriptionState opportunistic_data_sub = 10;

    // Indicate whether NR is connected, server side could use this with RAT type to determine if
    // the record is for 5G NSA (Non Stand Alone) mode, where the primary cell is still LTE and
    // network allocates a secondary 5G cell so telephony reports RAT = LTE along with NR state as
    // connected.
    optional bool is_nr_connected = 11;
}

/**
+12 −0
Original line number Diff line number Diff line
@@ -87,6 +87,15 @@ public class NetworkTemplate implements Parcelable {
     * @hide
     */
    public static final int NETWORK_TYPE_ALL = -1;
    /**
     * Virtual RAT type to represent 5G NSA (Non Stand Alone) mode, where the primary cell is
     * still LTE and network allocates a secondary 5G cell so telephony reports RAT = LTE along
     * with NR state as connected. This should not be overlapped with any of the
     * {@code TelephonyManager.NETWORK_TYPE_*} constants.
     *
     * @hide
     */
    public static final int NETWORK_TYPE_5G_NSA = -2;

    private static boolean isKnownMatchRule(final int rule) {
        switch (rule) {
@@ -475,6 +484,9 @@ public class NetworkTemplate implements Parcelable {
                return TelephonyManager.NETWORK_TYPE_LTE;
            case TelephonyManager.NETWORK_TYPE_NR:
                return TelephonyManager.NETWORK_TYPE_NR;
            // Virtual RAT type for 5G NSA mode, see {@link NetworkTemplate#NETWORK_TYPE_5G_NSA}.
            case NetworkTemplate.NETWORK_TYPE_5G_NSA:
                return NetworkTemplate.NETWORK_TYPE_5G_NSA;
            default:
                return TelephonyManager.NETWORK_TYPE_UNKNOWN;
        }
+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ public interface WindowManagerPolicyConstants {
    int PRESENCE_INTERNAL = 1 << 0;
    int PRESENCE_EXTERNAL = 1 << 1;

    // Alternate bars position values
    int ALT_BAR_UNKNOWN = -1;
    int ALT_BAR_LEFT = 1 << 0;
    int ALT_BAR_RIGHT = 1 << 1;
    int ALT_BAR_BOTTOM = 1 << 2;
    int ALT_BAR_TOP = 1 << 3;

    // Navigation bar position values
    int NAV_BAR_INVALID = -1;
    int NAV_BAR_LEFT = 1 << 0;
+3 −2
Original line number Diff line number Diff line
@@ -10987,17 +10987,18 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     *    not among the handles.
     */
    boolean isFromPrimePointer(MotionEvent event, boolean fromHandleView) {
        boolean res = true;
        if (mPrimePointerId == NO_POINTER_ID)  {
            mPrimePointerId = event.getPointerId(0);
            mIsPrimePointerFromHandleView = fromHandleView;
        } else if (mPrimePointerId != event.getPointerId(0)) {
            return mIsPrimePointerFromHandleView && fromHandleView;
            res = mIsPrimePointerFromHandleView && fromHandleView;
        }
        if (event.getActionMasked() == MotionEvent.ACTION_UP
            || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
            mPrimePointerId = -1;
        }
        return true;
        return res;
    }
    @Override
+5 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ applications that come with the platform
        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
        <permission name="android.permission.DUMP"/>
        <permission name="android.permission.HANDLE_CAR_MODE_CHANGES"/>
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
        <permission name="android.permission.MANAGE_USERS"/>
@@ -426,6 +427,10 @@ applications that come with the platform
        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
        <!-- Permissions required for CTS test - AdbManagerTest -->
        <permission name="android.permission.MANAGE_DEBUGGING" />
        <!-- Permissions required for ATS tests - AtsCarHostTestCases, AtsCarDeviceApp -->
        <permission name="android.car.permission.CAR_DRIVING_STATE" />
        <!-- Permissions required for ATS tests - AtsDeviceInfo, AtsAudioDeviceTestCases -->
        <permission name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME" />
    </privapp-permissions>

    <privapp-permissions package="com.android.statementservice">
Loading