diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-04-07 15:36:16 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-04-07 15:36:16 +0200 |
commit | 36f3bed2eccb3dfd5266304c482497eff0d25c7c (patch) | |
tree | a43598541a1a4ea92142d17e02c02033e49fa8a3 /libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java | |
parent | 4ace80d39ade18934d310ba37559c9c7ec8004dd (diff) | |
parent | 8c3245dd1f257053b8ec2bf7c5e03a3a98b282c3 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
Diffstat (limited to '')
-rw-r--r-- | libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java index c8a96ea3..eb4efc98 100644 --- a/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java +++ b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java @@ -116,7 +116,11 @@ public class LogCatArrayAdapter extends ArrayAdapter<String> { logcatItems.remove(object); } - public ArrayList<String> getItems() { - return this.logcatItems; + /** + * Returns an unmodifiable copy of the log cat entries. + * @return UnmodifiableList of logcat entries. + */ + public List<String> getItems() { + return Collections.unmodifiableList(this.logcatItems); } } |