summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-25 17:03:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-25 17:03:39 +0000
commitd56a953a1550e36d47563144ffcc4d23c211e7ef (patch)
treef2a487bd50f4175b80218ec566e58a6486ba03cd /media
parente1b737ca1eee2c5e80c2dae4fe60e852a160aa0b (diff)
parent53eae5433f71573f135f0a92375d0e63f7dff022 (diff)
downloadframeworks_av-d56a953a1550e36d47563144ffcc4d23c211e7ef.zip
frameworks_av-d56a953a1550e36d47563144ffcc4d23c211e7ef.tar.gz
frameworks_av-d56a953a1550e36d47563144ffcc4d23c211e7ef.tar.bz2
Merge "Libcpustats: Remove unused variable"
Diffstat (limited to 'media')
-rw-r--r--media/libcpustats/ThreadCpuUsage.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libcpustats/ThreadCpuUsage.cpp b/media/libcpustats/ThreadCpuUsage.cpp
index cfdcb51..7b5b661 100644
--- a/media/libcpustats/ThreadCpuUsage.cpp
+++ b/media/libcpustats/ThreadCpuUsage.cpp
@@ -74,7 +74,6 @@ bool ThreadCpuUsage::setEnabled(bool isEnabled)
bool ThreadCpuUsage::sampleAndEnable(double& ns)
{
- bool ret;
bool wasEverEnabled = mWasEverEnabled;
if (enable()) {
// already enabled, so add a new sample relative to previous