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

Commit c29a6cd4 authored by Chan Kim's avatar Chan Kim Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7 am: 407947e2 am: 33a9e91f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720058



Change-Id: Id0bcd4ce69c105188232c51f56d143f1dd2e1daf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c359be08 33a9e91f

packages/WAPPushManager/tests/src/com/android/smspush/unitTests/WapPushTest.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -2237,10 +2237,6 @@ public class WapPushTest extends ServiceTestCase<WapPushManager> { 








        mClassName = "com.android.smspush.unitTests.ReceiverActivity";

        mClassName = "com.android.smspush.unitTests.ReceiverActivity";

        // Phone dummy = new DummyPhone(getContext());

        // Phone gsm = PhoneFactory.getGsmPhone();

        // GSMPhone gsm = new GSMPhone(getContext(), new SimulatedCommands(), null, true);

        // WapPushOverSms dispatcher = new WapPushOverSms(dummy, null);





        try {

        try {

            // set up data

            // set up data