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

Commit 30c24af8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986a... 

Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986a am: 09d92456 am: 836124db

Change-Id: I0677a6a31defcb6412f132dcbbfd54f02c82baf7
parents aab0c362 836124db

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -29702,7 +29702,7 @@ package android.net { 
    method public long getReportTimestamp();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.ConnectivityDiagnosticsManager.ConnectivityReport> CREATOR;

    field public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK = "networkProbesAttemped";

    field public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK = "networkProbesAttempted";

    field public static final String KEY_NETWORK_PROBES_SUCCEEDED_BITMASK = "networkProbesSucceeded";

    field public static final String KEY_NETWORK_VALIDATION_RESULT = "networkValidationResult";

    field public static final int NETWORK_PROBE_DNS = 4; // 0x4

core/java/android/net/ConnectivityDiagnosticsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ public class ConnectivityDiagnosticsManager { 
         */

        @NetworkProbe

        public static final String KEY_NETWORK_PROBES_ATTEMPTED_BITMASK =

                "networkProbesAttemped";

                "networkProbesAttempted";



        /** @hide */

        @StringDef(prefix = {"KEY_"}, value = {