summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-08-10 01:07:23 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-08-10 01:07:23 +0000
commitcc0a4a8779fdc6c1ebfc5cfa2b14d5fe6f384759 (patch)
treec1ee2fe0111a53e09c5a318e0715dc34bc607c46
parentd70157964544bf6815ca9b34f8c40b3b46865ab6 (diff)
parent62c3a4f46b073109ad988d6e19776fe902e74658 (diff)
downloadbase-cc0a4a8779fdc6c1ebfc5cfa2b14d5fe6f384759.tar.gz
Snap for 6749551 from 62c3a4f46b073109ad988d6e19776fe902e74658 to rvc-d1-release
Change-Id: Ifece461831a28aedf617c114267c9803d11b57e4
-rw-r--r--libs/hwui/service/GraphicsStatsService.cpp1
-rw-r--r--packages/SettingsLib/res/values-in/arrays.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/service/GraphicsStatsService.cpp b/libs/hwui/service/GraphicsStatsService.cpp
index 644d5fbd5bf9..e4198017aee0 100644
--- a/libs/hwui/service/GraphicsStatsService.cpp
+++ b/libs/hwui/service/GraphicsStatsService.cpp
@@ -559,6 +559,7 @@ void GraphicsStatsService::finishDumpInMemory(Dump* dump, AStatsEventList* data,
AStatsEvent_writeBool(event, !lastFullDay);
AStatsEvent_build(event);
}
+ delete dump;
}
diff --git a/packages/SettingsLib/res/values-in/arrays.xml b/packages/SettingsLib/res/values-in/arrays.xml
index 37cf189f26c0..3ab50cc948eb 100644
--- a/packages/SettingsLib/res/values-in/arrays.xml
+++ b/packages/SettingsLib/res/values-in/arrays.xml
@@ -31,7 +31,7 @@
<item msgid="7852381437933824454">"Memutus sambungan..."</item>
<item msgid="5046795712175415059">"Sambungan terputus"</item>
<item msgid="2473654476624070462">"Gagal"</item>
- <item msgid="9146847076036105115">"Dicekal"</item>
+ <item msgid="9146847076036105115">"Diblokir"</item>
<item msgid="4543924085816294893">"Menghindari sambungan buruk untuk sementara"</item>
</string-array>
<string-array name="wifi_status_with_ssid">