am a4ac386d: Merge "Make querying the graphics stats service more defensive" into mnc-dev

* commit 'a4ac386d2a5a29876d1df0b980fb713e6c3e047d':
  Make querying the graphics stats service more defensive

1 files changed, 8 insertions, 9 deletions

diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index e044f1e9669e..f6119e2898f0 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);
             }
         }