From 61e6b8aaa7b3832524efa6b8aff634d35c4f9fd3 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Sat, 19 Sep 2020 20:06:49 +0100
Subject: [PATCH] sdm845-common: Make IFAAManager compile again

Change-Id: Iae2d1004bd1b3c939b552f09ea994ae87d71d73e
---
 org.ifaa.android.manager/Android.bp                         | 5 ++++-
 .../src/org/ifaa/android/manager/IFAAManager.java           | 2 +-
 .../src/org/ifaa/android/manager/IFAAManagerFactory.java    | 2 +-
 .../src/org/ifaa/android/manager/IFAAManagerImpl.java       | 6 +++---
 .../src/org/ifaa/android/manager/IFAAManagerV2.java         | 2 +-
 .../src/org/ifaa/android/manager/IFAAManagerV3.java         | 2 +-
 .../src/org/ifaa/android/manager/IFAAManagerV4.java         | 2 +-
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/org.ifaa.android.manager/Android.bp b/org.ifaa.android.manager/Android.bp
index a77c477..74904e0 100644
--- a/org.ifaa.android.manager/Android.bp
+++ b/org.ifaa.android.manager/Android.bp
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2017-2019 The LineageOS Project
+* Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@ java_library {
         "src/**/*.java",
         "src/**/I*.aidl",
     ],
+    libs: [
+        "unsupportedappusage",
+    ],
     aidl: {
         local_include_dirs: ["src"],
     },
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java
index 2b73abb..82cb659 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManager.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.SystemProperties;
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
index a948fd2..3697874 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerFactory.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 
 public class IFAAManagerFactory {
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerImpl.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerImpl.java
index 01d7fda..120aed9 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerImpl.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerImpl.java
@@ -4,7 +4,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.net.wifi.WifiEnterpriseConfig;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.HwBinder;
@@ -36,6 +35,8 @@ public class IFAAManagerImpl extends IFAAManagerV4 {
 
     private static volatile IFAAManagerImpl INSTANCE = null;
 
+    private static final String CA_CERT_ALIAS_DELIMITER = " ";
+
     private static final String INTERFACE_DESCRIPTOR =
             "vendor.xiaomi.hardware.mlipay@1.0::IMlipayService";
     private static final String SERVICE_NAME =
@@ -156,8 +157,7 @@ public class IFAAManagerImpl extends IFAAManagerV4 {
     }
 
     public String getExtInfo(int authType, String keyExtInfo) {
-        Slog.i(TAG, "getExtInfo:" + authType + WifiEnterpriseConfig.CA_CERT_ALIAS_DELIMITER +
-                keyExtInfo);
+        Slog.i(TAG, "getExtInfo:" + authType + CA_CERT_ALIAS_DELIMITER + keyExtInfo);
         return initExtString();
     }
 
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
index 7a62da1..d634ef0 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV2.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 
 public abstract class IFAAManagerV2 extends IFAAManager {
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
index a33d3d9..328fd75 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV3.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 
 public abstract class IFAAManagerV3 extends IFAAManagerV2 {
     @UnsupportedAppUsage
diff --git a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java
index 02689d8..2c47557 100644
--- a/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java
+++ b/org.ifaa.android.manager/src/org/ifaa/android/manager/IFAAManagerV4.java
@@ -1,6 +1,6 @@
 package org.ifaa.android.manager;
 
-import android.annotation.UnsupportedAppUsage;
+import android.compat.annotation.UnsupportedAppUsage;
 
 public abstract class IFAAManagerV4 extends IFAAManagerV3 {
     @UnsupportedAppUsage