diff options
| -rw-r--r-- | recovery_ui/screen_ui.cpp | 4 | ||||
| -rw-r--r-- | recovery_utils/roots.cpp | 9 | ||||
| -rw-r--r-- | updater_sample/AndroidManifest.xml | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/recovery_ui/screen_ui.cpp b/recovery_ui/screen_ui.cpp index 087fc0e84..6dcb161fa 100644 --- a/recovery_ui/screen_ui.cpp +++ b/recovery_ui/screen_ui.cpp @@ -448,7 +448,9 @@ void ScreenRecoveryUI::draw_foreground_locked() { int frame_height = gr_get_height(frame); int frame_x = (ScreenWidth() - frame_width) / 2; int frame_y = GetAnimationBaseline(); - DrawSurface(frame, 0, 0, frame_width, frame_height, frame_x, frame_y); + if (frame_x >= 0 && frame_y >= 0 && (frame_x + frame_width) < ScreenWidth() && + (frame_y + frame_height) < ScreenHeight()) + DrawSurface(frame, 0, 0, frame_width, frame_height, frame_x, frame_y); } if (progressBarType != EMPTY) { diff --git a/recovery_utils/roots.cpp b/recovery_utils/roots.cpp index 127039872..58a313973 100644 --- a/recovery_utils/roots.cpp +++ b/recovery_utils/roots.cpp @@ -202,6 +202,15 @@ int format_volume(const std::string& volume, const std::string& directory) { mke2fs_args.push_back("512"); } + if (v->fs_mgr_flags.ext_meta_csum) { + mke2fs_args.push_back("-O"); + mke2fs_args.push_back("metadata_csum"); + mke2fs_args.push_back("-O"); + mke2fs_args.push_back("64bit"); + mke2fs_args.push_back("-O"); + mke2fs_args.push_back("extent"); + } + int raid_stride = v->logical_blk_size / kBlockSize; int raid_stripe_width = v->erase_blk_size / kBlockSize; // stride should be the max of 8KB and logical block size diff --git a/updater_sample/AndroidManifest.xml b/updater_sample/AndroidManifest.xml index 0a2511617..981cd8eba 100644 --- a/updater_sample/AndroidManifest.xml +++ b/updater_sample/AndroidManifest.xml @@ -20,6 +20,7 @@ <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27" /> <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" /> + <uses-permission android:name="android.permission.INTERNET"/> <application android:icon="@mipmap/ic_launcher" |