From 828698b012e3c317073c0dbbe323d06fe9954af4 Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 30 Jun 2015 12:56:03 -0700 Subject: [PATCH] Make querying the graphics stats service more defensive Bug: 21750734 Doesn't fix the underlying issue that we were unable to get a buffer but as this is non-critical be more defensive about failures. Change-Id: I7f2faaa35b064e3d0da0a13dba9aae3c226b9acc --- core/java/android/view/ThreadedRenderer.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index e044f1e9669e4..f6119e2898f00 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -434,7 +434,6 @@ public class ThreadedRenderer extends HardwareRenderer { private static class ProcessInitializer { static ProcessInitializer sInstance = new ProcessInitializer(); - static IGraphicsStats sGraphicsStatsService; private static IBinder sProcToken; private boolean mInitialized = false; @@ -449,19 +448,19 @@ public class ThreadedRenderer extends HardwareRenderer { } private static void initGraphicsStats(Context context, long renderProxy) { - IBinder binder = ServiceManager.getService("graphicsstats"); - if (binder == null) return; - - sGraphicsStatsService = IGraphicsStats.Stub.asInterface(binder); - sProcToken = new Binder(); try { + IBinder binder = ServiceManager.getService("graphicsstats"); + if (binder == null) return; + IGraphicsStats graphicsStatsService = IGraphicsStats.Stub + .asInterface(binder); + sProcToken = new Binder(); final String pkg = context.getApplicationInfo().packageName; - ParcelFileDescriptor pfd = sGraphicsStatsService. + ParcelFileDescriptor pfd = graphicsStatsService. requestBufferForProcess(pkg, sProcToken); nSetProcessStatsBuffer(renderProxy, pfd.getFd()); pfd.close(); - } catch (Exception e) { - Log.w(LOG_TAG, "Could not acquire gfx stats buffer", e); + } catch (Throwable t) { + Log.w(LOG_TAG, "Could not acquire gfx stats buffer", t); } }