Commit ee8cc6f
Backport of ag/14170751 and ag/14170752.
1. An available rollback shouldn't be deleted when its session expires.
2. Add a test to check we don't crash or delete a rollback when its
session expires.
Bug: 181087240
Bug: 185132440
Test: atest StagedRollbackTest
Merged-In: I3c2b718905d2d7619d6f299ee5402fd858de030e
Merged-In: I1bd786b38e2df1f4bdc80d0d371d5d2d52e21e06
Change-Id: Id55f1bde0ee69a6f26bc8e109918fb26d1da4e3f
(cherry picked from commit 29d5f72db216eeae13cb7d395b2359544012ffce)1 parent 2e4efe7 commit ee8cc6f
3 files changed
Lines changed: 68 additions & 2 deletions
File tree
- services/core/java/com/android/server/rollback
- tests/RollbackTest
- RollbackTest/src/com/android/tests/rollback
- StagedRollbackTest/src/com/android/tests/rollback/host
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
554 | 554 | | |
555 | 555 | | |
556 | 556 | | |
557 | | - | |
558 | | - | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
559 | 561 | | |
560 | 562 | | |
561 | 563 | | |
| |||
Lines changed: 27 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
481 | 481 | | |
482 | 482 | | |
483 | 483 | | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
484 | 511 | | |
485 | 512 | | |
486 | 513 | | |
| |||
Lines changed: 37 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
| 43 | + | |
42 | 44 | | |
43 | 45 | | |
44 | 46 | | |
| |||
441 | 443 | | |
442 | 444 | | |
443 | 445 | | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
444 | 467 | | |
445 | 468 | | |
446 | 469 | | |
| |||
521 | 544 | | |
522 | 545 | | |
523 | 546 | | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
524 | 561 | | |
0 commit comments