adding a public constructor for DeviceProductInfo.
Improving javadoc for #getManufacturePnpId Bug: 182424090 Test: atest DisplayTest Change-Id: I99ce9dae6ace765462efa8d495fb845a6d70aa5e
This commit is contained in:
@@ -18821,6 +18821,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 public int getManufactureWeek();
|
||||
|
||||
@@ -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;
|
||||
@@ -73,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) {
|
||||
@@ -99,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
|
||||
|
||||
Reference in New Issue
Block a user