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

Commit 278d35b1 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Create a HalVersion Constant for UNKNOWN" am: 8ccd4396 

am: 3099c6d6

Change-Id: Icb4191e59b4f6549d46f6365d93bbc0f11253666
parents 54eda31d 3099c6d6

src/java/com/android/internal/telephony/HalVersion.java

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ import java.util.Objects; 
 * HIDL versioning</a>.

 */

public class HalVersion implements Comparable<HalVersion> {



    /** The HAL Version indicating that the version is unknown or invalid */

    public static final HalVersion UNKNOWN = new HalVersion(-1, -1);



    public final int major;



    public final int minor;

src/java/com/android/internal/telephony/RIL.java

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
    private final ClientWakelockTracker mClientWakelockTracker = new ClientWakelockTracker();



    /** @hide */

    public static final HalVersion RADIO_HAL_VERSION_UNKNOWN = new HalVersion(-1, -1);

    public static final HalVersion RADIO_HAL_VERSION_UNKNOWN = HalVersion.UNKNOWN;



    /** @hide */

    public static final HalVersion RADIO_HAL_VERSION_1_0 = new HalVersion(1, 0);