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

Commit b9dd5e0e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9849129 from 68ca576a to udc-release 

Change-Id: I98e6dc763df37d3a3f57d3f1ae910fa12f028827
parents deda9249 68ca576a

cmds/servicemanager/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ cc_binary { 


cc_test {

    name: "servicemanager_test",

    host_supported: true,

    test_suites: ["device-tests"],

    defaults: ["servicemanager_defaults"],

    srcs: [

cmds/servicemanager/ServiceManager.cpp

+36 −31
Original line number Diff line number Diff line
@@ -337,26 +337,26 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi 
    auto ctx = mAccess->getCallingContext();



    if (multiuser_get_app_id(ctx.uid) >= AID_APP) {

        return Status::fromExceptionCode(Status::EX_SECURITY, "App UIDs cannot add services");

        return Status::fromExceptionCode(Status::EX_SECURITY, "App UIDs cannot add services.");

    }



    if (!mAccess->canAdd(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denial");

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    if (binder == nullptr) {

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Null binder");

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Null binder.");

    }



    if (!isValidServiceName(name)) {

        ALOGE("Invalid service name: %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Invalid service name");

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Invalid service name.");

    }



#ifndef VENDORSERVICEMANAGER

    if (!meetsDeclarationRequirements(binder, name)) {

        // already logged

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "VINTF declaration error");

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "VINTF declaration error.");

    }

#endif  // !VENDORSERVICEMANAGER
@@ -368,7 +368,7 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi 
    if (binder->remoteBinder() != nullptr &&

        binder->linkToDeath(sp<ServiceManager>::fromExisting(this)) != OK) {

        ALOGE("Could not linkToDeath when adding %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "linkToDeath failure");

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "Couldn't linkToDeath.");

    }



    auto it = mNameToService.find(name);
@@ -422,7 +422,7 @@ Status ServiceManager::addService(const std::string& name, const sp<IBinder>& bi 


Status ServiceManager::listServices(int32_t dumpPriority, std::vector<std::string>* outList) {

    if (!mAccess->canList(mAccess->getCallingContext())) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    size_t toReserve = 0;
@@ -466,18 +466,18 @@ Status ServiceManager::registerForNotifications( 


    if (!isValidServiceName(name)) {

        ALOGE("Invalid service name: %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Invalid service name.");

    }



    if (callback == nullptr) {

        return Status::fromExceptionCode(Status::EX_NULL_POINTER);

        return Status::fromExceptionCode(Status::EX_NULL_POINTER, "Null callback.");

    }



    if (OK !=

        IInterface::asBinder(callback)->linkToDeath(

                sp<ServiceManager>::fromExisting(this))) {

        ALOGE("Could not linkToDeath when adding %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "Couldn't link to death.");

    }



    mNameToRegistrationCallback[name].push_back(callback);
@@ -497,7 +497,7 @@ Status ServiceManager::unregisterForNotifications( 
    auto ctx = mAccess->getCallingContext();



    if (!mAccess->canFind(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    bool found = false;
@@ -509,7 +509,7 @@ Status ServiceManager::unregisterForNotifications( 


    if (!found) {

        ALOGE("Trying to unregister callback, but none exists %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "Nothing to unregister.");

    }



    return Status::ok();
@@ -519,7 +519,7 @@ Status ServiceManager::isDeclared(const std::string& name, bool* outReturn) { 
    auto ctx = mAccess->getCallingContext();



    if (!mAccess->canFind(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    *outReturn = false;
@@ -547,7 +547,7 @@ binder::Status ServiceManager::getDeclaredInstances(const std::string& interface 
    }



    if (outReturn->size() == 0 && allInstances.size() != 0) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    return Status::ok();
@@ -558,7 +558,7 @@ Status ServiceManager::updatableViaApex(const std::string& name, 
    auto ctx = mAccess->getCallingContext();



    if (!mAccess->canFind(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    *outReturn = std::nullopt;
@@ -587,7 +587,7 @@ Status ServiceManager::getUpdatableNames([[maybe_unused]] const std::string& ape 
    }



    if (outReturn->size() == 0 && apexUpdatableInstances.size() != 0) {

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denial");

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    return Status::ok();
@@ -598,7 +598,7 @@ Status ServiceManager::getConnectionInfo(const std::string& name, 
    auto ctx = mAccess->getCallingContext();



    if (!mAccess->canFind(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    *outReturn = std::nullopt;
@@ -667,36 +667,37 @@ void ServiceManager::tryStartService(const std::string& name) { 
Status ServiceManager::registerClientCallback(const std::string& name, const sp<IBinder>& service,

                                              const sp<IClientCallback>& cb) {

    if (cb == nullptr) {

        return Status::fromExceptionCode(Status::EX_NULL_POINTER);

        return Status::fromExceptionCode(Status::EX_NULL_POINTER, "Callback null.");

    }



    auto ctx = mAccess->getCallingContext();

    if (!mAccess->canAdd(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    auto serviceIt = mNameToService.find(name);

    if (serviceIt == mNameToService.end()) {

        ALOGE("Could not add callback for nonexistent service: %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Service doesn't exist.");

    }



    if (serviceIt->second.ctx.debugPid != IPCThreadState::self()->getCallingPid()) {

        ALOGW("Only a server can register for client callbacks (for %s)", name.c_str());

        return Status::fromExceptionCode(Status::EX_UNSUPPORTED_OPERATION);

        return Status::fromExceptionCode(Status::EX_UNSUPPORTED_OPERATION,

                                         "Only service can register client callback for itself.");

    }



    if (serviceIt->second.binder != service) {

        ALOGW("Tried to register client callback for %s but a different service is registered "

              "under this name.",

              name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_ARGUMENT, "Service mismatch.");

    }



    if (OK !=

        IInterface::asBinder(cb)->linkToDeath(sp<ServiceManager>::fromExisting(this))) {

        ALOGE("Could not linkToDeath when adding client callback for %s", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "Couldn't linkToDeath.");

    }



    mNameToClientCallback[name].push_back(cb);
@@ -810,24 +811,25 @@ void ServiceManager::sendClientCallbackNotifications(const std::string& serviceN 


Status ServiceManager::tryUnregisterService(const std::string& name, const sp<IBinder>& binder) {

    if (binder == nullptr) {

        return Status::fromExceptionCode(Status::EX_NULL_POINTER);

        return Status::fromExceptionCode(Status::EX_NULL_POINTER, "Null service.");

    }



    auto ctx = mAccess->getCallingContext();

    if (!mAccess->canAdd(ctx, name)) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    auto serviceIt = mNameToService.find(name);

    if (serviceIt == mNameToService.end()) {

        ALOGW("Tried to unregister %s, but that service wasn't registered to begin with.",

              name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE, "Service not registered.");

    }



    if (serviceIt->second.ctx.debugPid != IPCThreadState::self()->getCallingPid()) {

        ALOGW("Only a server can unregister itself (for %s)", name.c_str());

        return Status::fromExceptionCode(Status::EX_UNSUPPORTED_OPERATION);

        return Status::fromExceptionCode(Status::EX_UNSUPPORTED_OPERATION,

                                         "Service can only unregister itself.");

    }



    sp<IBinder> storedBinder = serviceIt->second.binder;
@@ -835,14 +837,16 @@ Status ServiceManager::tryUnregisterService(const std::string& name, const sp<IB 
    if (binder != storedBinder) {

        ALOGW("Tried to unregister %s, but a different service is registered under this name.",

              name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE,

                                         "Different service registered under this name.");

    }



    // important because we don't have timer-based guarantees, we don't want to clear

    // this

    if (serviceIt->second.guaranteeClient) {

        ALOGI("Tried to unregister %s, but there is about to be a client.", name.c_str());

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE,

                                         "Can't unregister, pending client.");

    }



    // - kernel driver will hold onto one refcount (during this transaction)
@@ -857,7 +861,8 @@ Status ServiceManager::tryUnregisterService(const std::string& name, const sp<IB 
        // help reduce thrashing, but we should be able to remove it.

        serviceIt->second.guaranteeClient = true;



        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE);

        return Status::fromExceptionCode(Status::EX_ILLEGAL_STATE,

                                         "Can't unregister, known client.");

    }



    ALOGI("Unregistering %s", name.c_str());
@@ -868,7 +873,7 @@ Status ServiceManager::tryUnregisterService(const std::string& name, const sp<IB 


Status ServiceManager::getServiceDebugInfo(std::vector<ServiceDebugInfo>* outReturn) {

    if (!mAccess->canList(mAccess->getCallingContext())) {

        return Status::fromExceptionCode(Status::EX_SECURITY);

        return Status::fromExceptionCode(Status::EX_SECURITY, "SELinux denied.");

    }



    outReturn->reserve(mNameToService.size());

include/android/keycodes.h

+8 −0
Original line number Diff line number Diff line
@@ -831,6 +831,14 @@ enum { 
    AKEYCODE_STYLUS_BUTTON_TAIL = 311,

    /** Key to open recent apps (a.k.a. Overview) */

    AKEYCODE_RECENT_APPS = 312,

    /** User customizable key #1. */

    AKEYCODE_MACRO_1 = 313,

    /** User customizable key #2. */

    AKEYCODE_MACRO_2 = 314,

    /** User customizable key #3. */

    AKEYCODE_MACRO_3 = 315,

    /** User customizable key #4. */

    AKEYCODE_MACRO_4 = 316,



    // NOTE: If you add a new keycode here you must also add it to several other files.

    //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

include/input/Input.h

+18 −6
Original line number Diff line number Diff line
@@ -216,7 +216,21 @@ std::string inputEventSourceToString(int32_t source); 


bool isFromSource(uint32_t source, uint32_t test);



bool isStylusToolType(uint32_t toolType);

/**

 * The pointer tool type.

 */

enum class ToolType {

    UNKNOWN = AMOTION_EVENT_TOOL_TYPE_UNKNOWN,

    FINGER = AMOTION_EVENT_TOOL_TYPE_FINGER,

    STYLUS = AMOTION_EVENT_TOOL_TYPE_STYLUS,

    MOUSE = AMOTION_EVENT_TOOL_TYPE_MOUSE,

    ERASER = AMOTION_EVENT_TOOL_TYPE_ERASER,

    PALM = AMOTION_EVENT_TOOL_TYPE_PALM,

    ftl_first = UNKNOWN,

    ftl_last = PALM,

};



bool isStylusToolType(ToolType toolType);



/*

 * Flags that flow alongside events in the input dispatch system to help with certain
@@ -320,8 +334,6 @@ enum class MotionClassification : uint8_t { 
 */

const char* motionClassificationToString(MotionClassification classification);



const char* motionToolTypeToString(int32_t toolType);



/**

 * Portion of FrameMetrics timeline of interest to input code.

 */
@@ -448,11 +460,11 @@ struct PointerProperties { 
    int32_t id;



    // The pointer tool type.

    int32_t toolType;

    ToolType toolType;



    inline void clear() {

        id = -1;

        toolType = 0;

        toolType = ToolType::UNKNOWN;

    }



    bool operator==(const PointerProperties& other) const;
@@ -638,7 +650,7 @@ public: 
        return mPointerProperties[pointerIndex].id;

    }



    inline int32_t getToolType(size_t pointerIndex) const {

    inline ToolType getToolType(size_t pointerIndex) const {

        return mPointerProperties[pointerIndex].toolType;

    }

include/input/InputTransport.h

+0 −1
Original line number Diff line number Diff line
@@ -669,7 +669,6 @@ private: 
    static void addSample(MotionEvent* event, const InputMessage* msg);

    static bool canAddSample(const Batch& batch, const InputMessage* msg);

    static ssize_t findSampleNoLaterThan(const Batch& batch, nsecs_t time);

    static bool shouldResampleTool(int32_t toolType);



    static bool isTouchResamplingEnabled();

};