Merge "Remove deprecated NFC beam support" am: d62b4a89f9 am: 351b330bef am: 462f0d5365 am: a7ba17f7ff am: 4d0cbdea1d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2182375

Change-Id: I0b2f970487418439a57788e7d66c9317e6793451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 0 insertions, 41 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 82b0953e7..b581c51bf 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -40,9 +40,6 @@ import android.graphics.SurfaceTexture;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcAdapter.CreateBeamUrisCallback;
-import android.nfc.NfcEvent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -252,8 +249,6 @@ public class CameraActivity extends QuickActivity
     private FatalErrorHandler mFatalErrorHandler;
     private boolean mHasCriticalPermissions;
 
-    private final Uri[] mNfcPushUris = new Uri[1];
-
     private FilmstripContentObserver mLocalImagesObserver;
     private FilmstripContentObserver mLocalVideosObserver;
 
@@ -848,28 +843,6 @@ public class CameraActivity extends QuickActivity
                 messageId > 0 ? getString(messageId) : "");
     }
 
-    // Candidate for deletion as Android Beam is deprecated in Android Q
-    private void setupNfcBeamPush() {
-        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mAppContext);
-        if (adapter == null) {
-            return;
-        }
-
-        if (!ApiHelper.HAS_SET_BEAM_PUSH_URIS) {
-            // Disable beaming
-            adapter.setNdefPushMessage(null, CameraActivity.this);
-            return;
-        }
-
-        adapter.setBeamPushUris(null, CameraActivity.this);
-        adapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() {
-            @Override
-            public Uri[] createBeamUris(NfcEvent event) {
-                return mNfcPushUris;
-            }
-        }, CameraActivity.this);
-    }
-
     @Override
     public boolean onShareTargetSelected(ShareActionProvider shareActionProvider, Intent intent) {
         int currentIndex = mFilmstripController.getCurrentAdapterIndex();
@@ -1628,9 +1601,6 @@ public class CameraActivity extends QuickActivity
 
         preloadFilmstripItems();
 
-        // Candidate for deletion as Android Beam is deprecated in Android Q
-        setupNfcBeamPush();
-
         mLocalImagesObserver = new FilmstripContentObserver();
         mLocalVideosObserver = new FilmstripContentObserver();
 
@@ -2924,15 +2894,6 @@ public class CameraActivity extends QuickActivity
         return false;
     }
 
-    private void setNfcBeamPushUriFromData(FilmstripItem data) {
-        final Uri uri = data.getData().getUri();
-        if (uri != Uri.EMPTY) {
-            mNfcPushUris[0] = uri;
-        } else {
-            mNfcPushUris[0] = null;
-        }
-    }
-
     /**
      * Updates the visibility of the filmstrip bottom controls and action bar.
      */
@@ -2955,8 +2916,6 @@ public class CameraActivity extends QuickActivity
             return;
         }
 
-        setNfcBeamPushUriFromData(currentData);
-
         if (!mDataAdapter.isMetadataUpdatedAt(index)) {
             mDataAdapter.updateMetadataAt(index);
         }