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

Commit 7728d397 authored by Thomas Stuart's avatar Thomas Stuart Committed by Automerger Merge Worker
Browse files

switch TelecomManager List getters to ParceledListSlice am: 9f8c7709 

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



Change-Id: I69c1c393d13355737670b485f279143a419d39d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c59fa22d 9f8c7709

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

+28 −22
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.content.Context; 
import android.content.Intent;

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;
@@ -187,25 +188,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;
@@ -219,8 +221,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,
@@ -231,8 +233,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;
@@ -246,8 +248,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 {
@@ -256,15 +258,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;
@@ -278,7 +281,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);
@@ -301,8 +305,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;
@@ -353,7 +357,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;
@@ -366,7 +370,7 @@ public class TelecomServiceImpl { 
        }



        @Override

        public List<PhoneAccount> getAllPhoneAccounts() {

        public ParceledListSlice<PhoneAccount> getAllPhoneAccounts() {

            synchronized (mLock) {

                try {

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



        @Override

        public List<PhoneAccountHandle> getAllPhoneAccountHandles() {

        public ParceledListSlice<PhoneAccountHandle> getAllPhoneAccountHandles() {

            try {

                Log.startSession("TSI.gAPAH");

                try {
@@ -412,7 +417,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