Merge changes from topic "RP1A.190923.001" into r-keystone-qcom-dev

* changes:
  Removes now unused processCdmaCTWdpHeader.
  Adds missing import for com.android.systemui.R
  Remove calls to KeyguardUpdateMonitor.getInstance().
  Adds back value-add that was lost when RingtonePickerActivity.java was moved.
  Overload getWifiIconResource().
  Revert "AudioService: simplify/document locking"
  Merge RP1A.190923.001

1 files changed, 3 insertions, 4 deletions

diff --git a/libs/hwui/renderthread/CacheManager.cpp b/libs/hwui/renderthread/CacheManager.cpp
index 5469a6810c87..fc268138e071 100644
--- a/libs/hwui/renderthread/CacheManager.cpp
+++ b/libs/hwui/renderthread/CacheManager.cpp
@@ -69,8 +69,7 @@ void CacheManager::reset(sk_sp<GrContext> context) {
 
     if (context) {
         mGrContext = std::move(context);
-        mGrContext->getResourceCacheLimits(&mMaxResources, nullptr);
-        mGrContext->setResourceCacheLimits(mMaxResources, mMaxResourceBytes);
+        mGrContext->setResourceCacheLimit(mMaxResourceBytes);
     }
 }
 
@@ -119,8 +118,8 @@ void CacheManager::trimMemory(TrimMemoryMode mode) {
             // limits between the background and max amounts. This causes the unlocked resources
             // that have persistent data to be purged in LRU order.
             mGrContext->purgeUnlockedResources(true);
-            mGrContext->setResourceCacheLimits(mMaxResources, mBackgroundResourceBytes);
-            mGrContext->setResourceCacheLimits(mMaxResources, mMaxResourceBytes);
+            mGrContext->setResourceCacheLimit(mBackgroundResourceBytes);
+            mGrContext->setResourceCacheLimit(mMaxResourceBytes);
             SkGraphics::SetFontCacheLimit(mBackgroundCpuFontCacheBytes);
             SkGraphics::SetFontCacheLimit(mMaxCpuFontCacheBytes);
             break;