diff options
author | Jim Miller <jaggies@google.com> | 2015-03-31 17:24:34 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2015-04-01 19:20:08 -0700 |
commit | ebbf205bc6e8292f74d8fc4652c70274a445f907 (patch) | |
tree | 872978a26983197fcf317af6dbdb2ba591650f5a /core/java/android | |
parent | 1b76e4b0db74855c17ce9b1d3c3f83669e3fd298 (diff) | |
download | frameworks_base-ebbf205bc6e8292f74d8fc4652c70274a445f907.zip frameworks_base-ebbf205bc6e8292f74d8fc4652c70274a445f907.tar.gz frameworks_base-ebbf205bc6e8292f74d8fc4652c70274a445f907.tar.bz2 |
Prepare to make Fingerprint API public.
- move fingerprint support files into hardware area
- move jni into services/core
Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 4 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/Fingerprint.aidl (renamed from core/java/android/service/fingerprint/Fingerprint.aidl) | 2 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/Fingerprint.java (renamed from core/java/android/service/fingerprint/Fingerprint.java) | 2 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java (renamed from core/java/android/service/fingerprint/FingerprintManager.java) | 4 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintUtils.java (renamed from core/java/android/service/fingerprint/FingerprintUtils.java) | 2 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/IFingerprintService.aidl (renamed from core/java/android/service/fingerprint/IFingerprintService.aidl) | 6 | ||||
-rw-r--r-- | core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl (renamed from core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl) | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index a0f40f6..b3aa6be 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -99,8 +99,8 @@ import android.os.Vibrator; import android.os.storage.StorageManager; import android.print.IPrintManager; import android.print.PrintManager; -import android.service.fingerprint.FingerprintManager; -import android.service.fingerprint.IFingerprintService; +import android.hardware.fingerprint.FingerprintManager; +import android.hardware.fingerprint.IFingerprintService; import android.service.persistentdata.IPersistentDataBlockService; import android.service.persistentdata.PersistentDataBlockManager; import android.telecom.TelecomManager; diff --git a/core/java/android/service/fingerprint/Fingerprint.aidl b/core/java/android/hardware/fingerprint/Fingerprint.aidl index c9fd989..4743354 100644 --- a/core/java/android/service/fingerprint/Fingerprint.aidl +++ b/core/java/android/hardware/fingerprint/Fingerprint.aidl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; // @hide parcelable Fingerprint; diff --git a/core/java/android/service/fingerprint/Fingerprint.java b/core/java/android/hardware/fingerprint/Fingerprint.java index 37552eb..c307634 100644 --- a/core/java/android/service/fingerprint/Fingerprint.java +++ b/core/java/android/hardware/fingerprint/Fingerprint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/java/android/service/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index bb90e40..e3572a2 100644 --- a/core/java/android/service/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.app.ActivityManagerNative; import android.content.ContentResolver; @@ -28,7 +28,7 @@ import android.os.Parcelable; import android.os.RemoteException; import android.os.UserHandle; import android.provider.Settings; -import android.service.fingerprint.FingerprintManager.EnrollmentCallback; +import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback; import android.util.Log; import android.util.Slog; diff --git a/core/java/android/service/fingerprint/FingerprintUtils.java b/core/java/android/hardware/fingerprint/FingerprintUtils.java index 62acbb9..ae3d4a4 100644 --- a/core/java/android/service/fingerprint/FingerprintUtils.java +++ b/core/java/android/hardware/fingerprint/FingerprintUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.content.ContentResolver; import android.provider.Settings; diff --git a/core/java/android/service/fingerprint/IFingerprintService.aidl b/core/java/android/hardware/fingerprint/IFingerprintService.aidl index e5d3ad4..c5a45e2 100644 --- a/core/java/android/service/fingerprint/IFingerprintService.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintService.aidl @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.os.Bundle; -import android.service.fingerprint.IFingerprintServiceReceiver; -import android.service.fingerprint.Fingerprint; +import android.hardware.fingerprint.IFingerprintServiceReceiver; +import android.hardware.fingerprint.Fingerprint; import java.util.List; /** diff --git a/core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl index f025064..e82395f 100644 --- a/core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl +++ b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.service.fingerprint; +package android.hardware.fingerprint; import android.os.Bundle; import android.os.UserHandle; |