diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-01-31 11:53:41 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-02-01 14:08:42 -0800 |
| commit | 88b45c586d461df38b866d529bc98d1dfa3e8838 (patch) | |
| tree | ae57a86275dac94c0899015923778f3016c865b2 /libs/hwui/tests/common/TestUtils.cpp | |
| parent | 067596650927fa91a97355e84b152b21826f7ae2 (diff) | |
| parent | 9b9ca46fc2d3da231bf9ef6ff630105720f94cf2 (diff) | |
Merge QP1A.190122.001
Conflicts:
api/system-current.txt
core/java/android/bluetooth/BluetoothAdapter.java
core/jni/android_util_Process.cpp
core/jni/com_android_internal_os_Zygote.cpp
core/res/res/values/config.xml
core/res/res/values/symbols.xml
media/java/android/media/MediaCodecInfo.java
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
services/core/java/com/android/server/location/GnssLocationProvider.java
services/core/java/com/android/server/wm/ActivityStack.java
services/net/java/android/net/ip/IpClient.java
telecomm/java/android/telecom/Connection.java
telephony/java/android/telephony/ims/ImsCallSession.java
telephony/java/android/telephony/ims/ImsCallSessionListener.java
telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl
telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
wifi/java/android/net/wifi/WifiConfiguration.java
Change-Id: I367301986f2ae80a528050c3d78776b5a4c6b5ee
Diffstat (limited to 'libs/hwui/tests/common/TestUtils.cpp')
| -rw-r--r-- | libs/hwui/tests/common/TestUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/tests/common/TestUtils.cpp b/libs/hwui/tests/common/TestUtils.cpp index 7aa9b82e3583..16a27598c56a 100644 --- a/libs/hwui/tests/common/TestUtils.cpp +++ b/libs/hwui/tests/common/TestUtils.cpp @@ -82,7 +82,7 @@ void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint float y) { auto utf16 = asciiToUtf16(text); uint32_t length = strlen(text); - SkPaint glyphPaint(paint); + Paint glyphPaint(paint); glyphPaint.setTextEncoding(kGlyphID_SkTextEncoding); canvas->drawText(utf16.get(), length, // text buffer 0, length, // draw range @@ -93,7 +93,7 @@ void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint void TestUtils::drawUtf8ToCanvas(Canvas* canvas, const char* text, const SkPaint& paint, const SkPath& path) { auto utf16 = asciiToUtf16(text); - SkPaint glyphPaint(paint); + Paint glyphPaint(paint); glyphPaint.setTextEncoding(kGlyphID_SkTextEncoding); canvas->drawTextOnPath(utf16.get(), strlen(text), minikin::Bidi::LTR, path, 0, 0, glyphPaint, nullptr); |