Merge "Update Provisioning API name and doc per API review" am: 0d237aa7b9 am: 5e72ffb1d5 am: aa0e3c90ef
Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1562813
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27495dc23ee4ed8a731451b88f5cd5670a5d2aaf
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 24c55cf..989899d 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9818,10 +9818,10 @@
* Register RCS provisioning callback.
*/
@Override
- public void registerRcsProvisioningChangedCallback(int subId,
+ public void registerRcsProvisioningCallback(int subId,
IRcsConfigCallback callback) {
TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges(mApp, subId,
- Binder.getCallingUid(), "registerRcsProvisioningChangedCallback",
+ Binder.getCallingUid(), "registerRcsProvisioningCallback",
Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION,
permission.READ_PRIVILEGED_PHONE_STATE);
@@ -9836,7 +9836,7 @@
final long identity = Binder.clearCallingIdentity();
try {
if (!RcsProvisioningMonitor.getInstance()
- .registerRcsProvisioningChangedCallback(subId, callback)) {
+ .registerRcsProvisioningCallback(subId, callback)) {
throw new ServiceSpecificException(ImsException.CODE_ERROR_UNSUPPORTED_OPERATION,
"Service not available for the subscription.");
}
@@ -9849,10 +9849,10 @@
* Unregister RCS provisioning callback.
*/
@Override
- public void unregisterRcsProvisioningChangedCallback(int subId,
+ public void unregisterRcsProvisioningCallback(int subId,
IRcsConfigCallback callback) {
TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges(mApp, subId,
- Binder.getCallingUid(), "unregisterRcsProvisioningChangedCallback",
+ Binder.getCallingUid(), "unregisterRcsProvisioningCallback",
Manifest.permission.PERFORM_IMS_SINGLE_REGISTRATION,
permission.READ_PRIVILEGED_PHONE_STATE);
@@ -9867,7 +9867,7 @@
final long identity = Binder.clearCallingIdentity();
try {
RcsProvisioningMonitor.getInstance()
- .unregisterRcsProvisioningChangedCallback(subId, callback);
+ .unregisterRcsProvisioningCallback(subId, callback);
} finally {
Binder.restoreCallingIdentity(identity);
}
diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index dcf8e92..becad47 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -558,13 +558,13 @@
}
/**
- * Called when the application registers rcs provisioning changed callback
+ * Called when the application registers rcs provisioning callback
*/
- public boolean registerRcsProvisioningChangedCallback(int subId, IRcsConfigCallback cb) {
+ public boolean registerRcsProvisioningCallback(int subId, IRcsConfigCallback cb) {
RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
// should not happen in normal case
if (info == null) {
- logd("fail to register rcs provisioning changed due to subscription unavailable");
+ logd("fail to register rcs provisioning callback due to subscription unavailable");
return false;
}
@@ -572,9 +572,9 @@
}
/**
- * Called when the application unregisters rcs provisioning changed callback
+ * Called when the application unregisters rcs provisioning callback
*/
- public boolean unregisterRcsProvisioningChangedCallback(int subId, IRcsConfigCallback cb) {
+ public boolean unregisterRcsProvisioningCallback(int subId, IRcsConfigCallback cb) {
RcsProvisioningInfo info = mRcsProvisioningInfos.get(subId);
// should not happen in normal case
if (info == null) {
diff --git a/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/ProvisioningActivity.java b/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/ProvisioningActivity.java
index aa90487..bae4a1a 100644
--- a/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/ProvisioningActivity.java
+++ b/testapps/TestRcsApp/TestApp/src/com/google/android/sample/rcsclient/ProvisioningActivity.java
@@ -130,7 +130,7 @@
super.onDestroy();
this.unregisterReceiver(mSingleRegCapabilityReceiver);
if (mIsRegistered) {
- mProvisioningManager.unregisterRcsProvisioningChangedCallback(mCallback);
+ mProvisioningManager.unregisterRcsProvisioningCallback(mCallback);
}
}
@@ -157,9 +157,9 @@
Log.i(TAG, "Using configuration: " + getDefaultClientConfiguration());
try {
Log.i(TAG, "setRcsClientConfiguration()");
- Log.i(TAG, "registerRcsProvisioningChangedCallback()");
+ Log.i(TAG, "registerRcsProvisioningCallback()");
mProvisioningManager.setRcsClientConfiguration(getDefaultClientConfiguration());
- mProvisioningManager.registerRcsProvisioningChangedCallback(mExecutorService,
+ mProvisioningManager.registerRcsProvisioningCallback(mExecutorService,
mCallback);
mIsRegistered = true;
} catch (ImsException e) {
@@ -173,7 +173,7 @@
});
mUnRegisterButton.setOnClickListener(view -> {
if (mProvisioningManager != null) {
- mProvisioningManager.unregisterRcsProvisioningChangedCallback(mCallback);
+ mProvisioningManager.unregisterRcsProvisioningCallback(mCallback);
setClickable(mRegisterButton, false);
setClickable(mRegisterButton, true);
mIsRegistered = false;
diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/provisioning/StaticConfigProvisioningController.java b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/provisioning/StaticConfigProvisioningController.java
index 350f43c..83f41d4 100644
--- a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/provisioning/StaticConfigProvisioningController.java
+++ b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/provisioning/StaticConfigProvisioningController.java
@@ -24,15 +24,15 @@
import android.telephony.ims.RcsClientConfiguration;
import android.util.Log;
-import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.RequiresPermission;
import androidx.annotation.VisibleForTesting;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
/**
* "Fake" provisioning implementation for supplying a static config when testing ProvisioningManager
* is unnecessary. State changes are invoked manually.
@@ -136,7 +136,7 @@
Log.i(TAG, "Registering the callback.");
synchronized (this) {
- provisioningManager.registerRcsProvisioningChangedCallback(executorService, callback);
+ provisioningManager.registerRcsProvisioningCallback(executorService, callback);
storedCallback = Optional.of(callback);
}
}
@@ -147,7 +147,7 @@
RcsProvisioningCallback callback =
storedCallback.orElseThrow(
() -> new IllegalStateException("No callback present."));
- provisioningManager.unregisterRcsProvisioningChangedCallback(callback);
+ provisioningManager.unregisterRcsProvisioningCallback(callback);
storedCallback = Optional.empty();
}
}
diff --git a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
index f77dd55..28c4390 100644
--- a/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
+++ b/tests/src/com/android/phone/RcsProvisioningMonitorTest.java
@@ -475,13 +475,13 @@
public void testRegisterThenUnregisterCallback() throws Exception {
createMonitor(1);
- boolean result = mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ boolean result = mRcsProvisioningMonitor.registerRcsProvisioningCallback(
FAKE_SUB_ID_BASE, mCallback);
assertTrue(result);
verify(mIImsConfig, times(1)).addRcsConfigCallback(eq(mCallback));
- result = mRcsProvisioningMonitor.unregisterRcsProvisioningChangedCallback(
+ result = mRcsProvisioningMonitor.unregisterRcsProvisioningCallback(
FAKE_SUB_ID_BASE, mCallback);
assertTrue(result);
@@ -494,7 +494,7 @@
public void testCallbackRemovedWhenSubInfoChanged() throws Exception {
createMonitor(1);
- boolean result = mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ boolean result = mRcsProvisioningMonitor.registerRcsProvisioningCallback(
FAKE_SUB_ID_BASE, mCallback);
makeFakeActiveSubIds(0);
mExecutor.execute(() -> mSubChangedListener.onSubscriptionsChanged());
@@ -510,7 +510,7 @@
public void testCallbackRemovedWhenDmaChanged() throws Exception {
createMonitor(1);
- boolean result = mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ boolean result = mRcsProvisioningMonitor.registerRcsProvisioningCallback(
FAKE_SUB_ID_BASE, mCallback);
updateDefaultMessageApplication(DEFAULT_MESSAGING_APP2);
processAllMessages();
@@ -524,7 +524,7 @@
@SmallTest
public void testRcsConnectedAndDisconnected() throws Exception {
createMonitor(1);
- mRcsProvisioningMonitor.registerRcsProvisioningChangedCallback(
+ mRcsProvisioningMonitor.registerRcsProvisioningCallback(
FAKE_SUB_ID_BASE, mCallback);
verify(mIImsConfig, times(1))