Refactor of Telephony dependencies
Test: verify RCS registration to network
Change-Id: I58dd070e7ede11b42bba7e72933e63d3d9602e5a
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
index b93b184..19a802f 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresencePublication.java
@@ -211,20 +211,18 @@
sPresencePublication = this;
}
- public void updatePresencePublisher(int subId, PresencePublisher presencePublisher) {
+ public void updatePresencePublisher(PresencePublisher presencePublisher) {
synchronized(mSyncObj) {
- logger.debug("Update PresencePublisher: subId=" + subId);
+ logger.debug("Update PresencePublisher");
this.mPresencePublisher = presencePublisher;
}
- handleAssociatedSubscriptionChanged(subId);
}
- public void removePresencePublisher(int subId) {
+ public void removePresencePublisher() {
synchronized(mSyncObj) {
- logger.debug("Remove PresencePublisher: subId=" + subId);
+ logger.debug("Remove PresencePublisher");
this.mPresencePublisher = null;
}
- handleAssociatedSubscriptionChanged(subId);
}
private void requestPublishIfSubscriptionReady() {
diff --git a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
index e7b1269..624ceb4 100644
--- a/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
+++ b/rcs/rcsservice/src/com/android/service/ims/presence/PresenceSubscriber.java
@@ -70,20 +70,18 @@
mConfigRcsProvisionErrorOnSubscribeResponse = configRcsProvisionErrorOnSubscribeResponse;
}
- public void updatePresenceSubscriber(int subId, SubscribePublisher subscriber) {
+ public void updatePresenceSubscriber(SubscribePublisher subscriber) {
synchronized(mSubscriberLock) {
- logger.print("Update PresencePublisher: subId=" + subId);
+ logger.print("Update PresencePublisher");
this.mSubscriber = subscriber;
}
- handleAssociatedSubscriptionChanged(subId);
}
- public void removePresenceSubscriber(int subId) {
+ public void removePresenceSubscriber() {
synchronized(mSubscriberLock) {
- logger.print("Remove PresencePublisher: subId=" + subId);
+ logger.print("Remove PresencePublisher:");
this.mSubscriber = null;
}
- handleAssociatedSubscriptionChanged(subId);
}
public void handleAssociatedSubscriptionChanged(int newSubId) {
