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

Commit 05e42b64 authored by Diksha Gohlyan's avatar Diksha Gohlyan Committed by Android (Google) Code Review
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
parents 306a2b60 6c3efef7

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

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

        return result;

    }

    }





    private boolean isStartProgress(Notification notifiction) {

    private boolean isStartProgress(Notification notification) {

        ProgressBar progressBar = getProgresssBar(getRemoteViews(notifiction));

        ProgressBar progressBar = getProgresssBar(getRemoteViews(notification));

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

        return progressBar != null;

    }

    }





    private RemoteViews getRemoteViews(Notification notifiction) {

    private RemoteViews getRemoteViews(Notification notifiction) {

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

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

                    mErrorReason = intent.getStringExtra(

                            TestNotificationService.EXTRA_ERROR_REASON);

                            TestNotificationService.EXTRA_ERROR_REASON);

                }

                }

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

                mCountDownLatch.countDown();

                mCountDownLatch.countDown();

            }

            }

        }

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




        mOperationExecuted = false;

        mOperationExecuted = false;

        mErrorReason = "No response from Notification";

        mErrorReason = "No response from Notification";

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

        mCountDownLatch = new CountDownLatch(1);

        mCountDownLatch = new CountDownLatch(1);

    }

    }