commit 951569f1344f5f9b544ebe70584a67cb5a2d1563
author Zhomart Mukhamejanov <zhomart@google.com> Fri Jun 26 15:03:57 2020 -0700
committer Zhomart Mukhamejanov <zhomart@google.com> Tue Jun 30 22:59:57 2020 +0000
tree 230e99c65d7c38e75d7ca69a3e1b4babeab9bb5c
parent 27b59f87f256bb2123775c4c28383e3c758ce399

Enable BugReportApp in AOSP

- Handle no permission and no metabugreport properly
    (From b/159917933)

Test: emulator
Bug: 159662565
Change-Id: Ie16341559b3edad9c43aff382bde05e1f123be59

car_product/build/car.mk

diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index f602d3a..657bad9 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -44,7 +44,7 @@
     GarageModeTestApp \
     ExperimentalCarService \
     RotaryPlayground \
-
+    BugReportApp \
 
 # SEPolicy for test apps / services
 BOARD_SEPOLICY_DIRS += packages/services/Car/car_product/sepolicy/test

tests/BugReportApp/src/com/android/car/bugreport/BugReportActivity.java

diff --git a/tests/BugReportApp/src/com/android/car/bugreport/BugReportActivity.java b/tests/BugReportApp/src/com/android/car/bugreport/BugReportActivity.java
index 67ae314..ba9e59e 100644
--- a/tests/BugReportApp/src/com/android/car/bugreport/BugReportActivity.java
+++ b/tests/BugReportApp/src/com/android/car/bugreport/BugReportActivity.java
@@ -519,6 +519,10 @@
                 + Arrays.toString(permissions);
         Log.w(TAG, text);
         Toast.makeText(this, text, Toast.LENGTH_LONG).show();
+        if (mMetaBugReport == null) {
+            finish();
+            return;
+        }
         if (mIsNewBugReport) {
             BugStorageUtils.setBugReportStatus(this, mMetaBugReport,
                     Status.STATUS_USER_CANCELLED, text);