From b4b410f4a610de26dd37ebfab580db2dcc7dc3ea Mon Sep 17 00:00:00 2001
From: Joanne Chung <joannechung@google.com>
Date: Wed, 18 Aug 2021 11:11:59 +0800
Subject: [PATCH] Rename hidden isStopped() method.

We introduced a hidden isStopped() for autofill to query the Activity
stop status, this is a final method. But the app that also has a
isStopped() method will break because the method cannot be overrided.

Try to rename the method to let it not generic to fix this app compat
issue. But this doesn't guarantee we don't have name collision in the
future.

Bug: 196929439
Test: manual. install app and the app doesn't crash.

Change-Id: I270066f77a69346b693b8329691d14fbcf66b1c6
---
 core/java/android/app/Activity.java                           | 2 +-
 core/java/android/view/autofill/AutofillClientController.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 70ee7d7d064ad..96476a5055efb 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -8410,7 +8410,7 @@ public class Activity extends ContextThemeWrapper
     /**
      * @hide
      */
-    public final boolean isStopped() {
+    public final boolean isVisibleForAutofill() {
         return mStopped;
     }
 
diff --git a/core/java/android/view/autofill/AutofillClientController.java b/core/java/android/view/autofill/AutofillClientController.java
index d4cd968112e7e..70564446986f6 100644
--- a/core/java/android/view/autofill/AutofillClientController.java
+++ b/core/java/android/view/autofill/AutofillClientController.java
@@ -324,7 +324,7 @@ public final class AutofillClientController implements AutofillManager.AutofillC
 
     @Override
     public boolean autofillClientIsVisibleForAutofill() {
-        return !mActivity.isStopped();
+        return !mActivity.isVisibleForAutofill();
     }
 
     @Override