Merge "Revert^2 "Remove deprecated Beam APIs"" (d0f581d0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -27503,24 +27503,15 @@ package android.nfc {

		public final class NfcAdapter {
		method public void disableForegroundDispatch(android.app.Activity);
		method @Deprecated public void disableForegroundNdefPush(android.app.Activity);
		method public void disableReaderMode(android.app.Activity);
		method public void enableForegroundDispatch(android.app.Activity, android.app.PendingIntent, android.content.IntentFilter[], String[][]);
		method @Deprecated public void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
		method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
		method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
		method @Nullable public android.nfc.NfcAntennaInfo getNfcAntennaInfo();
		method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
		method @Deprecated public boolean invokeBeam(android.app.Activity);
		method public boolean isEnabled();
		method @Deprecated public boolean isNdefPushEnabled();
		method public boolean isSecureNfcEnabled();
		method public boolean isSecureNfcSupported();
		method @Deprecated public void setBeamPushUris(android.net.Uri[], android.app.Activity);
		method @Deprecated public void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity);
		method @Deprecated public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...);
		method @Deprecated public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...);
		method @Deprecated public void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...);
		field public static final String ACTION_ADAPTER_STATE_CHANGED = "android.nfc.action.ADAPTER_STATE_CHANGED";
		field public static final String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED";
		field @RequiresPermission(android.Manifest.permission.NFC_PREFERRED_PAYMENT_INFO) public static final String ACTION_PREFERRED_PAYMENT_CHANGED = "android.nfc.action.PREFERRED_PAYMENT_CHANGED";

core/api/removed.txt

+16 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,22 @@ package android.net {

		}

		package android.nfc {

		public final class NfcAdapter {
		method @Deprecated public void disableForegroundNdefPush(android.app.Activity);
		method @Deprecated public void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
		method @Deprecated public boolean invokeBeam(android.app.Activity);
		method @Deprecated public boolean isNdefPushEnabled();
		method @Deprecated public void setBeamPushUris(android.net.Uri[], android.app.Activity);
		method @Deprecated public void setBeamPushUrisCallback(android.nfc.NfcAdapter.CreateBeamUrisCallback, android.app.Activity);
		method @Deprecated public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, android.app.Activity...);
		method @Deprecated public void setNdefPushMessageCallback(android.nfc.NfcAdapter.CreateNdefMessageCallback, android.app.Activity, android.app.Activity...);
		method @Deprecated public void setOnNdefPushCompleteCallback(android.nfc.NfcAdapter.OnNdefPushCompleteCallback, android.app.Activity, android.app.Activity...);
		}

		}

		package android.os {

		public class BatteryManager {

core/api/system-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -9112,9 +9112,7 @@ package android.nfc {
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean addNfcUnlockHandler(android.nfc.NfcAdapter.NfcUnlockHandler, String[]);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disable();
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disable(boolean);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disableNdefPush();
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enable();
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableNdefPush();
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableSecureNfc(boolean);
		method @NonNull @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public java.util.Map<java.lang.String,java.lang.Boolean> getTagIntentAppPreferenceForUser(int);
		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean isControllerAlwaysOn();
		@@ -9123,10 +9121,8 @@ package android.nfc {
		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void registerControllerAlwaysOnListener(@NonNull java.util.concurrent.Executor, @NonNull android.nfc.NfcAdapter.ControllerAlwaysOnListener);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean removeNfcUnlockHandler(android.nfc.NfcAdapter.NfcUnlockHandler);
		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public boolean setControllerAlwaysOn(boolean);
		method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, int);
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public int setTagIntentAppPreferenceForUser(int, @NonNull String, boolean);
		method @RequiresPermission(android.Manifest.permission.NFC_SET_CONTROLLER_ALWAYS_ON) public void unregisterControllerAlwaysOnListener(@NonNull android.nfc.NfcAdapter.ControllerAlwaysOnListener);
		field public static final int FLAG_NDEF_PUSH_NO_CONFIRM = 1; // 0x1
		field public static final int TAG_INTENT_APP_PREF_RESULT_PACKAGE_NOT_FOUND = -1; // 0xffffffff
		field public static final int TAG_INTENT_APP_PREF_RESULT_SUCCESS = 0; // 0x0
		field public static final int TAG_INTENT_APP_PREF_RESULT_UNAVAILABLE = -2; // 0xfffffffe

core/api/system-removed.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,17 @@ package android.media.tv {

		}

		package android.nfc {

		public final class NfcAdapter {
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean disableNdefPush();
		method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public boolean enableNdefPush();
		method public void setNdefPushMessage(android.nfc.NdefMessage, android.app.Activity, int);
		field public static final int FLAG_NDEF_PUSH_NO_CONFIRM = 1; // 0x1
		}

		}

		package android.os {

		public class Build {

core/java/android/nfc/BeamShareData.aidl

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.nfc;

		parcelable BeamShareData;