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

Commit 733678d3 authored by Sal Savage's avatar Sal Savage
Browse files

Rename RequestPhoneBook* classes to RequestPhonebook* 

Bug: 365626536
Flag: EXEMPT, class renames
Test: atest com.android.bluetoth.pbapclient
Test: m com.android.btservices
Change-Id: Idd78c9b3e444fae1ec7c3af70806ebf1108da09e
parent df194d67

android/app/src/com/android/bluetooth/pbapclient/obex/PbapClientConnectionHandler.java

+4 −4
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ class PbapClientConnectionHandler extends Handler { 
                            /* list start offeset, start from beginning */ 0);



            // Download contacts in batches of size DEFAULT_BATCH_SIZE

            RequestPullPhoneBookMetadata requestPbSize =

                    new RequestPullPhoneBookMetadata(path, params);

            RequestPullPhonebookMetadata requestPbSize =

                    new RequestPullPhonebookMetadata(path, params);

            requestPbSize.execute(mObexSession);



            int numberOfContactsRemaining = requestPbSize.getMetadata().getSize();
@@ -384,7 +384,7 @@ class PbapClientConnectionHandler extends Handler { 
                                numberOfContactsToDownload,

                                startOffset);



                RequestPullPhoneBook request = new RequestPullPhoneBook(path, params, mAccount);

                RequestPullPhonebook request = new RequestPullPhonebook(path, params, mAccount);

                request.execute(mObexSession);

                List<VCardEntry> vcards = request.getList();

                if (PbapPhonebook.FAVORITES_PATH.equals(path)) {
@@ -420,7 +420,7 @@ class PbapClientConnectionHandler extends Handler { 
                            0,

                            0);



            RequestPullPhoneBook request = new RequestPullPhoneBook(path, params, mAccount);

            RequestPullPhonebook request = new RequestPullPhonebook(path, params, mAccount);

            request.execute(mObexSession);

            CallLogPullRequest processor =

                    new CallLogPullRequest(

android/app/src/com/android/bluetooth/pbapclient/obex/RequestPullPhoneBook.java→android/app/src/com/android/bluetooth/pbapclient/obex/RequestPullPhonebook.java

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import java.io.IOException; 
import java.io.InputStream;

import java.util.List;



final class RequestPullPhoneBook extends PbapClientRequest {

    private static final String TAG = RequestPullPhoneBook.class.getSimpleName();

final class RequestPullPhonebook extends PbapClientRequest {

    private static final String TAG = RequestPullPhonebook.class.getSimpleName();



    private static final String TYPE = "x-bt/phonebook";
@@ -40,7 +40,7 @@ final class RequestPullPhoneBook extends PbapClientRequest { 


    private PbapPhonebook mResponse;



    RequestPullPhoneBook(String phonebook, PbapApplicationParameters params, Account account) {

    RequestPullPhonebook(String phonebook, PbapApplicationParameters params, Account account) {

        mPhonebook = phonebook;

        mFormat = params.getVcardFormat();

        mMaxListCount = params.getMaxListCount();

android/app/src/com/android/bluetooth/pbapclient/obex/RequestPullPhoneBookMetadata.java→android/app/src/com/android/bluetooth/pbapclient/obex/RequestPullPhonebookMetadata.java

+3 −3
Original line number Diff line number Diff line
@@ -27,15 +27,15 @@ import com.android.obex.HeaderSet; 
 * that we're not interested in the contents (PBAP 1.2.3, Section 5.1, C7 of the Response Format

 * table)

 */

final class RequestPullPhoneBookMetadata extends PbapClientRequest {

    private static final String TAG = RequestPullPhoneBookMetadata.class.getSimpleName();

final class RequestPullPhonebookMetadata extends PbapClientRequest {

    private static final String TAG = RequestPullPhonebookMetadata.class.getSimpleName();



    private static final String TYPE = "x-bt/phonebook";



    private final String mPhonebook;

    private PbapPhonebookMetadata mResponse;



    RequestPullPhoneBookMetadata(String phonebook, PbapApplicationParameters params) {

    RequestPullPhonebookMetadata(String phonebook, PbapApplicationParameters params) {

        mPhonebook = phonebook;

        mHeaderSet.setHeader(HeaderSet.NAME, phonebook);

        mHeaderSet.setHeader(HeaderSet.TYPE, TYPE);

android/app/tests/unit/src/com/android/bluetooth/pbapclient/RequestPullPhoneBookMetadataTest.java→android/app/tests/unit/src/com/android/bluetooth/pbapclient/RequestPullPhonebookMetadataTest.java

+3 −4
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ import org.junit.runner.RunWith; 


@SmallTest

@RunWith(AndroidJUnit4.class)

public class RequestPullPhoneBookMetadataTest {



    RequestPullPhoneBookMetadata mRequest;

public class RequestPullPhonebookMetadataTest {

    RequestPullPhonebookMetadata mRequest;



    @Before

    public void setUp() {
@@ -43,7 +42,7 @@ public class RequestPullPhoneBookMetadataTest { 
                        PbapApplicationParameters.MAX_PHONEBOOK_SIZE,

                        /* startOffset= */ 0);

        mRequest =

                new RequestPullPhoneBookMetadata(/* pbName= */ "phonebook", /* params= */ params);

                new RequestPullPhonebookMetadata(/* pbName= */ "phonebook", /* params= */ params);

    }



    @Test

android/app/tests/unit/src/com/android/bluetooth/pbapclient/RequestPullPhoneBookTest.java→android/app/tests/unit/src/com/android/bluetooth/pbapclient/RequestPullPhonebookTest.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.io.InputStream; 


@SmallTest

@RunWith(AndroidJUnit4.class)

public class RequestPullPhoneBookTest {

public class RequestPullPhonebookTest {



    private static final String PB_NAME = "phonebook";

    private static final Account ACCOUNT = mock(Account.class);
@@ -46,7 +46,7 @@ public class RequestPullPhoneBookTest { 
                        PbapApplicationParameters.RETURN_SIZE_ONLY,

                        /* startOffset= */ 10);



        RequestPullPhoneBook request = new RequestPullPhoneBook(PB_NAME, params, ACCOUNT);

        RequestPullPhonebook request = new RequestPullPhonebook(PB_NAME, params, ACCOUNT);



        final InputStream is =

                new InputStream() {