aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-16 23:21:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-03-16 23:21:02 +0000
commit5f10aa72e67f843212571ae3195519b040defac8 (patch)
treee5ef98d79d553e09c745a9550ac462c35f57a35c
parent2c7b21e7911e75553db1debd8abc7d6c204d5c78 (diff)
parent5983d0541733865fec1d6f30fae164011a44ba7b (diff)
downloadsupport-snap-temp-L71000000953565152.tar.gz
Merge "Merge cherrypicks of [2005153] into androidx-window-release." into androidx-window-releasesnap-temp-L71000000953565152
-rw-r--r--window/window/proguard-rules.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/window/window/proguard-rules.pro b/window/window/proguard-rules.pro
index 6e5901754cc..5557db78686 100644
--- a/window/window/proguard-rules.pro
+++ b/window/window/proguard-rules.pro
@@ -16,10 +16,10 @@
# be used. See b/157286362 and b/165268619 for details.
# TODO(b/208543178) investigate how to pass header jar to R8 so we don't need this rule
-if class androidx.window.layout.SidecarCompat {
- public setExtensionCallback(androidx.window.layout.ExtensionInterfaceCompat$ExtensionCallbackInterface);
+ public void setExtensionCallback(androidx.window.layout.ExtensionInterfaceCompat$ExtensionCallbackInterface);
}
-keep class androidx.window.layout.SidecarCompat$TranslatingCallback,
androidx.window.layout.SidecarCompat$DistinctSidecarElementCallback {
- public onDeviceStateChanged(androidx.window.sidecar.SidecarDeviceState);
- public onWindowLayoutChanged(android.os.IBinder, androidx.window.sidecar.SidecarWindowLayoutInfo);
+ public void onDeviceStateChanged(androidx.window.sidecar.SidecarDeviceState);
+ public void onWindowLayoutChanged(android.os.IBinder, androidx.window.sidecar.SidecarWindowLayoutInfo);
} \ No newline at end of file