From cfabfa2ea8fae8feffe269a51e33e6936a158b9d Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 30 Nov 2018 15:24:23 +0100
Subject: [PATCH] ErrorReporter: Remove and add a few build constants to the
 report.

---
 .../de/schildbach/oeffi/util/ErrorReporter.java | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java b/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java
index bfbc32b..31e079f 100644
--- a/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java
+++ b/oeffi/src/de/schildbach/oeffi/util/ErrorReporter.java
@@ -179,6 +179,7 @@ public class ErrorReporter implements Thread.UncaughtExceptionHandler {
         final Configuration config = res.getConfiguration();
         final ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
 
+        report.append("Manufacturer: " + Build.MANUFACTURER + "\n");
         report.append("Phone Model: " + Build.MODEL + "\n");
         report.append("Android Version: " + Build.VERSION.RELEASE + "\n");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
@@ -188,20 +189,14 @@ public class ErrorReporter implements Thread.UncaughtExceptionHandler {
         report.append("Board: " + Build.BOARD + "\n");
         report.append("Brand: " + Build.BRAND + "\n");
         report.append("Device: " + Build.DEVICE + "\n");
-        report.append("Display: " + Build.DISPLAY + "\n");
-        report.append("Finger Print: " + Build.FINGERPRINT + "\n");
-        report.append("Host: " + Build.HOST + "\n");
-        report.append("ID: " + Build.ID + "\n");
-        report.append("Manufacturer: " + Build.MANUFACTURER + "\n");
         report.append("Model: " + Build.MODEL + "\n");
         report.append("Product: " + Build.PRODUCT + "\n");
-        report.append("Tags: " + Build.TAGS + "\n");
-        report.append("Time: " + Build.TIME + "\n");
-        report.append("Type: " + Build.TYPE + "\n");
-        report.append("User: " + Build.USER + "\n");
         report.append("Configuration: " + config + "\n");
-        report.append("Screen Layout: size " + (config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) + " long "
-                + (config.screenLayout & Configuration.SCREENLAYOUT_LONG_MASK) + "\n");
+        report.append("Screen Layout:" //
+                + " size " + (config.screenLayout & android.content.res.Configuration.SCREENLAYOUT_SIZE_MASK) //
+                + " long " + (config.screenLayout & android.content.res.Configuration.SCREENLAYOUT_LONG_MASK) //
+                + " layoutdir " + (config.screenLayout & android.content.res.Configuration.SCREENLAYOUT_LAYOUTDIR_MASK) //
+                + " round " + (config.screenLayout & android.content.res.Configuration.SCREENLAYOUT_ROUND_MASK) + "\n");
         report.append("Display Metrics: " + res.getDisplayMetrics() + "\n");
         report.append("Memory Class: " + activityManager.getMemoryClass() + "/" + activityManager.getLargeMemoryClass()
                 + (ActivityManagerCompat.isLowRamDevice(activityManager) ? " (low RAM device)" : "") + "\n");