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

Commit 2ffadb38 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

5/n: Move FaceService to biometrics directory 

Bug: 110387294

Test: builds, observable effect on devices (as expected)
Change-Id: Iaf0814c3c19aa9fa448e250cb3a161bd11fd935e
parent cb51b8b8

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,6 @@ 
    <protected-broadcast android:name="android.intent.action.TWILIGHT_CHANGED" />



    <protected-broadcast android:name="com.android.server.fingerprint.ACTION_LOCKOUT_RESET" />

    <protected-broadcast android:name="com.android.server.face.ACTION_LOCKOUT_RESET" />

    <protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />

    <protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />
@@ -600,6 +599,7 @@ 
    <protected-broadcast android:name="android.app.action.DATA_SHARING_RESTRICTION_CHANGED" />

    <protected-broadcast android:name="android.app.action.STATSD_STARTED" />

    <protected-broadcast android:name="com.android.server.biometrics.fingerprint.ACTION_LOCKOUT_RESET" />

    <protected-broadcast android:name="com.android.server.biometrics.face.ACTION_LOCKOUT_RESET" />



    <!-- For IdleController -->

    <protected-broadcast android:name="android.intent.action.DOCK_IDLE" />

services/core/java/com/android/server/face/AuthenticationClient.java→services/core/java/com/android/server/biometrics/face/AuthenticationClient.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.face;

package com.android.server.biometrics.face;



import android.hardware.biometrics.face.V1_0.IBiometricsFace;

import com.android.internal.logging.MetricsLogger;

services/core/java/com/android/server/face/ClientMonitor.java→services/core/java/com/android/server/biometrics/face/ClientMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.face;

package com.android.server.biometrics.face;



import android.Manifest;

import android.content.Context;

services/core/java/com/android/server/face/EnrollClient.java→services/core/java/com/android/server/biometrics/face/EnrollClient.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.face;

package com.android.server.biometrics.face;



import android.content.Context;

import android.hardware.biometrics.face.V1_0.IBiometricsFace;

services/core/java/com/android/server/face/FaceService.java→services/core/java/com/android/server/biometrics/face/FaceService.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.face;

package com.android.server.biometrics.face;



import static android.Manifest.permission.INTERACT_ACROSS_USERS;

import static android.Manifest.permission.MANAGE_FACE;
@@ -96,7 +96,7 @@ public class FaceService extends SystemService implements IHwBinder.DeathRecipie 
    private static final String FACE_DATA_DIR = "facedata";

    private static final int MSG_USER_SWITCHING = 10;

    private static final String ACTION_LOCKOUT_RESET =

            "com.android.server.face.ACTION_LOCKOUT_RESET";

            "com.android.server.biometrics.face.ACTION_LOCKOUT_RESET";



    private class PerformanceStats {

        int accept; // number of accepted faces