Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cbe9232d authored by huiyan's avatar huiyan Committed by Michael Bestas
Browse files

Gallery2: Fix NullPointerException when tap one picture/video 

Catch NullPointerException when the NFC Service dead
to avoid crash

Change-Id: Icdd88a54e2926e16d0b7de25c9578634bd4b4f28
CRs-Fixed: 982844
parent 7c82c37c

src/com/android/gallery3d/app/PhotoPage.java

+15 −9
Original line number Diff line number Diff line
@@ -671,6 +671,7 @@ public abstract class PhotoPage extends ActivityState implements 
    private void setupNfcBeamPush() {

        if (!ApiHelper.HAS_SET_BEAM_PUSH_URIS) return;



        try {

            NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mActivity);

            if (adapter != null) {

                adapter.setBeamPushUris(null, mActivity);
@@ -681,6 +682,11 @@ public abstract class PhotoPage extends ActivityState implements 
                    }

                }, mActivity);

            }

        } catch (NullPointerException e) {

            e.printStackTrace();

        } catch (Exception e) {

            e.printStackTrace();

        }

    }



    private void setNfcBeamPushUri(Uri uri) {