Remove common biometric directory

Bug: 72825012

Test: Builds
Test: Fingerprint settings / keyguard still works
Change-Id: I6f3f93aeabd29b3f712285c2b99121a9401011c2

17 files changed, 24 insertions, 25 deletions

diff --git a/services/core/java/com/android/server/biometrics/common/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
index a9cf96368a2b..06462a2dcd5a 100644
--- a/services/core/java/com/android/server/biometrics/common/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index 5603f2f469b7..9b224446723b 100644
--- a/services/core/java/com/android/server/biometrics/common/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -11,10 +11,10 @@
  * 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.
+ * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE;
 
diff --git a/services/core/java/com/android/server/biometrics/common/BiometricUserState.java b/services/core/java/com/android/server/biometrics/BiometricUserState.java
index 53eaac0670a4..979ce3a26815 100644
--- a/services/core/java/com/android/server/biometrics/common/BiometricUserState.java
+++ b/services/core/java/com/android/server/biometrics/BiometricUserState.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/BiometricUtils.java b/services/core/java/com/android/server/biometrics/BiometricUtils.java
index 8f076f169d8a..4ff743a6cef6 100644
--- a/services/core/java/com/android/server/biometrics/common/BiometricUtils.java
+++ b/services/core/java/com/android/server/biometrics/BiometricUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/ClientMonitor.java b/services/core/java/com/android/server/biometrics/ClientMonitor.java
index 14867541d5b5..d30bed23ea97 100644
--- a/services/core/java/com/android/server/biometrics/common/ClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/ClientMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/EnrollClient.java b/services/core/java/com/android/server/biometrics/EnrollClient.java
index aee772b15575..c305eca682be 100644
--- a/services/core/java/com/android/server/biometrics/common/EnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/EnrollClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/EnumerateClient.java b/services/core/java/com/android/server/biometrics/EnumerateClient.java
index ee40ee920b8b..b76376962c0e 100644
--- a/services/core/java/com/android/server/biometrics/common/EnumerateClient.java
+++ b/services/core/java/com/android/server/biometrics/EnumerateClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/common/Metrics.java b/services/core/java/com/android/server/biometrics/Metrics.java
index eb1a1f82de38..02e44e94e395 100644
--- a/services/core/java/com/android/server/biometrics/common/Metrics.java
+++ b/services/core/java/com/android/server/biometrics/Metrics.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 public interface Metrics {
     /** The log tag */
diff --git a/services/core/java/com/android/server/biometrics/common/RemovalClient.java b/services/core/java/com/android/server/biometrics/RemovalClient.java
index 27c42ab20a4d..3bf7f0404b1e 100644
--- a/services/core/java/com/android/server/biometrics/common/RemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/RemovalClient.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.server.biometrics.common;
+package com.android.server.biometrics;
 
 import android.content.Context;
 import android.hardware.biometrics.BiometricAuthenticator;
diff --git a/services/core/java/com/android/server/biometrics/face/FaceMetrics.java b/services/core/java/com/android/server/biometrics/face/FaceMetrics.java
index 4c907b1fde07..1c5cd5a84402 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceMetrics.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceMetrics.java
@@ -17,7 +17,7 @@
 package com.android.server.biometrics.face;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.Metrics;
 
 public class FaceMetrics implements Metrics {
     @Override
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index f8ccef5c73c1..c43d587f64c7 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -51,9 +51,9 @@ import com.android.internal.logging.MetricsLogger;
 import com.android.internal.statusbar.IStatusBarService;
 import com.android.internal.util.DumpUtils;
 import com.android.server.SystemServerInitThreadPool;
-import com.android.server.biometrics.common.BiometricService;
-import com.android.server.biometrics.common.BiometricUtils;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.BiometricService;
+import com.android.server.biometrics.BiometricUtils;
+import com.android.server.biometrics.Metrics;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/services/core/java/com/android/server/biometrics/face/FaceUserState.java b/services/core/java/com/android/server/biometrics/face/FaceUserState.java
index c438bfbdd8fa..65c942d9fabc 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceUserState.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceUserState.java
@@ -24,7 +24,7 @@ import android.util.Slog;
 import android.util.Xml;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUserState;
+import com.android.server.biometrics.BiometricUserState;
 
 import libcore.io.IoUtils;
 
diff --git a/services/core/java/com/android/server/biometrics/face/FaceUtils.java b/services/core/java/com/android/server/biometrics/face/FaceUtils.java
index a7e85e04e3b1..63ff548ed293 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceUtils.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceUtils.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
 import android.util.SparseArray;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUtils;
+import com.android.server.biometrics.BiometricUtils;
 
 import java.util.List;
 
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java
index ba8b3b314c00..a1115c8bcfa7 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintMetrics.java
@@ -17,7 +17,7 @@
 package com.android.server.biometrics.fingerprint;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.Metrics;
 
 public class FingerprintMetrics implements Metrics {
 
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
index 64b248e16554..bbdf86c94f63 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
@@ -42,7 +42,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
-import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.SELinux;
 import android.os.ServiceManager;
@@ -56,11 +55,11 @@ import com.android.internal.logging.MetricsLogger;
 import com.android.internal.statusbar.IStatusBarService;
 import com.android.internal.util.DumpUtils;
 import com.android.server.SystemServerInitThreadPool;
-import com.android.server.biometrics.common.BiometricService;
-import com.android.server.biometrics.common.BiometricUtils;
-import com.android.server.biometrics.common.ClientMonitor;
-import com.android.server.biometrics.common.EnumerateClient;
-import com.android.server.biometrics.common.Metrics;
+import com.android.server.biometrics.BiometricService;
+import com.android.server.biometrics.BiometricUtils;
+import com.android.server.biometrics.ClientMonitor;
+import com.android.server.biometrics.EnumerateClient;
+import com.android.server.biometrics.Metrics;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java
index 9e34ee80d383..25da9785d402 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUserState.java
@@ -24,7 +24,7 @@ import android.util.Slog;
 import android.util.Xml;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUserState;
+import com.android.server.biometrics.BiometricUserState;
 
 import libcore.io.IoUtils;
 
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
index 41216e972ebd..a05606b1d154 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintUtils.java
@@ -23,7 +23,7 @@ import android.text.TextUtils;
 import android.util.SparseArray;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.server.biometrics.common.BiometricUtils;
+import com.android.server.biometrics.BiometricUtils;
 
 import java.util.List;