Remove Hidden APIs usage
- remove hidden API violations
Change-Id: I616ea420ff1b3cea22bb75f836d9a0c1bdbc5619
CRs-Fixed: 2583899
diff --git a/ims/ims-ext-common/Android.bp b/ims/ims-ext-common/Android.bp
index fa23080..c9b0215 100644
--- a/ims/ims-ext-common/Android.bp
+++ b/ims/ims-ext-common/Android.bp
@@ -2,7 +2,7 @@
java_library {
name: "ims-ext-common",
installable: true,
-
+ sdk_version: "system_current",
aidl: {
local_include_dirs: ["src/org"],
include_dirs: [
diff --git a/ims/ims-ext-common/src/org/codeaurora/ims/QtiImsExtManager.java b/ims/ims-ext-common/src/org/codeaurora/ims/QtiImsExtManager.java
index 5f416db..2d31ea3 100644
--- a/ims/ims-ext-common/src/org/codeaurora/ims/QtiImsExtManager.java
+++ b/ims/ims-ext-common/src/org/codeaurora/ims/QtiImsExtManager.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -34,7 +34,7 @@
import android.telephony.TelephonyManager;
import android.util.Log;
-import com.android.ims.ImsConfig;
+import android.telephony.ims.stub.ImsConfigImplBase;
import java.util.ArrayList;
@@ -248,7 +248,7 @@
public int setRcsAppConfig(int phoneId, int defaultSmsApp) throws QtiImsException {
validateInvariants(phoneId);
- int ret = ImsConfig.OperationStatusConstants.UNKNOWN;
+ int ret = ImsConfigImplBase.CONFIG_RESULT_UNKNOWN;
try {
ret = mQtiImsExt.setRcsAppConfig(phoneId, defaultSmsApp);
} catch(RemoteException e) {
@@ -272,7 +272,7 @@
public int setVvmAppConfig(int phoneId, int defaultVvmApp) throws QtiImsException {
validateInvariants(phoneId);
- int ret = ImsConfig.OperationStatusConstants.UNKNOWN;
+ int ret = ImsConfigImplBase.CONFIG_RESULT_UNKNOWN;
try {
ret = mQtiImsExt.setVvmAppConfig(phoneId, defaultVvmApp);
} catch(RemoteException e) {
diff --git a/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCallUtils.java b/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCallUtils.java
index 74245c7..a001886 100644
--- a/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCallUtils.java
+++ b/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCallUtils.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.ims.ImsConfig;
+import android.telephony.ims.ProvisioningManager;
import org.codeaurora.ims.QtiCallConstants;
@@ -51,6 +51,8 @@
return android.provider.Settings.Global.getInt(
context.getContentResolver(),
QtiCallConstants.IMS_TO_CS_RETRY_ENABLED,
- ImsConfig.FeatureValueConstants.ON) == ImsConfig.FeatureValueConstants.ON;
+ ProvisioningManager.PROVISIONING_VALUE_ENABLED) ==
+ ProvisioningManager.PROVISIONING_VALUE_ENABLED;
+
}
}
diff --git a/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCarrierConfigHelper.java b/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCarrierConfigHelper.java
index fdbf6c0..83b49e1 100644
--- a/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCarrierConfigHelper.java
+++ b/ims/ims-ext-common/src/org/codeaurora/ims/utils/QtiCarrierConfigHelper.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -39,8 +39,6 @@
import android.telephony.TelephonyManager;
import android.util.Log;
-import com.android.internal.telephony.PhoneConstants;
-
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ConcurrentHashMap;
import java.util.List;
@@ -66,7 +64,7 @@
if (intent != null && intent.getAction()
.equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {
int phoneId = intent.getIntExtra(CarrierConfigManager.EXTRA_SLOT_INDEX,
- SubscriptionManager.INVALID_PHONE_INDEX);
+ SubscriptionManager.INVALID_SIM_SLOT_INDEX);
if (mSubscriptionManager != null) {
SubscriptionInfo subInfo = mSubscriptionManager
.getActiveSubscriptionInfoForSimSlotIndex(phoneId);