Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb8fc85a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31157124']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31157124'] into security-aosp-udc-release.

Change-Id: Ic7950154f0f9e83cc3af9349f829dce736d5a127
parents 66037caa e1a08589

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

+8 −9
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.telecom.CallException; 
import android.telecom.Log;

import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telecom.StatusHints;

import android.telecom.TelecomAnalytics;

import android.telecom.TelecomManager;

import android.telecom.VideoProfile;
@@ -3150,11 +3151,10 @@ public class TelecomServiceImpl { 
        // incompatible types.

        if (icon != null && (icon.getType() == Icon.TYPE_URI

                || icon.getType() == Icon.TYPE_URI_ADAPTIVE_BITMAP)) {

            String encodedUser = icon.getUri().getEncodedUserInfo();

            // If there is no encoded user, the URI is calling into the calling user space

            if (encodedUser != null) {

                int userId = Integer.parseInt(encodedUser);

                if (userId != UserHandle.getUserId(Binder.getCallingUid())) {

            int callingUserId = UserHandle.getCallingUserId();

            int requestingUserId = StatusHints.getUserIdFromAuthority(

                    icon.getUri().getAuthority(), callingUserId);

            if(callingUserId != requestingUserId) {

                // If we are transcending the profile boundary, throw an error.

                throw new IllegalArgumentException("Attempting to register a phone account with"

                        + " an image icon belonging to another user.");
@@ -3162,4 +3162,3 @@ public class TelecomServiceImpl { 
        }

    }

}
 
}

tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java

+14 −0
Original line number Diff line number Diff line
@@ -963,6 +963,20 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        // This should fail; security exception will be thrown.

        registerPhoneAccountTestHelper(phoneAccount, false);



        icon = Icon.createWithContentUri(

                new Uri.Builder().scheme("content")

                        .encodedAuthority("10%40media")

                        .path("external/images/media/${mediaId.text}".trim())

                        .build());

        phoneAccount = makePhoneAccount(phHandle).setIcon(icon).build();

        // This should fail; security exception will be thrown

        registerPhoneAccountTestHelper(phoneAccount, false);



        icon = Icon.createWithContentUri( Uri.parse("content://10%40play.ground"));

        phoneAccount = makePhoneAccount(phHandle).setIcon(icon).build();

        // This should fail; security exception will be thrown

        registerPhoneAccountTestHelper(phoneAccount, false);



        icon = Icon.createWithContentUri("content://0@media/external/images/media/");

        phoneAccount = makePhoneAccount(phHandle).setIcon(icon).build();

        // This should succeed.