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

Commit 3099c6d6 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Create a HalVersion Constant for UNKNOWN" 

am: 8ccd4396

Change-Id: Iadb616dfaf1fec02febf612791a2de4093243a0f
parents ec6e93c3 8ccd4396

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

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

 * HIDL versioning</a>.

 */

 */

public class HalVersion implements Comparable<HalVersion> {

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 major;





    public final int minor;

    public final int minor;

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

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

    private final ClientWakelockTracker mClientWakelockTracker = new ClientWakelockTracker();





    /** @hide */

    /** @hide */

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

    public static final HalVersion RADIO_HAL_VERSION_UNKNOWN = HalVersion.UNKNOWN;





    /** @hide */

    /** @hide */

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

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