Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" (94a17b5f) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,6 @@ LOCAL_SRC_FILES += \
		core/java/android/nfc/INfcAdapterExtras.aidl \
		core/java/android/nfc/INfcTag.aidl \
		core/java/android/nfc/INfcCardEmulation.aidl \
		core/java/android/nfc/INfcUnlockSettings.aidl \
		core/java/android/os/IBatteryPropertiesListener.aidl \
		core/java/android/os/IBatteryPropertiesRegistrar.aidl \
		core/java/android/os/ICancellationSignal.aidl \

api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -17574,11 +17574,6 @@ package android.nfc {
		method public android.nfc.NfcAdapter getDefaultAdapter();
		}

		public class NfcUnlock {
		method public static synchronized android.nfc.NfcUnlock getInstance(android.nfc.NfcAdapter);
		method public boolean getNfcUnlockEnabled();
		}

		public final class Tag implements android.os.Parcelable {
		method public int describeContents();
		method public byte[] getId();
		@@ -23939,7 +23934,6 @@ package android.provider {
		field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
		field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
		field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
		field public static final java.lang.String NFC_UNLOCK_ENABLED = "nfc_unlock_enabled";
		field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
		field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";
		field public static final java.lang.String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url";

core/java/android/nfc/INfcAdapter.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.nfc.IAppCallback;
		import android.nfc.INfcAdapterExtras;
		import android.nfc.INfcTag;
		import android.nfc.INfcCardEmulation;
		import android.nfc.INfcUnlockSettings;
		import android.os.Bundle;

		/**
		@@ -36,7 +35,6 @@ interface INfcAdapter
		INfcTag getNfcTagInterface();
		INfcCardEmulation getNfcCardEmulationInterface();
		INfcAdapterExtras getNfcAdapterExtrasInterface(in String pkg);
		INfcUnlockSettings getNfcUnlockSettingsInterface();

		int getState();
		boolean disable(boolean saveState);

core/java/android/nfc/INfcUnlockSettings.aidl

deleted100644 → 0

+0 −70

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;

		import android.nfc.Tag;
		import java.util.List;

		/**
		* Interface to NFC unlock functionality.
		*
		* @hide
		*/
		interface INfcUnlockSettings {

		/**
		* Checks the validity of the tag and attempts to unlock the screen.
		*
		* @return true if the screen was successfuly unlocked.
		*/
		boolean tryUnlock(int userId, in Tag tag);

		/**
		* Registers the given tag as an unlock tag. Subsequent calls to {@code tryUnlock}
		* with the same {@code tag} should succeed.
		*
		* @return true if the tag was successfully registered.
		*/
		boolean registerTag(int userId, in Tag tag);

		/**
		* Deregisters the tag with the corresponding timestamp.
		* Subsequent calls to {@code tryUnlock} with the same tag should fail.
		*
		* @return true if the tag was successfully deleted.
		*/
		boolean deregisterTag(int userId, long timestamp);

		/**
		* Used for user-visible rendering of registered tags.
		*
		* @return a list of the times in millis since epoch when the registered tags were paired.
		*/
		long[] getTagRegistryTimes(int userId);

		/**
		* Determines the state of the NFC unlock feature.
		*
		* @return true if NFC unlock is enabled.
		*/
		boolean getNfcUnlockEnabled(int userId);

		/**
		* Sets the state [ON \| OFF] of the NFC unlock feature.
		*/
		void setNfcUnlockEnabled(int userId, boolean enabled);
		}

core/java/android/nfc/NfcAdapter.java

+0 −24

Original line number	Diff line number	Diff line
		@@ -292,7 +292,6 @@ public final class NfcAdapter {
		static INfcAdapter sService;
		static INfcTag sTagService;
		static INfcCardEmulation sCardEmulationService;
		static INfcUnlockSettings sNfcUnlockSettingsService;

		/**
		* The NfcAdapter object for each application context.
		@@ -433,13 +432,6 @@ public final class NfcAdapter {
		throw new UnsupportedOperationException();
		}

		try {
		sNfcUnlockSettingsService = sService.getNfcUnlockSettingsInterface();
		} catch (RemoteException e) {
		Log.e(TAG, "could not retrieve NFC unlock settings service");
		sNfcUnlockSettingsService = null;
		}

		sIsInitialized = true;
		}
		if (context == null) {
		@@ -556,22 +548,6 @@ public final class NfcAdapter {
		return sCardEmulationService;
		}

		/**
		* Returns the binder interface to the NFC unlock service.
		*
		* @throws UnsupportedOperationException if the service is not available.
		* @hide
		*/
		public INfcUnlockSettings getNfcUnlockSettingsService() throws UnsupportedOperationException {
		isEnabled();

		if (sNfcUnlockSettingsService == null) {
		throw new UnsupportedOperationException("NfcUnlockSettingsService not available");
		}

		return sNfcUnlockSettingsService;
		}

		/**
		* NFC service dead - attempt best effort recovery
		* @hide