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

Commit 0e25cae8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix skipping the last address line and avoid appending nulls." into rvc-dev am: a1355716 

Change-Id: Ia77aa8913b10517b41767b4c9b9cc61200f8ab94
parents adbae9b1 a1355716

src/com/android/documentsui/inspector/MediaView.java

+5 −2
Original line number Diff line number Diff line
@@ -238,9 +238,12 @@ public class MediaView extends TableView implements MediaDisplay { 
                        String formattedAddress;

                        StringBuilder addressBuilder = new StringBuilder("");

                        addressBuilder.append(address.getAddressLine(0));

                        for (int i = 1; i < address.getMaxAddressLineIndex(); i++) {

                        for (int i = 1; i <= address.getMaxAddressLineIndex(); i++) {

                            addressBuilder.append("\n");

                            addressBuilder.append(address.getAddressLine(i));

                            String addressLine = address.getAddressLine(i);

                            if (addressLine != null) {

                                addressBuilder.append(addressLine);

                            }

                        }

                        formattedAddress = addressBuilder.toString();

                        table.put(R.string.metadata_address, formattedAddress);