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

Commit 5989a2f6 authored by Bill Yi's avatar Bill Yi
Browse files

Merge pi-dr1-dev to aosp-master 

Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459
parents 7d49f30d 9232ca37

audio/common/all-versions/default/service/android.hardware.audio@2.0-service.rc

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ service vendor.audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service 
    class hal

    user audioserver

    # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)

    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct

    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct wakelock

    capabilities BLOCK_SUSPEND

    ioprio rt 4

    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks

    # audioflinger restarts itself when it loses connection with the hal

graphics/composer/2.2/default/android.hardware.graphics.composer@2.2-service.rc

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ service vendor.hwcomposer-2-2 /vendor/bin/hw/android.hardware.graphics.composer@ 
    group graphics drmrpc

    capabilities SYS_NICE

    onrestart restart surfaceflinger

    writepid /dev/cpuset/system-background/tasks

keymaster/4.0/support/Keymaster.cpp

+4 −4
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ static void computeHmac(const Keymaster::KeymasterSet& keymasters, 
                    sharingCheck = curSharingCheck;

                    firstKeymaster = false;

                }

                CHECK(curSharingCheck == sharingCheck)

                    << "HMAC computation failed for " << *keymaster  //

                if (curSharingCheck != sharingCheck)

                    LOG(WARNING) << "HMAC computation failed for " << *keymaster  //

                                 << " Expected: " << sharingCheck                 //

                                 << " got: " << curSharingCheck;

            });