From 217538546764dec6718bf9508e958652f023fb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= <jalc@google.com>
Date: Tue, 21 May 2024 17:14:36 +0000
Subject: [PATCH] CI

Change-Id: Ide1cbc35f3b69675e504b2d9b7f699e1b1086bb8
---
 .github/workflows/Build.yaml      |  4 ++--
 app/src/debug/AndroidManifest.xml | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 64c63f40f..d24f35b76 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -191,6 +191,7 @@ jobs:
 
       - name: Build projects and run instrumentation tests including screenshots
         id: dropshotsverify
+        continue-on-error: true
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
@@ -213,7 +214,6 @@ jobs:
 
       - name: Record new instrumented screenshots
         id: screenshotsrecordinstrumented
-        continue-on-error: true
         if: steps.dropshotsverify.outcome == 'failure' && github.event_name == 'pull_request'
         uses: reactivecircus/android-emulator-runner@v2
         with:
@@ -228,7 +228,7 @@ jobs:
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           script: adb shell rm -rf /storage/emulated/0/Download/screenshots && ./gradlew connectedDemoDebugAndroidTest -Pdropshots.record --stacktrace
 
-      - name: Push new screenshots if available
+      - name: Push new device screenshots if available
         uses: stefanzweifel/git-auto-commit-action@4b8a201e31cadd9829df349894b28c54e6c19fe6
         if: steps.screenshotsrecordinstrumented.outcome == 'success'
         with:
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index 5920995fb..bc214c778 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2024 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <!-- Needed for Dropshots on API 26 -->