commit 114b33f034be23a7cde5fbefc993250fa72a2bc8
author Iris Yang <irisykyang@google.com> Tue May 31 15:22:54 2022 +0800
committer Iris Yang <irisykyang@google.com> Tue May 31 16:48:53 2022 +0800
tree 7bd8c27b83fcbb3ce8c217b2b0d8cc24bd100b3e
parent 4049ab4f12073ad2872953ca52acc909585ea6a8

Show toast UI with display id

Since the API ToastUI#showToast is extended to take display id, we need
to add a param for display id.

Bug: 233717651
Test: atest CarToastUITest
Change-Id: I92180fb5a0173b81515812b143b1a6c2cd0e88a5

src/com/android/systemui/car/toast/CarToastUI.java

diff --git a/src/com/android/systemui/car/toast/CarToastUI.java b/src/com/android/systemui/car/toast/CarToastUI.java
index 4e1eb82..707e533 100644
--- a/src/com/android/systemui/car/toast/CarToastUI.java
+++ b/src/com/android/systemui/car/toast/CarToastUI.java
@@ -65,7 +65,8 @@
 
     @Override
     public void showToast(int uid, String packageName, IBinder token, CharSequence text,
-            IBinder windowToken, int duration, @Nullable ITransientNotificationCallback callback) {
+            IBinder windowToken, int duration, @Nullable ITransientNotificationCallback callback,
+            int displayId) {
         if (!isAllowListed(packageName) && !isSystemPrivilegedOrPlatformKey(packageName)) {
             if (DEBUG) {
                 Log.w(TAG, packageName
@@ -80,7 +81,7 @@
                             + " is a system privileged app or has been signed with platform key.");
         }
 
-        super.showToast(uid, packageName, token, text, windowToken, duration, callback);
+        super.showToast(uid, packageName, token, text, windowToken, duration, callback, displayId);
     }
 
     private boolean isAllowListed(String packageName) {

tests/src/com/android/systemui/car/toast/CarToastUITest.java

diff --git a/tests/src/com/android/systemui/car/toast/CarToastUITest.java b/tests/src/com/android/systemui/car/toast/CarToastUITest.java
index 2438f8e..5297c43 100644
--- a/tests/src/com/android/systemui/car/toast/CarToastUITest.java
+++ b/tests/src/com/android/systemui/car/toast/CarToastUITest.java
@@ -30,6 +30,7 @@
 import android.os.IBinder;
 import android.testing.AndroidTestingRunner;
 import android.testing.TestableLooper;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.View;
 
@@ -110,7 +111,7 @@
                 false, /* isSignedWithPlatformKey= */ false);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory, never()).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(),
                 anyInt());
@@ -123,7 +124,7 @@
                 false, /* isSignedWithPlatformKey= */ true);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(), anyInt());
     }
@@ -135,7 +136,7 @@
                 true, /* isSignedWithPlatformKey= */ false);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory, never()).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(),
                 anyInt());
@@ -148,7 +149,7 @@
                 true, /* isSignedWithPlatformKey= */ true);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(), anyInt());
     }
@@ -160,7 +161,7 @@
                 false, /* isSignedWithPlatformKey= */ false);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory, never()).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(),
                 anyInt());
@@ -179,7 +180,7 @@
                 false, /* isSignedWithPlatformKey= */ false);
 
         carToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(), anyInt());
     }
@@ -191,7 +192,7 @@
                 false, /* isSignedWithPlatformKey= */ true);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(), anyInt());
     }
@@ -203,7 +204,7 @@
                 true, /* isSignedWithPlatformKey= */ false);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(), anyInt());
     }
@@ -215,7 +216,7 @@
                 true, /* isSignedWithPlatformKey= */ true);
 
         mCarToastUI.showToast(UID, PACKAGE_NAME, mIBinder, TEXT, mIBinder, DURATION,
-                mITransientNotificationCallback);
+                mITransientNotificationCallback, Display.DEFAULT_DISPLAY);
 
         verify(mToastFactory).createToast(any(), eq(TEXT), eq(PACKAGE_NAME), anyInt(), anyInt());
     }