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

Commit 053e1fa8 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] switch TelecomManager List getters to ParceledListSlice 2p: deec8016 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/19370567

Bug: 236263294
Change-Id: I2d72365bf3d489f626a229ad6873a03883983e2b
Merged-In: Ibc3814dabd59cf9f0f9505b88f2146a4c3c5e015
parents 7f220ffd deec8016

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

+28 −22
Original line number Diff line number Diff line
@@ -40,6 +40,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;
@@ -190,25 +191,26 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getCallCapablePhoneAccounts(

        public ParceledListSlice<PhoneAccountHandle> getCallCapablePhoneAccounts(

                boolean includeDisabledAccounts, String callingPackage, String callingFeatureId) {

            try {

                Log.startSession("TSI.gCCPA");

                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;
@@ -222,8 +224,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");

                if (!canReadPhoneState(callingPackage, callingFeatureId,
@@ -234,8 +236,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;
@@ -249,8 +251,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");

                try {
@@ -259,15 +261,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;
@@ -281,7 +284,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);
@@ -304,8 +308,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;
@@ -368,7 +372,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;
@@ -381,7 +385,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccount> getAllPhoneAccounts() {

        public ParceledListSlice<PhoneAccount> getAllPhoneAccounts() {

            synchronized (mLock) {

                try {

                    Log.startSession("TSI.gAPA");
@@ -397,7 +401,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;
@@ -411,7 +416,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccountHandle> getAllPhoneAccountHandles() {

        public ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles() {

            try {

                Log.startSession("TSI.gAPAH");

                try {
@@ -427,7 +432,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
@@ -390,9 +390,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
@@ -407,7 +409,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

        }
@@ -435,9 +437,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
@@ -453,7 +457,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
@@ -476,7 +480,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