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

Commit 0d4e5104 authored by Kriti Dang's avatar Kriti Dang Committed by Android (Google) Code Review
Browse files

Merge "add int range on #getManufactureYear and #getManufactureWeek in... 

Merge "add int range on #getManufactureYear and #getManufactureWeek in DeviceProductInfo" into sc-dev
parents 8ad47344 7efe08a2

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -18826,10 +18826,10 @@ package android.hardware.display { 
  public final class DeviceProductInfo implements android.os.Parcelable {

    method public int describeContents();

    method public int getConnectionToSinkType();

    method public int getManufactureWeek();

    method public int getManufactureYear();

    method @IntRange(from=0xffffffff, to=53) public int getManufactureWeek();

    method @IntRange(from=0xffffffff) public int getManufactureYear();

    method @NonNull public String getManufacturerPnpId();

    method public int getModelYear();

    method @IntRange(from=0xffffffff) public int getModelYear();

    method @Nullable public String getName();

    method @NonNull public String getProductId();

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

core/java/android/hardware/display/DeviceProductInfo.java

+6 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.display;



import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcel;
@@ -118,6 +119,7 @@ public final class DeviceProductInfo implements Parcelable { 
     * @return Model year of the device. Return -1 if not available. Typically,

     * one of model year or manufacture year is available.

     */

    @IntRange(from = -1)

    public int getModelYear()  {

        return mModelYear != null ? mModelYear : -1;

    }
@@ -126,6 +128,7 @@ public final class DeviceProductInfo implements Parcelable { 
     * @return The year of manufacture, or -1 it is not available. Typically,

     * one of model year or manufacture year is available.

     */

    @IntRange(from = -1)

    public int getManufactureYear()  {

        if (mManufactureDate == null) {

            return -1;
@@ -134,9 +137,10 @@ public final class DeviceProductInfo implements Parcelable { 
    }



    /**

     * @return The week of manufacture, or -1 it is not available. Typically,

     * not present if model year is available.

     * @return The week of manufacture which ranges from 1 to 53, or -1 it is not available.

     * Typically, it is not present if model year is available.

     */

    @IntRange(from = -1, to = 53)

    public int getManufactureWeek() {

        if (mManufactureDate == null) {

            return -1;