Merge "Add placeholders for IrisManager/Service" (8d45688b) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@ java_defaults {
		"core/java/android/hardware/input/IInputManager.aidl",
		"core/java/android/hardware/input/IInputDevicesChangedListener.aidl",
		"core/java/android/hardware/input/ITabletModeChangedListener.aidl",
		"core/java/android/hardware/iris/IIrisService.aidl",
		"core/java/android/hardware/location/IActivityRecognitionHardware.aidl",
		"core/java/android/hardware/location/IActivityRecognitionHardwareClient.aidl",
		"core/java/android/hardware/location/IActivityRecognitionHardwareSink.aidl",

+14 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,8 @@ import android.hardware.fingerprint.IFingerprintService;
		import android.hardware.hdmi.HdmiControlManager;
		import android.hardware.hdmi.IHdmiControlService;
		import android.hardware.input.InputManager;
		import android.hardware.iris.IrisManager;
		import android.hardware.iris.IIrisService;
		import android.hardware.location.ContextHubManager;
		import android.hardware.radio.RadioManager;
		import android.hardware.usb.IUsbManager;
		@@ -836,6 +838,18 @@ final class SystemServiceRegistry {
		}
		});

		registerService(Context.IRIS_SERVICE, IrisManager.class,
		new CachedServiceFetcher<IrisManager>() {
		@Override
		public IrisManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		final IBinder binder =
		ServiceManager.getServiceOrThrow(Context.IRIS_SERVICE);
		IIrisService service = IIrisService.Stub.asInterface(binder);
		return new IrisManager(ctx.getOuterContext(), service);
		}
		});

		registerService(Context.BIOMETRIC_SERVICE, BiometricManager.class,
		new CachedServiceFetcher<BiometricManager>() {
		@Override

+11 −0

Original line number	Diff line number	Diff line
		@@ -3704,6 +3704,17 @@ public abstract class Context {
		*/
		public static final String FACE_SERVICE = "face";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.hardware.iris.IrisManager} for handling management
		* of iris authentication.
		*
		* @hide
		* @see #getSystemService
		* @see android.hardware.iris.IrisManager
		*/
		public static final String IRIS_SERVICE = "iris";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.hardware.biometrics.BiometricManager} for handling management

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.hardware.iris;

		/**
		* Communication channel from client to the iris service. These methods are all require the
		* MANAGE_BIOMETRIC signature permission.
		* @hide
		*/
		interface IIrisService {
		}
		No newline at end of file

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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.hardware.iris;

		import android.annotation.SystemService;
		import android.content.Context;

		/**
		* A class that coordinates access to the iris authentication hardware.
		* @hide
		*/
		@SystemService(Context.IRIS_SERVICE)
		public class IrisManager {

		/**
		* @hide
		*/
		public IrisManager(Context context, IIrisService service) {
		}
		}