Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fa2cb6c authored by Alec Mouri's avatar Alec Mouri
Browse files

[ANativeWindow] Add test infrastructure for apex apis 

* Add ANativeWindow_getLastDequeueDuration as proof of concept
* Add ANativeWindowTest harness
* apex/ include directory for code living in apex modules, so that vndk
or system apis aren't pulled in
* TEST_MAPPING configuration for presubmit

Note that we're not piggybacking off of the existing Surface_test
harness, as those tests assume that the libgui Surface is The
ANativeWindow surface implementation, which means that those tests may
test implementation details that the harness defined in this change
should not attempt to test. Further, if an alternative implementation is
provided (e.g. an ANativeWindow -> BLAST adapter), we should be able to
parameterize the tests here. For now, however, we'll keep the assumption
that Surface is the only relevant surface implementation so that nonzero
tests may be written.

Bug: 137012161
Bug: 137012798
Test: libnativewindow_test
Change-Id: I0dddc348563ba95530fb1bd04bde66080755a91d
parent 82c7531e

libs/gui/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "imports": [

    {

      "path": "frameworks/native/libs/nativewindow"

    }

  ]

}

libs/nativewindow/ANativeWindow.cpp

+8 −0
Original line number Diff line number Diff line
@@ -266,3 +266,11 @@ int ANativeWindow_setAutoRefresh(ANativeWindow* window, bool autoRefresh) { 
int ANativeWindow_setAutoPrerotation(ANativeWindow* window, bool autoPrerotation) {

    return native_window_set_auto_prerotation(window, autoPrerotation);

}



/**************************************************************************************************

 * apex-stable

 **************************************************************************************************/



int ANativeWindow_getLastDequeueDuration(ANativeWindow* window) {

    return query(window, NATIVE_WINDOW_LAST_DEQUEUE_DURATION);

}

libs/nativewindow/TEST_MAPPING

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "libnativewindow_test"

    }

  ]

}

libs/nativewindow/include/apex/window.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <nativebase/nativebase.h>



// apex is a superset of the NDK

#include <android/native_window.h>



__BEGIN_DECLS



/**

 * Retrieves how long it took for the last time a buffer was dequeued.

 *

 * \return a negative value on error, otherwise returns the duration in

 * microseconds.

 */

int ANativeWindow_getLastDequeueDuration(ANativeWindow* window);



__END_DECLS

libs/nativewindow/include/system/window.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
#include <unistd.h>

#include <stdbool.h>



// system/window.h is a superset of the vndk

// system/window.h is a superset of the vndk and apex apis

#include <apex/window.h>

#include <vndk/window.h>