Merge "Provide enable property on phone accounts." into mnc-dev (7db61857) · Commits · e / os / android_packages_services_Telecomm

AndroidManifest.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -23,22 +23,22 @@
		<!-- Prevents the activity manager from delaying any activity-start
		requests by this package, including requests immediately after
		the user presses "home". -->
		<uses-permission android:name="android.permission.BIND_CONNECTION_SERVICE" />
		<uses-permission android:name="android.permission.BIND_INCALL_SERVICE" />
		<uses-permission android:name="android.permission.BLUETOOTH" />
		<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
		<uses-permission android:name="android.permission.BROADCAST_CALLLOG_INFO" />
		<uses-permission android:name="android.permission.BROADCAST_PHONE_ACCOUNT_REGISTRATION" />
		<uses-permission android:name="android.permission.CALL_PRIVILEGED" />
		<uses-permission android:name="android.permission.MANAGE_USERS" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
		<uses-permission android:name="android.permission.MANAGE_USERS" />
		<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
		<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
		<uses-permission android:name="android.permission.READ_CALL_LOG" />
		<uses-permission android:name="android.permission.STOP_APP_SWITCHES" />
		<uses-permission android:name="android.permission.VIBRATE" />
		<uses-permission android:name="android.permission.WRITE_CALL_LOG" />
		<uses-permission android:name="android.permission.BIND_CONNECTION_SERVICE" />
		<uses-permission android:name="android.permission.BIND_INCALL_SERVICE" />
		<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
		<uses-permission android:name="android.permission.BROADCAST_CALLLOG_INFO" />
		<uses-permission android:name="android.permission.BROADCAST_PHONE_ACCOUNT_REGISTRATION" />

		<permission
		android:name="android.permission.BROADCAST_CALLLOG_INFO"

res/values/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		<!-- Official label of the Telecomm/Phone app, as seen in "Manage Applications"
		and other settings UIs. This is the "app name" used in notification, recents,
		and app info screens. -->
		<string name="telecommAppLabel" product="default">Phone</string>
		<string name="telecommAppLabel" product="default">Phone - Call Management</string>

		<!-- Name for an "unknown" caller. -->
		<string name="unknown">Unknown</string>

src/com/android/server/telecom/CallsManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -527,7 +527,7 @@ public class CallsManager extends Call.ListenerBase {
		Call call = getNewOutgoingCall(handle);

		List<PhoneAccountHandle> accounts =
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(handle.getScheme());
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(handle.getScheme(), false);

		Log.v(this, "startOutgoingCall found accounts = " + accounts);

src/com/android/server/telecom/PhoneAccountRegistrar.java

+61 −13

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public final class PhoneAccountRegistrar {
		}
		}

		List<PhoneAccountHandle> outgoing = getCallCapablePhoneAccounts(uriScheme);
		List<PhoneAccountHandle> outgoing = getCallCapablePhoneAccounts(uriScheme, false);
		switch (outgoing.size()) {
		case 0:
		// There are no accounts, so there can be no default
		@@ -348,6 +348,20 @@ public final class PhoneAccountRegistrar {
		mCurrentUserHandle = userHandle;
		}

		public void enablePhoneAccount(PhoneAccountHandle accountHandle, boolean isEnabled) {
		PhoneAccount account = getPhoneAccount(accountHandle);
		if (account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
		// We never change the enabled state of SIM-based accounts.
		return;
		}

		if (account != null && account.isEnabled() != isEnabled) {
		account.setIsEnabled(isEnabled);
		write();
		fireAccountsChanged();
		}
		}

		private boolean isVisibleForUser(PhoneAccount account) {
		if (account == null) {
		return false;
		@@ -414,15 +428,16 @@ public final class PhoneAccountRegistrar {

		/**
		* Retrieves a list of all {@link PhoneAccountHandle}s registered.
		* Only returns accounts which are enabled.
		*
		* @return The list of {@link PhoneAccountHandle}s.
		*/
		public List<PhoneAccountHandle> getAllPhoneAccountHandles() {
		return getPhoneAccountHandles(0, null, null);
		return getPhoneAccountHandles(0, null, null, false);
		}

		public List<PhoneAccount> getAllPhoneAccounts() {
		return getPhoneAccounts(0, null, null);
		return getPhoneAccounts(0, null, null, false);
		}

		/**
		@@ -432,8 +447,10 @@ public final class PhoneAccountRegistrar {
		* @param uriScheme The URI scheme.
		* @return The phone account handles.
		*/
		public List<PhoneAccountHandle> getCallCapablePhoneAccounts(String uriScheme) {
		return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CALL_PROVIDER, uriScheme, null);
		public List<PhoneAccountHandle> getCallCapablePhoneAccounts(
		String uriScheme, boolean includeDisabledAccounts) {
		return getPhoneAccountHandles(
		PhoneAccount.CAPABILITY_CALL_PROVIDER, uriScheme, null, includeDisabledAccounts);
		}

		/**
		@@ -442,7 +459,7 @@ public final class PhoneAccountRegistrar {
		public List<PhoneAccountHandle> getSimPhoneAccounts() {
		return getPhoneAccountHandles(
		PhoneAccount.CAPABILITY_CALL_PROVIDER \| PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION,
		null, null);
		null, null, false);
		}

		/**
		@@ -452,7 +469,7 @@ public final class PhoneAccountRegistrar {
		* @return The phone account handles.
		*/
		public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {
		return getPhoneAccountHandles(0, null, packageName);
		return getPhoneAccountHandles(0, null, packageName, false);
		}

		/**
		@@ -461,7 +478,7 @@ public final class PhoneAccountRegistrar {
		* @return The phone account handles.
		*/
		public List<PhoneAccountHandle> getConnectionManagerPhoneAccounts() {
		return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER, null, null);
		return getPhoneAccountHandles(PhoneAccount.CAPABILITY_CONNECTION_MANAGER, null, null, true);
		}

		// TODO: Should we implement an artificial limit for # of accounts associated with a single
		@@ -489,11 +506,22 @@ public final class PhoneAccountRegistrar {
		Log.d(this, "addOrReplacePhoneAccount(%s -> %s)",
		account.getAccountHandle(), account);

		// Start _enabled_ property as false.
		// !!! IMPORTANT !!! It is important that we do not read the enabled state that the
		// source app provides or else an third party app could enable itself.
		boolean isEnabled = false;

		PhoneAccount oldAccount = getPhoneAccount(account.getAccountHandle());
		if (oldAccount != null) {
		mState.accounts.remove(oldAccount);
		isEnabled = oldAccount.isEnabled();
		}

		mState.accounts.add(account);
		// Reset enabled state to whatever the value was if the account was already registered,
		// or _true_ if this is a SIM-based account. All SIM-based accounts are always enabled.
		account.setIsEnabled(
		isEnabled \|\| account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION));

		write();
		fireAccountsChanged();
		@@ -636,9 +664,14 @@ public final class PhoneAccountRegistrar {
		* and package name.
		*/
		private List<PhoneAccountHandle> getPhoneAccountHandles(
		int capabilities, String uriScheme, String packageName) {
		int capabilities,
		String uriScheme,
		String packageName,
		boolean includeDisabledAccounts) {
		List<PhoneAccountHandle> handles = new ArrayList<>();
		for (PhoneAccount account : getPhoneAccounts(capabilities, uriScheme, packageName)) {

		for (PhoneAccount account : getPhoneAccounts(
		capabilities, uriScheme, packageName, includeDisabledAccounts)) {
		handles.add(account.getAccountHandle());
		}
		return handles;
		@@ -654,9 +687,17 @@ public final class PhoneAccountRegistrar {
		* @param packageName Package name of the PhoneAccount. {@code null} bypasses packageName check.
		*/
		private List<PhoneAccount> getPhoneAccounts(
		int capabilities, String uriScheme, String packageName) {
		int capabilities,
		String uriScheme,
		String packageName,
		boolean includeDisabledAccounts) {
		List<PhoneAccount> accounts = new ArrayList<>(mState.accounts.size());
		for (PhoneAccount m : mState.accounts) {
		if (!(m.isEnabled() \|\| includeDisabledAccounts)) {
		// Do not include disabled accounts.
		continue;
		}

		if (capabilities != 0 && !m.hasCapabilities(capabilities)) {
		// Account doesn't have the right capabilities; skip this one.
		continue;
		@@ -1053,6 +1094,7 @@ public final class PhoneAccountRegistrar {
		private static final String SHORT_DESCRIPTION = "short_description";
		private static final String SUPPORTED_URI_SCHEMES = "supported_uri_schemes";
		private static final String ICON = "icon";
		private static final String ENABLED = "enabled";

		@Override
		public void writeToXml(PhoneAccount o, XmlSerializer serializer, Context context)
		@@ -1075,6 +1117,7 @@ public final class PhoneAccountRegistrar {
		writeTextIfNonNull(LABEL, o.getLabel(), serializer);
		writeTextIfNonNull(SHORT_DESCRIPTION, o.getShortDescription(), serializer);
		writeStringList(SUPPORTED_URI_SCHEMES, o.getSupportedUriSchemes(), serializer);
		writeTextIfNonNull(ENABLED, o.isEnabled() ? "true" : "false" , serializer);

		serializer.endTag(null, CLASS_PHONE_ACCOUNT);
		}
		@@ -1097,6 +1140,7 @@ public final class PhoneAccountRegistrar {
		String shortDescription = null;
		List<String> supportedUriSchemes = null;
		Icon icon = null;
		boolean enabled = false;

		while (XmlUtils.nextElementWithin(parser, outerDepth)) {
		if (parser.getName().equals(ACCOUNT_HANDLE)) {
		@@ -1139,6 +1183,9 @@ public final class PhoneAccountRegistrar {
		} else if (parser.getName().equals(ICON)) {
		parser.next();
		icon = readIcon(parser);
		} else if (parser.getName().equals(ENABLED)) {
		parser.next();
		enabled = "true".equalsIgnoreCase(parser.getText());
		}
		}

		@@ -1176,7 +1223,8 @@ public final class PhoneAccountRegistrar {
		.setCapabilities(capabilities)
		.setShortDescription(shortDescription)
		.setSupportedUriSchemes(supportedUriSchemes)
		.setHighlightColor(highlightColor);
		.setHighlightColor(highlightColor)
		.setIsEnabled(enabled);

		if (icon != null) {
		builder.setIcon(icon);
		@@ -1187,7 +1235,7 @@ public final class PhoneAccountRegistrar {
		// TODO: Need to set tint.
		}

		return builder.build();
		builder.build();
		}
		return null;
		}

src/com/android/server/telecom/TelecomServiceImpl.java

+22 −3

Original line number	Diff line number	Diff line
		@@ -130,7 +130,8 @@ public class TelecomServiceImpl {
		}

		@Override
		public List<PhoneAccountHandle> getCallCapablePhoneAccounts(String callingPackage) {
		public List<PhoneAccountHandle> getCallCapablePhoneAccounts(
		boolean includeDisabledAccounts, String callingPackage) {
		if (!canReadPhoneState(callingPackage, "getDefaultOutgoingPhoneAccount")) {
		return Collections.emptyList();
		}
		@@ -141,7 +142,8 @@ public class TelecomServiceImpl {
		// TODO: Does this isVisible check actually work considering we are clearing
		// the calling identity?
		return filterForAccountsVisibleToCaller(
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null));
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(
		null, includeDisabledAccounts));
		} catch (Exception e) {
		Log.e(this, e, "getCallCapablePhoneAccounts");
		throw e;
		@@ -164,7 +166,7 @@ public class TelecomServiceImpl {
		// TODO: Does this isVisible check actually work considering we are clearing
		// the calling identity?
		return filterForAccountsVisibleToCaller(
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(uriScheme));
		mPhoneAccountRegistrar.getCallCapablePhoneAccounts(uriScheme, false));
		} catch (Exception e) {
		Log.e(this, e, "getPhoneAccountsSupportingScheme %s", uriScheme);
		throw e;
		@@ -827,6 +829,23 @@ public class TelecomServiceImpl {
		}
		}

		/**
		* @see android.telecom.TelecomManager#enablePhoneAccount
		*/
		@Override
		public void enablePhoneAccount(PhoneAccountHandle accountHandle, boolean isEnabled) {
		enforceModifyPermission();
		synchronized (mLock) {
		long token = Binder.clearCallingIdentity();
		try {
		// enable/disable phone account
		mPhoneAccountRegistrar.enablePhoneAccount(accountHandle, isEnabled);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}

		/**
		* Dumps the current state of the TelecomService. Used when generating problem reports.
		*