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

Commit 58a2b30e authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Automerger Merge Worker
Browse files

Merge "Change the order of mErrorReason and mOperationExecuted before sending... 

Merge "Change the order of mErrorReason and mOperationExecuted before sending broadcast" into rvc-dev am: 05e42b64

Change-Id: I765dd26f1a3cc31965413b035918fb245b1dc5be
parents d11ea734 05e42b64

tests/common/com/android/documentsui/services/TestNotificationService.java

+3 −3
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ public class TestNotificationService extends NotificationListenerService { 
        return result;

    }



    private boolean isStartProgress(Notification notifiction) {

        ProgressBar progressBar = getProgresssBar(getRemoteViews(notifiction));

        return (progressBar != null) ? progressBar.getProgress() > 0 : false;

    private boolean isStartProgress(Notification notification) {

        ProgressBar progressBar = getProgresssBar(getRemoteViews(notification));

        return progressBar != null;

    }



    private RemoteViews getRemoteViews(Notification notifiction) {

tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 
                    mErrorReason = intent.getStringExtra(

                            TestNotificationService.EXTRA_ERROR_REASON);

                }

                Log.i(TAG, "Received operation broadcast " + mOperationExecuted);

                mCountDownLatch.countDown();

            }

        }
@@ -107,6 +108,7 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 


        mOperationExecuted = false;

        mErrorReason = "No response from Notification";

        Log.i(TAG, "Initializing mOperationExecuted.");

        mCountDownLatch = new CountDownLatch(1);

    }