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

Commit 69c13261 authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "adding a public constructor for DeviceProductInfo. Improving javadoc... 

Merge "adding a public constructor for DeviceProductInfo. Improving javadoc for #getManufacturePnpId" into sc-dev am: 49fed7b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14057091

Change-Id: I63621e8db9a501fc2d55bc516bc34909fe978e46
parents 0d88194a 49fed7b6

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -18825,6 +18825,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();

























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



+23
−6






























Original line number
Diff line number
Diff line








@@ -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