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

Commit 05156295 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix error log message for rename(2) workaround" am: 4ed8f88e am:... 

Merge "Fix error log message for rename(2) workaround" am: 4ed8f88e am: b9d37026 am: 095a6307 am: 1d028b06 am: 943c159a

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



Change-Id: Ic593adc6112f41e7f2cf043be1ea93aa8ec4f3c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbef7b65 943c159a

core/java/android/app/ActivityThread.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -7838,7 +7838,7 @@ public final class ActivityThread extends ClientTransactionHandler 
                        Files.move(new File(oldPath).toPath(), new File(newPath).toPath(),

                        Files.move(new File(oldPath).toPath(), new File(newPath).toPath(),

                                StandardCopyOption.REPLACE_EXISTING);

                                StandardCopyOption.REPLACE_EXISTING);

                    } catch (IOException e2) {

                    } catch (IOException e2) {

                        Log.e(TAG, "Rename recovery failed ", e);

                        Log.e(TAG, "Rename recovery failed ", e2);

                        throw e;

                        throw e;

                    }

                    }

                } else {

                } else {