Merge "Protecting PII data." into mnc-dev (a6b20a1f) · Commits · e / os / android_packages_services_Telecomm

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -430,7 +430,7 @@ public final class PhoneAccountRegistrar {
		return pm.queryIntentServices(intent, 0);
		}
		} catch (SecurityException e) {
		Log.v(this, "%s is not visible for the calling user", componentName);
		Log.e(this, e, "%s is not visible for the calling user", componentName);
		return Collections.EMPTY_LIST;
		}
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public class TelecomServiceImpl {
		synchronized (mLock) {
		try {
		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [gPA]", accountHandle);
		return null;
		}
		// TODO: Do we really want to return for any user?
		@@ -259,7 +259,7 @@ public class TelecomServiceImpl {
		try {
		PhoneAccountHandle accountHandle = mPhoneAccountRegistrar.getSimCallManager();
		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [gsCM]", accountHandle);
		return null;
		}
		return accountHandle;
		@@ -387,7 +387,7 @@ public class TelecomServiceImpl {
		}

		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [iVMN]", accountHandle);
		return false;
		}

		@@ -415,7 +415,7 @@ public class TelecomServiceImpl {

		try {
		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [gVMN]", accountHandle);
		return null;
		}

		@@ -443,7 +443,7 @@ public class TelecomServiceImpl {

		synchronized (mLock) {
		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [gL1N]", accountHandle);
		return null;
		}

		@@ -659,7 +659,7 @@ public class TelecomServiceImpl {
		enforcePermissionOrPrivilegedDialer(MODIFY_PHONE_STATE, callingPackage);

		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [hMMI]", accountHandle);
		return false;
		}

		@@ -688,7 +688,7 @@ public class TelecomServiceImpl {
		enforcePermissionOrPrivilegedDialer(MODIFY_PHONE_STATE, callingPackage);

		if (!isVisibleToCaller(accountHandle)) {
		Log.w(this, "%s is not visible for the calling user", accountHandle);
		Log.w(this, "%s is not visible for the calling user [gA4PA]", accountHandle);
		return null;
		}

src/com/android/server/telecom/components/TelecomService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,9 @@ public class TelecomService extends Service implements TelecomSystem.Component {
		String number,
		CallerInfoAsyncQuery.OnQueryCompleteListener listener,
		Object cookie) {
		Log.i(TelecomSystem.getInstance(), "CallerInfoAsyncQuery.startQuery number=%s cookie=%s", number, cookie);
		Log.i(TelecomSystem.getInstance(),
		"CallerInfoAsyncQuery.startQuery number=%s cookie=%s",
		Log.pii(number), cookie);
		return CallerInfoAsyncQuery.startQuery(
		token, context, number, listener, cookie);
		}