| Jon West | ac1d79e | 2019-04-16 20:29:14 -0400 | [diff] [blame^] | 1 | From 8b3429f84656b0284a3c5c4d372c7318d577b53b Mon Sep 17 00:00:00 2001 |
| 2 | From: Isaac Lee <isaac.lee@mediatek.com> |
| 3 | Date: Thu, 26 Jul 2018 17:07:25 +0800 |
| 4 | Subject: [PATCH 6/7] Show bootanimation after decrypt |
| 5 | |
| 6 | Because the original modification (restart SF which is added |
| 7 | for display bootanimation) from O to P causes bootanimation NPE, |
| 8 | we remove the part of restart SF and add other flow to show |
| 9 | bootanimation. |
| 10 | |
| 11 | Test: manual, ran the test 10 times and it cause no NPE and |
| 12 | display BootAnimation after decrypt |
| 13 | Test: boot aosp_sailfish |
| 14 | |
| 15 | Bug: 79547653 |
| 16 | Change-Id: I355ccdbb2e2f27d897e2e0ee00f9300ef38ede03 |
| 17 | (cherry picked from commit f32c20174349c058b20d3819802ed8aa8277c72d) |
| 18 | --- |
| 19 | rootdir/init.rc | 4 ++-- |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/rootdir/init.rc b/rootdir/init.rc |
| 23 | index c390c392d..6a28efb57 100644 |
| 24 | --- a/rootdir/init.rc |
| 25 | +++ b/rootdir/init.rc |
| 26 | @@ -706,12 +706,12 @@ on property:vold.decrypt=trigger_restart_min_framework |
| 27 | class_start main |
| 28 | |
| 29 | on property:vold.decrypt=trigger_restart_framework |
| 30 | - stop surfaceflinger |
| 31 | - start surfaceflinger |
| 32 | # A/B update verifier that marks a successful boot. |
| 33 | exec_start update_verifier |
| 34 | class_start main |
| 35 | class_start late_start |
| 36 | + setprop service.bootanim.exit 0 |
| 37 | + start bootanim |
| 38 | |
| 39 | on property:vold.decrypt=trigger_shutdown_framework |
| 40 | class_reset late_start |
| 41 | -- |
| 42 | 2.17.1 |
| 43 | |