diff --git a/core/api/current.txt b/core/api/current.txt index 51867b98b3959..325521f3889ce 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -18824,6 +18824,7 @@ package android.hardware.camera2.params { package android.hardware.display { public final class DeviceProductInfo implements android.os.Parcelable { + ctor public DeviceProductInfo(@Nullable String, @NonNull String, @NonNull String, @IntRange(from=1990) int, int); method public int describeContents(); method public int getConnectionToSinkType(); method @IntRange(from=0xffffffff, to=53) public int getManufactureWeek(); diff --git a/core/java/android/hardware/display/DeviceProductInfo.java b/core/java/android/hardware/display/DeviceProductInfo.java index 11c426aa6734e..835b3fd2dfe56 100644 --- a/core/java/android/hardware/display/DeviceProductInfo.java +++ b/core/java/android/hardware/display/DeviceProductInfo.java @@ -74,12 +74,26 @@ public final class DeviceProductInfo implements Parcelable { Integer modelYear, ManufactureDate manufactureDate, int connectionToSinkType) { - this.mName = name; - this.mManufacturerPnpId = manufacturerPnpId; - this.mProductId = productId; - this.mModelYear = modelYear; - this.mManufactureDate = manufactureDate; - this.mConnectionToSinkType = connectionToSinkType; + mName = name; + mManufacturerPnpId = manufacturerPnpId; + mProductId = productId; + mModelYear = modelYear; + mManufactureDate = manufactureDate; + mConnectionToSinkType = connectionToSinkType; + } + + public DeviceProductInfo( + @Nullable String name, + @NonNull String manufacturerPnpId, + @NonNull String productId, + @IntRange(from = 1990) int modelYear, + @ConnectionToSinkType int connectionToSinkType) { + mName = name; + mManufacturerPnpId = Objects.requireNonNull(manufacturerPnpId); + mProductId = Objects.requireNonNull(productId); + mModelYear = modelYear; + mManufactureDate = null; + mConnectionToSinkType = connectionToSinkType; } private DeviceProductInfo(Parcel in) { @@ -100,6 +114,9 @@ public final class DeviceProductInfo implements Parcelable { } /** + * Returns the Manufacturer Plug and Play ID. This ID identifies the manufacture according to + * the list: https://uefi.org/PNP_ID_List. It consist of 3 characters, each character + * is an uppercase letter (A-Z). * @return Manufacturer Plug and Play ID. */ @NonNull