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

Commit e3c3fa0c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7133097 from 4cd01842 to sc-release 

Change-Id: I9b0baa678e462d0b26ab29dfc23a9204dc8ca12b
parents 6ef83694 4cd01842

cmds/flatland/GLHelper.cpp

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>

#include <gui/SurfaceComposerClient.h>

#include <ui/DisplayConfig.h>

#include <ui/DisplayMode.h>



namespace android {
@@ -227,15 +227,15 @@ bool GLHelper::computeWindowScale(uint32_t w, uint32_t h, float* scale) { 
        return false;

    }



    DisplayConfig config;

    status_t err = mSurfaceComposerClient->getActiveDisplayConfig(dpy, &config);

    ui::DisplayMode mode;

    status_t err = mSurfaceComposerClient->getActiveDisplayMode(dpy, &mode);

    if (err != NO_ERROR) {

        fprintf(stderr, "SurfaceComposer::getActiveDisplayConfig failed: %#x\n", err);

        fprintf(stderr, "SurfaceComposer::getActiveDisplayMode failed: %#x\n", err);

        return false;

    }



    float scaleX = static_cast<float>(config.resolution.getWidth()) / w;

    float scaleY = static_cast<float>(config.resolution.getHeight()) / h;

    float scaleX = static_cast<float>(mode.resolution.getWidth()) / w;

    float scaleY = static_cast<float>(mode.resolution.getHeight()) / h;

    *scale = scaleX < scaleY ? scaleX : scaleY;



    return true;

include/audiomanager/IAudioManager.h

+4 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public: 
        TRACK_RECORDER                        = IBinder::FIRST_CALL_TRANSACTION + 4,

        RECORDER_EVENT                        = IBinder::FIRST_CALL_TRANSACTION + 5,

        RELEASE_RECORDER                      = IBinder::FIRST_CALL_TRANSACTION + 6,

        PLAYER_SESSION_ID                     = IBinder::FIRST_CALL_TRANSACTION + 7,

    };



    DECLARE_META_INTERFACE(AudioManager)
@@ -46,7 +47,8 @@ public: 
    // The parcels created by these methods must be kept in sync with the

    // corresponding methods from IAudioService.aidl and objects it imports.

    virtual audio_unique_id_t trackPlayer(player_type_t playerType, audio_usage_t usage,

                audio_content_type_t content, const sp<IBinder>& player) = 0;

                audio_content_type_t content, const sp<IBinder>& player,

                audio_session_t sessionId) = 0;

    /*oneway*/ virtual status_t playerAttributes(audio_unique_id_t piid, audio_usage_t usage,

                audio_content_type_t content)= 0;

    /*oneway*/ virtual status_t playerEvent(audio_unique_id_t piid, player_state_t event,
@@ -55,6 +57,7 @@ public: 
    virtual audio_unique_id_t trackRecorder(const sp<IBinder>& recorder) = 0;

    /*oneway*/ virtual status_t recorderEvent(audio_unique_id_t riid, recorder_state_t event) = 0;

    /*oneway*/ virtual status_t releaseRecorder(audio_unique_id_t riid) = 0;

    /*oneway*/ virtual status_t playerSessionId(audio_unique_id_t piid, audio_session_t sessionId) = 0;

};



// ----------------------------------------------------------------------------

libs/binder/ndk/include_ndk/android/binder_ibinder.h

+0 −12
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ __BEGIN_DECLS 
 android platform host build, you must use libbinder_ndk_host_user.

#endif



#if __ANDROID_API__ >= 29



typedef uint32_t binder_flags_t;

enum {

    /**
@@ -567,10 +565,6 @@ __attribute__((warn_unused_result)) AIBinder_DeathRecipient* AIBinder_DeathRecip 
 */

void AIBinder_DeathRecipient_delete(AIBinder_DeathRecipient* recipient) __INTRODUCED_IN(29);



#endif  //__ANDROID_API__ >= 29



#if __ANDROID_API__ >= 30



/**

 * Gets the extension registered with AIBinder_setExtension.

 *
@@ -640,10 +634,6 @@ binder_status_t AIBinder_getExtension(AIBinder* binder, AIBinder** outExt) __INT 
 */

binder_status_t AIBinder_setExtension(AIBinder* binder, AIBinder* ext) __INTRODUCED_IN(30);



#endif  //__ANDROID_API__ >= 30



#if __ANDROID_API__ >= 31



/**

 * Retrieve the class descriptor for the class.

 *
@@ -728,8 +718,6 @@ AIBinder_Weak* AIBinder_Weak_clone(const AIBinder_Weak* weak); 
 */

bool AIBinder_Weak_lt(const AIBinder_Weak* lhs, const AIBinder_Weak* rhs);



#endif  //__ANDROID_API__ >= 31



__END_DECLS



/** @} */

libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <jni.h>



__BEGIN_DECLS

#if __ANDROID_API__ >= 29



/**

 * Converts an android.os.IBinder object into an AIBinder* object.
@@ -67,7 +66,6 @@ __attribute__((warn_unused_result)) AIBinder* AIBinder_fromJavaBinder(JNIEnv* en 
__attribute__((warn_unused_result)) jobject AIBinder_toJavaBinder(JNIEnv* env, AIBinder* binder)

        __INTRODUCED_IN(29);



#endif  //__ANDROID_API__ >= 29

__END_DECLS



/** @} */

libs/binder/ndk/include_ndk/android/binder_parcel.h

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct AIBinder; 
typedef struct AIBinder AIBinder;



__BEGIN_DECLS

#if __ANDROID_API__ >= 29



/**

 * This object represents a package of data that can be sent between processes. When transacting, an
@@ -1119,7 +1118,6 @@ binder_status_t AParcel_readByteArray(const AParcel* parcel, void* arrayData, 


// @END-PRIMITIVE-READ-WRITE



#endif  //__ANDROID_API__ >= 29

/**

 * Reset the parcel to the initial status.

 *