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

Commit f48a10c0 authored by Artur Satayev's avatar Artur Satayev Committed by Automerger Merge Worker
Browse files

Merge "Do not allow multiple commits of the same rollback." am: 0979c571 am: 5fcffb58 

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



Change-Id: Ia5ed88623678f799d1b819e1ddbcb1a0006f4645
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b3c6df9 5fcffb58

tests/RollbackTest/SampleRollbackApp/src/com/android/sample/rollbackapp/MainActivity.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ public class MainActivity extends Activity { 
                        String rollbackStatus = "FAILED";

                        String rollbackStatus = "FAILED";

                        if (rollbackStatusCode == RollbackManager.STATUS_SUCCESS) {

                        if (rollbackStatusCode == RollbackManager.STATUS_SUCCESS) {

                            rollbackStatus = "SUCCESS";

                            rollbackStatus = "SUCCESS";

                            mTriggerRollbackButton.setClickable(false);

                        }

                        }

                        makeToast("Status for rollback ID " + rollbackId + " is " + rollbackStatus);

                        makeToast("Status for rollback ID " + rollbackId + " is " + rollbackStatus);

                    }}, new IntentFilter(ACTION_NAME), Context.RECEIVER_NOT_EXPORTED);

                    }}, new IntentFilter(ACTION_NAME), Context.RECEIVER_NOT_EXPORTED);