From 73c16da392e54d05c73ae185b75e03a8513573a4 Mon Sep 17 00:00:00 2001
From: huiyan <huiyan@codeaurora.org>
Date: Thu, 24 Mar 2016 11:39:23 +0800
Subject: Gallery2: Fix NullPointerException when tap one picture/video

Catch NullPointerException when the NFC Service dead
to avoid crash

Change-Id: Icdd88a54e2926e16d0b7de25c9578634bd4b4f28
CRs-Fixed: 982844
---
 src/com/android/gallery3d/app/PhotoPage.java | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 4ea2e483d..fa94daa01 100644
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -705,15 +705,21 @@ public abstract class PhotoPage extends ActivityState implements
     private void setupNfcBeamPush() {
         if (!ApiHelper.HAS_SET_BEAM_PUSH_URIS) return;
 
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mActivity);
-        if (adapter != null) {
-            adapter.setBeamPushUris(null, mActivity);
-            adapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() {
-                @Override
-                public Uri[] createBeamUris(NfcEvent event) {
-                    return mNfcPushUris;
-                }
-            }, mActivity);
+        try {
+            NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mActivity);
+            if (adapter != null) {
+                adapter.setBeamPushUris(null, mActivity);
+                adapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() {
+                    @Override
+                    public Uri[] createBeamUris(NfcEvent event) {
+                        return mNfcPushUris;
+                    }
+                }, mActivity);
+            }
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
-- 
cgit v1.2.3