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

Commit f9e3617a authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of ab3df6d8 to mnc-dr-dev-plus-aosp 

Change-Id: I2f6ef2d43275739d24ad8b79270f18e374d88e55
parents 4146f9b6 ab3df6d8

media/libmediaplayerservice/Drm.cpp

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ static inline int getCallingPid() { 
}



static bool checkPermission(const char* permissionString) {

#ifndef HAVE_ANDROID_OS

    return true;

#endif

    if (getpid() == IPCThreadState::self()->getCallingPid()) return true;

    bool ok = checkCallingPermission(String16(permissionString));

    if (!ok) ALOGE("Request requires %s", permissionString);

media/libmediaplayerservice/MediaPlayerService.cpp

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ extern ALooperRoster gLooperRoster; 




static bool checkPermission(const char* permissionString) {

#ifndef HAVE_ANDROID_OS

    return true;

#endif

    if (getpid() == IPCThreadState::self()->getCallingPid()) return true;

    bool ok = checkCallingPermission(String16(permissionString));

    if (!ok) ALOGE("Request requires %s", permissionString);

media/libmediaplayerservice/MediaRecorderClient.cpp

+0 −3
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ const char* cameraPermission = "android.permission.CAMERA"; 
const char* recordAudioPermission = "android.permission.RECORD_AUDIO";



static bool checkPermission(const char* permissionString) {

#ifndef HAVE_ANDROID_OS

    return true;

#endif

    if (getpid() == IPCThreadState::self()->getCallingPid()) return true;

    bool ok = checkCallingPermission(String16(permissionString));

    if (!ok) ALOGE("Request requires %s", permissionString);

media/libstagefright/rtsp/ARTSPConnection.cpp

+0 −9
Original line number Diff line number Diff line
@@ -898,11 +898,6 @@ bool ARTSPConnection::parseAuthMethod(const sp<ARTSPResponse> &response) { 
    if (!strncmp(value.c_str(), "Basic", 5)) {

        mAuthType = BASIC;

    } else {

#if !defined(HAVE_ANDROID_OS)

        // We don't have access to the MD5 implementation on the simulator,

        // so we won't support digest authentication.

        return false;

#endif



        CHECK(!strncmp(value.c_str(), "Digest", 6));

        mAuthType = DIGEST;
@@ -919,7 +914,6 @@ bool ARTSPConnection::parseAuthMethod(const sp<ARTSPResponse> &response) { 
    return true;

}



#if defined(HAVE_ANDROID_OS)

static void H(const AString &s, AString *out) {

    out->clear();
@@ -948,7 +942,6 @@ static void H(const AString &s, AString *out) { 
        out->append(&nibble, 1);

    }

}

#endif



static void GetMethodAndURL(

        const AString &request, AString *method, AString *url) {
@@ -990,7 +983,6 @@ void ARTSPConnection::addAuthentication(AString *request) { 
        return;

    }



#if defined(HAVE_ANDROID_OS)

    CHECK_EQ((int)mAuthType, (int)DIGEST);



    AString method, url;
@@ -1039,7 +1031,6 @@ void ARTSPConnection::addAuthentication(AString *request) { 
    fragment.append("\r\n");



    request->insert(fragment, i + 2);

#endif

}



void ARTSPConnection::addUserAgent(AString *request) const {