diff options
| author | Jiyong Park <jiyong@google.com> | 2018-08-02 17:02:45 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-08-02 18:07:54 +0900 |
| commit | 1581c348fc5d6cbf1673b3dbc5960637f891d488 (patch) | |
| tree | 31e9444210520c28f42b9445fbc53daf68e5a0be /libs/hwui/PathParser.cpp | |
| parent | 7a01a307753309f198eacbb8a36e15428b38bbe7 (diff) | |
| parent | decdaee091799aced8169d45632c923e2605214e (diff) | |
Merge QPR1.180718.001
Conflicts:
core/java/android/provider/Settings.java
core/jni/android_view_InputEventReceiver.cpp
core/res/res/values/config.xml
core/res/res/values/symbols.xml
media/jni/Android.bp
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java
packages/SystemUI/res/layout/status_bar_mobile_signal_group.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/NetworkTimeUpdateService.java
services/core/java/com/android/server/StorageManagerService.java
services/core/java/com/android/server/Watchdog.java
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/am/ActivityStack.java
services/core/java/com/android/server/am/AppTaskImpl.java
services/core/java/com/android/server/audio/AudioService.java
services/core/java/com/android/server/wm/DisplayContent.java
services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java
telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/ims/ImsReasonInfo.java
telephony/java/android/telephony/ims/feature/MmTelFeature.java
telephony/java/com/android/internal/telephony/ISmsBaseImpl.java
Change-Id: I3f98340699f9e31be03eaf23fdea70803c4cef42
Diffstat (limited to 'libs/hwui/PathParser.cpp')
| -rw-r--r-- | libs/hwui/PathParser.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libs/hwui/PathParser.cpp b/libs/hwui/PathParser.cpp index 47fcca92bcca..ad599e9ec316 100644 --- a/libs/hwui/PathParser.cpp +++ b/libs/hwui/PathParser.cpp @@ -210,9 +210,8 @@ void PathParser::validateVerbAndPoints(char verb, size_t points, PathParser::Par if (numberOfPointsExpected > 0) { result->failureMessage += "a multiple of "; } - result->failureMessage += std::to_string(numberOfPointsExpected) - + " floats. However, " + std::to_string(points) - + " float(s) are found. "; + result->failureMessage += std::to_string(numberOfPointsExpected) + " floats. However, " + + std::to_string(points) + " float(s) are found. "; } void PathParser::getPathDataFromAsciiString(PathData* data, ParseResult* result, @@ -242,8 +241,8 @@ void PathParser::getPathDataFromAsciiString(PathData* data, ParseResult* result, validateVerbAndPoints(pathStr[start], points.size(), result); if (result->failureOccurred) { // If either verb or points is not valid, return immediately. - result->failureMessage += "Failure occurred at position " + - std::to_string(start) + " of path: " + pathStr; + result->failureMessage += "Failure occurred at position " + std::to_string(start) + + " of path: " + pathStr; return; } data->verbs.push_back(pathStr[start]); @@ -257,8 +256,8 @@ void PathParser::getPathDataFromAsciiString(PathData* data, ParseResult* result, validateVerbAndPoints(pathStr[start], 0, result); if (result->failureOccurred) { // If either verb or points is not valid, return immediately. - result->failureMessage += "Failure occurred at position " + - std::to_string(start) + " of path: " + pathStr; + result->failureMessage += "Failure occurred at position " + std::to_string(start) + + " of path: " + pathStr; return; } data->verbs.push_back(pathStr[start]); |