Fix screen update after DFU error

microbit-foundation · Jul 21, 2024 · f48ca73 · f48ca73
1 parent e501467
commit f48ca73
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/src/main/java/com/samsung/microbit/MBApp.java b/app/src/main/java/com/samsung/microbit/MBApp.java
@@ -44,30 +44,30 @@ public void logi(String message) {
 
     @Override
     public void onCreate() {
-        if (DEBUG) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
-                        .detectAll()
-                        .penaltyLog()
-//                        .penaltyFlashScreen()
+//        if (DEBUG) {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+//                StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+//                        .detectAll()
+//                        .permitDiskReads()
+//                        .penaltyLog()
 //                        .penaltyListener(Executors.newSingleThreadExecutor(), new StrictMode.OnThreadViolationListener() {
 //                            @Override
 //                            public void onThreadViolation(Violation v) {
 //                            }
 //                        })
-                        .build());
-
-                StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
-                        .detectAll()
-                        .penaltyLog()
+//                        .build());
+//
+//                StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+//                        .detectAll()
+//                        .penaltyLog()
 //                        .penaltyListener(Executors.newSingleThreadExecutor(), new StrictMode.OnVmViolationListener() {
 //                            @Override
 //                            public void onVmViolation(Violation v) {
 //                            }
 //                        })
-                        .build());
-            }
-        }
+//                        .build());
+//            }
+//        }
         super.onCreate();
         app = this;
         ProcessLifecycleOwner.get().getLifecycle().addObserver(this);

diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java
@@ -2337,6 +2337,8 @@ public void onClick(View v) {
                 final int errorType = intent.getIntExtra(DfuBaseService.EXTRA_ERROR_TYPE, 0);
                 String error_message = "";
 
+                PopUp.hide();
+
                 switch (errorType) {
                     case DfuBaseService.ERROR_TYPE_COMMUNICATION_STATE:
                         if ( errorCode == 0x0085) {