diff options
| author | Scott Lobdell <slobdell@google.com> | 2020-10-07 16:24:43 -0700 |
|---|---|---|
| committer | Justin DeMartino <jjdemartino@google.com> | 2020-10-09 12:51:22 -0700 |
| commit | 27e7f8c2aa4ce0a2f59b3bf1969b06bfd1e9ebca (patch) | |
| tree | 3834c14dc757e958d5fa4fdfa19921b0294d8d99 /cmds/bootanimation/BootAnimation.cpp | |
| parent | 540b11039841c20b63ade118ffece7c9e65797c1 (diff) | |
| parent | 199180c357078db5598e00e20ceccc6c20c93cb5 (diff) | |
Merge SP1A.200921.001
Change-Id: I6a8d7215f874fed05e9fec71b17c8a3d1e2c94e0
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 80e97402943a..b7fc1c47c0c3 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -417,7 +417,7 @@ status_t BootAnimation::readyToRun() { // this guest property specifies multi-display IDs to show the boot animation // multiple ids can be set with comma (,) as separator, for example: // setprop persist.boot.animation.displays 19260422155234049,19261083906282754 - Vector<uint64_t> physicalDisplayIds; + Vector<PhysicalDisplayId> physicalDisplayIds; char displayValue[PROPERTY_VALUE_MAX] = ""; property_get(DISPLAYS_PROP_NAME, displayValue, ""); bool isValid = displayValue[0] != '\0'; @@ -435,7 +435,7 @@ status_t BootAnimation::readyToRun() { } if (isValid) { std::istringstream stream(displayValue); - for (PhysicalDisplayId id; stream >> id; ) { + for (PhysicalDisplayId id; stream >> id.value; ) { physicalDisplayIds.add(id); if (stream.peek() == ',') stream.ignore(); |