Merge "Add PhoneAccounts on boot completed" into udc-dev (05675e53) · Commits · e / os / android_frameworks_base

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −0

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

services/companion/java/com/android/server/companion/datatransfer/contextsync/CrossDeviceSyncController.java

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,31 @@ public class CrossDeviceSyncController {
	mPhoneAccountManager = new PhoneAccountManager(mContext);		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,		private void processCallCreateRequests(int associationId,
	CallMetadataSyncData callMetadataSyncData) {		CallMetadataSyncData callMetadataSyncData) {
	final Iterator<CallMetadataSyncData.CallCreateRequest> iterator =		final Iterator<CallMetadataSyncData.CallCreateRequest> iterator =
	@@ -546,6 +571,10 @@ public class CrossDeviceSyncController {
	CallMetadataSyncConnectionService.class);		CallMetadataSyncConnectionService.class);
	}		}

			void onBootCompleted() {
			mTelecomManager.clearPhoneAccounts();
			}

	PhoneAccountHandle getPhoneAccountHandle(int associationId, String appIdentifier) {		PhoneAccountHandle getPhoneAccountHandle(int associationId, String appIdentifier) {
	return mPhoneAccountHandles.get(		return mPhoneAccountHandles.get(
	new PhoneAccountHandleIdentifier(associationId, appIdentifier));		new PhoneAccountHandleIdentifier(associationId, appIdentifier));