commit f84183b5460338fab34a41d4d7ef363bbcc934c7
author Dominik Laskowski <domlaskowski@google.com> Mon Jul 25 14:02:10 2022 -0700
committer Dominik Laskowski <domlaskowski@google.com> Mon Jul 25 14:11:48 2022 -0700
tree 609b136b5e32808b3e0423016018c10f9600c000
parent c25048aeb0e5c9021a8aca4bc7e443482c97bea0

SF: Do not return error for deprecated APIs

CTS expects them not to throw.

Bug: 240173270
Test: CtsUiAutomationTestCases
Change-Id: I82d1a83c151e8272b947a7493674aa80c586568b

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 0f25a13..ddec127 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1444,9 +1444,11 @@
                                  const sp<IScreenCaptureListener>&) override;
 
     // TODO(b/239076119): Remove deprecated AIDL.
-    [[deprecated]] binder::Status clearAnimationFrameStats() override { return deprecated(); }
+    [[deprecated]] binder::Status clearAnimationFrameStats() override {
+        return binder::Status::ok();
+    }
     [[deprecated]] binder::Status getAnimationFrameStats(gui::FrameStats*) override {
-        return deprecated();
+        return binder::Status::ok();
     }
 
     binder::Status overrideHdrTypes(const sp<IBinder>& display,
@@ -1513,11 +1515,6 @@
             const sp<gui::IWindowInfosListener>& windowInfosListener) override;
 
 private:
-    static binder::Status deprecated() {
-        using binder::Status;
-        return Status::fromExceptionCode(Status::EX_UNSUPPORTED_OPERATION, "Deprecated");
-    }
-
     static const constexpr bool kUsePermissionCache = true;
     status_t checkAccessPermission(bool usePermissionCache = kUsePermissionCache);
     status_t checkControlDisplayBrightnessPermission();