Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PhoneAccounts on boot completed" into udc-dev am: 05675e53c2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22959089

Change-Id: I8305e03b16943ec386f189b63052dedca16d8f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christine Franks
2023-05-11 21:23:59 +00:00
committed by Automerger Merge Worker
parent d1c2fd4cb9 05675e53c2
commit 2400888b3b
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -306,6 +306,7 @@ public class CompanionDeviceManagerService extends SystemService {
} else if (phase == PHASE_BOOT_COMPLETED) {
// Run the Inactive Association Removal job service daily.
InactiveAssociationsRemovalService.schedule(getContext());
mCrossDeviceSyncController.onBootCompleted();
}
}

29
services/companion/java/com/android/server/companion/datatransfer/contextsync/CrossDeviceSyncController.java
View File

@@ -146,6 +146,31 @@ public class CrossDeviceSyncController {
mPhoneAccountManager = new PhoneAccountManager(mContext);
}
/** Invoke set-up tasks that happen when boot is completed. */
public void onBootCompleted() {
if (!CompanionDeviceConfig.isEnabled(CompanionDeviceConfig.ENABLE_CONTEXT_SYNC_TELECOM)) {
return;
}
mPhoneAccountManager.onBootCompleted();
final TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
if (telecomManager.getCallCapablePhoneAccounts().size() != 0) {
final PhoneAccountHandle defaultOutgoingTelAccountHandle =
telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
if (defaultOutgoingTelAccountHandle != null) {
final PhoneAccount defaultOutgoingTelAccount = telecomManager.getPhoneAccount(
defaultOutgoingTelAccountHandle);
if (defaultOutgoingTelAccount != null) {
mCallFacilitators.add(
new CallMetadataSyncData.CallFacilitator(
defaultOutgoingTelAccount.getLabel().toString(),
FACILITATOR_ID_SYSTEM));
}
}
}
}
private void processCallCreateRequests(int associationId,
CallMetadataSyncData callMetadataSyncData) {
final Iterator<CallMetadataSyncData.CallCreateRequest> iterator =
@@ -546,6 +571,10 @@ public class CrossDeviceSyncController {
CallMetadataSyncConnectionService.class);
}
void onBootCompleted() {
mTelecomManager.clearPhoneAccounts();
}
PhoneAccountHandle getPhoneAccountHandle(int associationId, String appIdentifier) {
return mPhoneAccountHandles.get(
new PhoneAccountHandleIdentifier(associationId, appIdentifier));