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

Commit 03bf117d authored by Thomas Stuart's avatar Thomas Stuart Committed by Android Build Coastguard Worker
Browse files

switch TelecomManager List getters to ParceledListSlice 

It was shown that given a large phoneAccountHandles that are
over 1 mb, a TransactionTooLarge exception can be silently thrown
causing an empty list to be returned.

In order to prevent this behavior, all Lists that return a
PhoneAccountHandle or PhoneAccount have been switched to
ParceledListSlice.

bug: 236263294

Test: manual #1 - bug exists without fix,
      manual #2 - bug is fixed with patch,
      4 new CTS tests in
      android.telecom.cts.PhoneAccountRegistrarTest

Change-Id: Ibc3814dabd59cf9f0f9505b88f2146a4c3c5e015
Merged-In: Ibc3814dabd59cf9f0f9505b88f2146a4c3c5e015
(cherry picked from commit 963c5c7b)
Merged-In: Ibc3814dabd59cf9f0f9505b88f2146a4c3c5e015
parent 3f4456d1

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

+33 −27
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.content.Intent; 
import android.content.PermissionChecker;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ParceledListSlice;

import android.content.pm.ResolveInfo;

import android.net.Uri;

import android.os.Binder;
@@ -191,25 +192,26 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getCallCapablePhoneAccounts(

        public ParceledListSlice<PhoneAccountHandle> getCallCapablePhoneAccounts(

                boolean includeDisabledAccounts, String callingPackage, String callingFeatureId) {

            try {

                Log.startSession("TSI.gCCPA", Log.getPackageAbbreviation(callingPackage));

                if (includeDisabledAccounts &&

                        !canReadPrivilegedPhoneState(

                                callingPackage, "getCallCapablePhoneAccounts")) {

                    return Collections.emptyList();

                    return ParceledListSlice.emptyList();

                }

                if (!canReadPhoneState(callingPackage, callingFeatureId,

                        "getCallCapablePhoneAccounts")) {

                    return Collections.emptyList();

                    return ParceledListSlice.emptyList();

                }

                synchronized (mLock) {

                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null,

                                includeDisabledAccounts, callingUserHandle);

                        return new ParceledListSlice<>(

                                mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null,

                                includeDisabledAccounts, callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getCallCapablePhoneAccounts");

                        throw e;
@@ -223,8 +225,8 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getSelfManagedPhoneAccounts(String callingPackage,

                String callingFeatureId) {

        public ParceledListSlice<PhoneAccountHandle> getSelfManagedPhoneAccounts(

                String callingPackage, String callingFeatureId) {

            try {

                Log.startSession("TSI.gSMPA", Log.getPackageAbbreviation(callingPackage));

                if (!canReadPhoneState(callingPackage, callingFeatureId,
@@ -235,8 +237,8 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getSelfManagedPhoneAccounts(

                                callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getSelfManagedPhoneAccounts(callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getSelfManagedPhoneAccounts");

                        throw e;
@@ -250,8 +252,8 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(String callingPackage,

                String callingFeatureId) {

        public ParceledListSlice<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts(

                String callingPackage, String callingFeatureId) {

            try {

                Log.startSession("TSI.gOSMPA", Log.getPackageAbbreviation(callingPackage));

                try {
@@ -269,9 +271,9 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getSelfManagedPhoneAccountsForPackage(

                                callingPackage,

                                callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getSelfManagedPhoneAccountsForPackage(callingPackage,

                                callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e,

                                "getSelfManagedPhoneAccountsForPackage");
@@ -286,8 +288,8 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme,

                String callingPackage) {

        public ParceledListSlice<PhoneAccountHandle> getPhoneAccountsSupportingScheme(

                String uriScheme, String callingPackage) {

            try {

                Log.startSession("TSI.gPASS", Log.getPackageAbbreviation(callingPackage));

                try {
@@ -296,15 +298,16 @@ public class TelecomServiceImpl { 
                } catch (SecurityException e) {

                    EventLog.writeEvent(0x534e4554, "62347125", Binder.getCallingUid(),

                            "getPhoneAccountsSupportingScheme: " + callingPackage);

                    return Collections.emptyList();

                    return ParceledListSlice.emptyList();

                }



                synchronized (mLock) {

                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getCallCapablePhoneAccounts(uriScheme, false,

                                callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getCallCapablePhoneAccounts(uriScheme, false,

                                callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getPhoneAccountsSupportingScheme %s", uriScheme);

                        throw e;
@@ -318,7 +321,8 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {

        public ParceledListSlice<PhoneAccountHandle> getPhoneAccountsForPackage(

                String packageName) {

            //TODO: Deprecate this in S

            try {

                enforceCallingPackage(packageName, "getPhoneAccountsForPackage");
@@ -341,8 +345,8 @@ public class TelecomServiceImpl { 
                long token = Binder.clearCallingIdentity();

                try {

                    Log.startSession("TSI.gPAFP");

                    return mPhoneAccountRegistrar.getPhoneAccountsForPackage(packageName,

                            callingUserHandle);

                    return new ParceledListSlice<>(mPhoneAccountRegistrar

                            .getPhoneAccountsForPackage(packageName, callingUserHandle));

                } catch (Exception e) {

                    Log.e(this, e, "getPhoneAccountsForPackage %s", packageName);

                    throw e;
@@ -412,7 +416,7 @@ public class TelecomServiceImpl { 
                synchronized (mLock) {

                    try {

                        // This list is pre-filtered for the calling user.

                        return getAllPhoneAccounts().size();

                        return getAllPhoneAccounts().getList().size();

                    } catch (Exception e) {

                        Log.e(this, e, "getAllPhoneAccountsCount");

                        throw e;
@@ -425,7 +429,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccount> getAllPhoneAccounts() {

        public ParceledListSlice<PhoneAccount> getAllPhoneAccounts() {

            synchronized (mLock) {

                try {

                    Log.startSession("TSI.gAPA");
@@ -441,7 +445,8 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getAllPhoneAccounts(callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getAllPhoneAccounts(callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getAllPhoneAccounts");

                        throw e;
@@ -455,7 +460,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getAllPhoneAccountHandles() {

        public ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles() {

            try {

                Log.startSession("TSI.gAPAH");

                try {
@@ -471,7 +476,8 @@ public class TelecomServiceImpl { 
                    final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getAllPhoneAccountHandles(callingUserHandle);

                        return new ParceledListSlice<>(mPhoneAccountRegistrar

                                .getAllPhoneAccountHandles(callingUserHandle));

                    } catch (Exception e) {

                        Log.e(this, e, "getAllPhoneAccounts");

                        throw e;

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

+11 −7
Original line number Diff line number Diff line
@@ -391,9 +391,11 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);



        assertEquals(fullPHList,

                mTSIBinder.getCallCapablePhoneAccounts(true, DEFAULT_DIALER_PACKAGE, null));

                mTSIBinder.getCallCapablePhoneAccounts(

                        true, DEFAULT_DIALER_PACKAGE, null).getList());

        assertEquals(smallPHList,

                mTSIBinder.getCallCapablePhoneAccounts(false, DEFAULT_DIALER_PACKAGE, null));

                mTSIBinder.getCallCapablePhoneAccounts(

                        false, DEFAULT_DIALER_PACKAGE, null).getList());

    }



    @SmallTest
@@ -408,7 +410,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 


        List<PhoneAccountHandle> result = null;

        try {

            result = mTSIBinder.getCallCapablePhoneAccounts(true, "", null);

            result = mTSIBinder.getCallCapablePhoneAccounts(true, "", null).getList();

        } catch (SecurityException e) {

            // intended behavior

        }
@@ -436,9 +438,11 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);



        assertEquals(telPHList,

                mTSIBinder.getPhoneAccountsSupportingScheme("tel", DEFAULT_DIALER_PACKAGE));

                mTSIBinder.getPhoneAccountsSupportingScheme(

                        "tel", DEFAULT_DIALER_PACKAGE).getList());

        assertEquals(sipPHList,

                mTSIBinder.getPhoneAccountsSupportingScheme("sip", DEFAULT_DIALER_PACKAGE));

                mTSIBinder.getPhoneAccountsSupportingScheme(

                        "sip", DEFAULT_DIALER_PACKAGE).getList());

    }



    @SmallTest
@@ -454,7 +458,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

        assertEquals(phoneAccountHandleList,

                mTSIBinder.getPhoneAccountsForPackage(

                        TEL_PA_HANDLE_16.getComponentName().getPackageName()));

                        TEL_PA_HANDLE_16.getComponentName().getPackageName()).getList());

    }



    @SmallTest
@@ -483,7 +487,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        when(mFakePhoneAccountRegistrar.getAllPhoneAccounts(any(UserHandle.class)))

                .thenReturn(phoneAccountList);



        assertEquals(2, mTSIBinder.getAllPhoneAccounts().size());

        assertEquals(2, mTSIBinder.getAllPhoneAccounts().getList().size());

    }



    @SmallTest