commit 8ff4ccd19f8fc4a2fbcfbe02b0f3f4da819cb2c5
author Miranda Kephart <mkephart@google.com> Tue Sep 10 13:46:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 10 13:46:44 2019 -0700
tree 6d405b3b9e1caf9c843eb0ceef69fbfd23d3b170
parent 2d2d432c1337a25d02780236560eaff7f63a1fc5
parent bda95478acd4da2a12a750a6f6d3011109a65f3b

[automerger skipped] Merging from qt-qpr1-sysui-dev @ build 5855545
am: bda95478ac -s ours
am skip reason: change_id Ide60b1927a5f1130a950e87843deb578b494f95c with SHA1 2d2d432c13 is in history

Change-Id: Ieba5b108d4543f0937c1ee43d85bc9e89ce877df

Android.bp

diff --git a/Android.bp b/Android.bp
index 7aaa17d..5730600 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,14 +14,14 @@
 
 android_library {
     name: "ExtServices-core",
-    srcs: [
-        "src/**/*.java",
-    ],
-    resource_dirs: [
-        "res",
-    ],
+     srcs: [
+         "src/**/*.java",
+     ],
+     resource_dirs: [
+         "res",
+     ],
 
-    manifest: "AndroidManifest.xml",
+     manifest: "AndroidManifest.xml",
 }
 
 android_app {

OWNERS

diff --git a/OWNERS b/OWNERS
index bf52f35..ec5c40a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,2 @@
-set noparent
-
-baligh@google.com
-delphij@google.com
+juliacr@google.com
+dsandler@google.com

tests/src/android/ext/services/notification/SmartActionsHelperTest.java

diff --git a/tests/src/android/ext/services/notification/SmartActionsHelperTest.java b/tests/src/android/ext/services/notification/SmartActionsHelperTest.java
index 69abe87..52b7225 100644
--- a/tests/src/android/ext/services/notification/SmartActionsHelperTest.java
+++ b/tests/src/android/ext/services/notification/SmartActionsHelperTest.java
@@ -46,9 +46,11 @@
 import android.view.textclassifier.TextClassifier;
 import android.view.textclassifier.TextClassifierEvent;
 
-import com.google.common.truth.FailureStrategy;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.Subject;
-import com.google.common.truth.SubjectFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -503,19 +505,19 @@
     private static final class MessageSubject
             extends Subject<MessageSubject, ConversationActions.Message> {
 
-        private static final SubjectFactory<MessageSubject, ConversationActions.Message> FACTORY =
-                new SubjectFactory<MessageSubject, ConversationActions.Message>() {
+        private static final Subject.Factory<MessageSubject, ConversationActions.Message> FACTORY =
+                new Subject.Factory<MessageSubject, ConversationActions.Message>() {
                     @Override
-                    public MessageSubject getSubject(
-                            @NonNull FailureStrategy failureStrategy,
+                    public MessageSubject createSubject(
+                            @NonNull FailureMetadata failureMetadata,
                             @NonNull ConversationActions.Message subject) {
-                        return new MessageSubject(failureStrategy, subject);
+                        return new MessageSubject(failureMetadata, subject);
                     }
                 };
 
         private MessageSubject(
-                FailureStrategy failureStrategy, @Nullable ConversationActions.Message subject) {
-            super(failureStrategy, subject);
+                FailureMetadata failureMetadata, @Nullable ConversationActions.Message subject) {
+            super(failureMetadata, subject);
         }
 
         private void hasText(String text) {