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

Commit d686afd7 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: I6c99deaecaeb983d4657adf9e312679a9544474b
parents 0bcfa9d3 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);