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

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp
index d60b99469368..464a58d0c0f8 100644
--- a/libs/hwui/ResourceCache.cpp
+++ b/libs/hwui/ResourceCache.cpp
@@ -113,7 +113,7 @@ void ResourceCache::destructorLocked(Res_png_9patch* resource) {
     if (ref == nullptr) {
         // If we're not tracking this resource, just delete it
         if (Caches::hasInstance()) {
-            Caches::getInstance().patchCache.removeDeferred(resource);
+            // DEAD CODE
         } else {
             // A Res_png_9patch is actually an array of byte that's larger
             // than sizeof(Res_png_9patch). It must be freed as an array.
@@ -136,7 +136,7 @@ void ResourceCache::deleteResourceReferenceLocked(const void* resource, Resource
         switch (ref->resourceType) {
             case kNinePatch: {
                 if (Caches::hasInstance()) {
-                    Caches::getInstance().patchCache.removeDeferred((Res_png_9patch*)resource);
+                    // DEAD CODE
                 } else {
                     // A Res_png_9patch is actually an array of byte that's larger
                     // than sizeof(Res_png_9patch). It must be freed as an array.