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

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

Snap for 6220271 from 0a588706 to rvc-release 

Change-Id: Ib984e4d987df68aa0927c46c7ace70937dc4baef
parents 30be0f2e 0a588706

cmds/installd/InstalldNativeService.cpp

+7 −5
Original line number Diff line number Diff line
@@ -701,12 +701,14 @@ binder::Status InstalldNativeService::destroyAppData(const std::unique_ptr<std:: 
        if (delete_dir_contents_and_dir(path) != 0) {

            res = error("Failed to delete " + path);

        }

        if ((flags & FLAG_CLEAR_APP_DATA_KEEP_ART_PROFILES) == 0) {

            destroy_app_current_profiles(packageName, userId);

            // TODO(calin): If the package is still installed by other users it's probably

            // beneficial to keep the reference profile around.

            // Verify if it's ok to do that.

            destroy_app_reference_profile(packageName);

        }

    }

    if (flags & FLAG_STORAGE_EXTERNAL) {

        std::lock_guard<std::recursive_mutex> lock(mMountsLock);

        for (const auto& n : mStorageMounts) {

include/android/surface_control.h

+6 −3
Original line number Diff line number Diff line
@@ -425,12 +425,15 @@ void ASurfaceTransaction_setHdrMetadata_cta861_3(ASurfaceTransaction* transactio 
 * valid refresh rate for this device's display - e.g., it's fine to pass 30fps to a device that can

 * only run the display at 60fps.

 *

 * |compatibility| The frame rate compatibility of this surface. The compatibility value may

 * influence the system's choice of display frame rate. To specify a compatibility use the

 * ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_* enum.

 *

 * Available since API level 30.

 */

void ASurfaceTransaction_setFrameRate(ASurfaceTransaction* transaction,

                                      ASurfaceControl* surface_control,

                                      float frameRate)

                                      __INTRODUCED_IN(30);

                                      ASurfaceControl* surface_control, float frameRate,

                                      int8_t compatibility) __INTRODUCED_IN(30);



#endif // __ANDROID_API__ >= 30

libs/binder/Static.cpp

+3 −7
Original line number Diff line number Diff line
@@ -64,13 +64,9 @@ private: 
    int mFD;

};



static LogTextOutput gLogTextOutput;

static FdTextOutput gStdoutTextOutput(STDOUT_FILENO);

static FdTextOutput gStderrTextOutput(STDERR_FILENO);



TextOutput& alog(gLogTextOutput);

TextOutput& aout(gStdoutTextOutput);

TextOutput& aerr(gStderrTextOutput);

TextOutput& alog(*new LogTextOutput());

TextOutput& aout(*new FdTextOutput(STDOUT_FILENO));

TextOutput& aerr(*new FdTextOutput(STDERR_FILENO));



// ------------ ProcessState.cpp

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

+3 −1
Original line number Diff line number Diff line
@@ -238,7 +238,9 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, 
    // ourselves. The defaults are harmless.

    AIBinder_Class_setOnDump(clazz, ICInterfaceData::onDump);

#ifdef HAS_BINDER_SHELL_COMMAND

    if (AIBinder_Class_setHandleShellCommand != nullptr) {

        AIBinder_Class_setHandleShellCommand(clazz, ICInterfaceData::handleShellCommand);

    }

#endif

    return clazz;

}

libs/binder/ndk/include_platform/android/binder_shell.h

+2 −3
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ typedef binder_status_t (*AIBinder_handleShellCommand)(AIBinder* binder, int in, 
 * \param handleShellCommand function to call when a shell transaction is

 * received

 */

void AIBinder_Class_setHandleShellCommand(AIBinder_Class* clazz,

                                          AIBinder_handleShellCommand handleShellCommand)

        __INTRODUCED_IN(30);

__attribute__((weak)) void AIBinder_Class_setHandleShellCommand(

        AIBinder_Class* clazz, AIBinder_handleShellCommand handleShellCommand) __INTRODUCED_IN(30);



__END_DECLS