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

Commit ebbf205b authored by Jim Miller's avatar Jim Miller
Browse files

Prepare to make Fingerprint API public. 

- move fingerprint support files into hardware area
- move jni into services/core

Change-Id: I48a8e43d6d328fb66d79919c255e4c44e984b4d1
parent 1b76e4b0

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/display/IDisplayManager.aidl \

	core/java/android/hardware/display/IDisplayManagerCallback.aidl \

	core/java/android/hardware/display/IVirtualDisplayCallback.aidl \

	core/java/android/hardware/fingerprint/IFingerprintService.aidl \

	core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl \

	core/java/android/hardware/hdmi/IHdmiControlCallback.aidl \

	core/java/android/hardware/hdmi/IHdmiControlService.aidl \

	core/java/android/hardware/hdmi/IHdmiDeviceEventListener.aidl \
@@ -227,8 +229,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/service/dreams/IDreamManager.aidl \

	core/java/android/service/dreams/IDreamService.aidl \

	core/java/android/service/persistentdata/IPersistentDataBlockService.aidl \

	core/java/android/service/fingerprint/IFingerprintService.aidl \

	core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl \

	core/java/android/service/trust/ITrustAgentService.aidl \

	core/java/android/service/trust/ITrustAgentServiceCallback.aidl \

	core/java/android/service/voice/IVoiceInteractionService.aidl \

core/java/android/app/SystemServiceRegistry.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/java/android/service/fingerprint/Fingerprint.aidl→core/java/android/hardware/fingerprint/Fingerprint.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/service/fingerprint/Fingerprint.java→core/java/android/hardware/fingerprint/Fingerprint.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/service/fingerprint/FingerprintManager.java→core/java/android/hardware/fingerprint/FingerprintManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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;