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

Commit 7530afef authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by android-build-merger
Browse files

Merge "Delete unused headers in media/libmedia/include/media" am: 887cb9ea 

am: a47789fd

Change-Id: Ica877916f6781dd6b2ca08d5f5acfe1d64156d69
parents e71a799b a47789fd

include/mediadrm/Crypto.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/media/Crypto.h
 
 No newline at end of file

include/mediadrm/Drm.h

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../media/libmedia/include/media/Drm.h
 
 No newline at end of file

media/libmedia/include/media/Crypto.h

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef CRYPTO_H_



#define CRYPTO_H_



#include <media/ICrypto.h>

#include <utils/threads.h>

#include <utils/KeyedVector.h>



#include "SharedLibrary.h"



namespace android {



struct CryptoFactory;

struct CryptoPlugin;



struct Crypto : public BnCrypto {

    Crypto();

    virtual ~Crypto();



    virtual status_t initCheck() const;



    virtual bool isCryptoSchemeSupported(const uint8_t uuid[16]);



    virtual status_t createPlugin(

            const uint8_t uuid[16], const void *data, size_t size);



    virtual status_t destroyPlugin();



    virtual bool requiresSecureDecoderComponent(

            const char *mime) const;



    virtual void notifyResolution(uint32_t width, uint32_t height);



    virtual status_t setMediaDrmSession(const Vector<uint8_t> &sessionId);



    virtual ssize_t decrypt(const uint8_t key[16], const uint8_t iv[16],

            CryptoPlugin::Mode mode, const CryptoPlugin::Pattern &pattern,

            const sp<IMemory> &source, size_t offset,

            const CryptoPlugin::SubSample *subSamples, size_t numSubSamples,

            const DestinationBuffer &destination, AString *errorDetailMsg);



    virtual void setHeap(const sp<IMemoryHeap>&) {}

    virtual void unsetHeap(const sp<IMemoryHeap>&) {}



private:

    mutable Mutex mLock;



    status_t mInitCheck;

    sp<SharedLibrary> mLibrary;

    CryptoFactory *mFactory;

    CryptoPlugin *mPlugin;



    static KeyedVector<Vector<uint8_t>, String8> mUUIDToLibraryPathMap;

    static KeyedVector<String8, wp<SharedLibrary> > mLibraryPathToOpenLibraryMap;

    static Mutex mMapLock;



    void findFactoryForScheme(const uint8_t uuid[16]);

    bool loadLibraryForScheme(const String8 &path, const uint8_t uuid[16]);

    void closeFactory();



    DISALLOW_EVIL_CONSTRUCTORS(Crypto);

};



}  // namespace android



#endif  // CRYPTO_H_

media/libmedia/include/media/Drm.h

deleted100644 → 0
+0 −172
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef DRM_H_



#define DRM_H_



#include "SharedLibrary.h"



#include <media/IDrm.h>

#include <media/IDrmClient.h>

#include <utils/threads.h>



namespace android {



class DrmFactory;

class DrmPlugin;

struct DrmSessionClientInterface;



struct Drm : public BnDrm,

             public IBinder::DeathRecipient,

             public DrmPluginListener {

    Drm();

    virtual ~Drm();



    virtual status_t initCheck() const;



    virtual bool isCryptoSchemeSupported(const uint8_t uuid[16], const String8 &mimeType);



    virtual status_t createPlugin(const uint8_t uuid[16], const String8 &appPackageName);



    virtual status_t destroyPlugin();



    virtual status_t openSession(Vector<uint8_t> &sessionId);



    virtual status_t closeSession(Vector<uint8_t> const &sessionId);



    virtual status_t

        getKeyRequest(Vector<uint8_t> const &sessionId,

                      Vector<uint8_t> const &initData,

                      String8 const &mimeType, DrmPlugin::KeyType keyType,

                      KeyedVector<String8, String8> const &optionalParameters,

                      Vector<uint8_t> &request, String8 &defaultUrl,

                      DrmPlugin::KeyRequestType *keyRequestType);



    virtual status_t provideKeyResponse(Vector<uint8_t> const &sessionId,

                                        Vector<uint8_t> const &response,

                                        Vector<uint8_t> &keySetId);



    virtual status_t removeKeys(Vector<uint8_t> const &keySetId);



    virtual status_t restoreKeys(Vector<uint8_t> const &sessionId,

                                 Vector<uint8_t> const &keySetId);



    virtual status_t queryKeyStatus(Vector<uint8_t> const &sessionId,

                                    KeyedVector<String8, String8> &infoMap) const;



    virtual status_t getProvisionRequest(String8 const &certType,

                                         String8 const &certAuthority,

                                         Vector<uint8_t> &request,

                                         String8 &defaulUrl);



    virtual status_t provideProvisionResponse(Vector<uint8_t> const &response,

                                              Vector<uint8_t> &certificate,

                                              Vector<uint8_t> &wrappedKey);



    virtual status_t getSecureStops(List<Vector<uint8_t> > &secureStops);

    virtual status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop);



    virtual status_t releaseSecureStops(Vector<uint8_t> const &ssRelease);

    virtual status_t releaseAllSecureStops();



    virtual status_t getPropertyString(String8 const &name, String8 &value ) const;

    virtual status_t getPropertyByteArray(String8 const &name,

                                          Vector<uint8_t> &value ) const;

    virtual status_t setPropertyString(String8 const &name, String8 const &value ) const;

    virtual status_t setPropertyByteArray(String8 const &name,

                                          Vector<uint8_t> const &value ) const;



    virtual status_t setCipherAlgorithm(Vector<uint8_t> const &sessionId,

                                        String8 const &algorithm);



    virtual status_t setMacAlgorithm(Vector<uint8_t> const &sessionId,

                                     String8 const &algorithm);



    virtual status_t encrypt(Vector<uint8_t> const &sessionId,

                             Vector<uint8_t> const &keyId,

                             Vector<uint8_t> const &input,

                             Vector<uint8_t> const &iv,

                             Vector<uint8_t> &output);



    virtual status_t decrypt(Vector<uint8_t> const &sessionId,

                             Vector<uint8_t> const &keyId,

                             Vector<uint8_t> const &input,

                             Vector<uint8_t> const &iv,

                             Vector<uint8_t> &output);



    virtual status_t sign(Vector<uint8_t> const &sessionId,

                          Vector<uint8_t> const &keyId,

                          Vector<uint8_t> const &message,

                          Vector<uint8_t> &signature);



    virtual status_t verify(Vector<uint8_t> const &sessionId,

                            Vector<uint8_t> const &keyId,

                            Vector<uint8_t> const &message,

                            Vector<uint8_t> const &signature,

                            bool &match);



    virtual status_t signRSA(Vector<uint8_t> const &sessionId,

                             String8 const &algorithm,

                             Vector<uint8_t> const &message,

                             Vector<uint8_t> const &wrappedKey,

                             Vector<uint8_t> &signature);



    virtual status_t setListener(const sp<IDrmClient>& listener);



    virtual void sendEvent(DrmPlugin::EventType eventType, int extra,

                           Vector<uint8_t> const *sessionId,

                           Vector<uint8_t> const *data);



    virtual void sendExpirationUpdate(Vector<uint8_t> const *sessionId,

                                      int64_t expiryTimeInMS);



    virtual void sendKeysChange(Vector<uint8_t> const *sessionId,

                                Vector<DrmPlugin::KeyStatus> const *keyStatusList,

                                bool hasNewUsableKey);



    virtual void binderDied(const wp<IBinder> &the_late_who);



private:

    static Mutex mLock;



    status_t mInitCheck;



    sp<DrmSessionClientInterface> mDrmSessionClient;



    sp<IDrmClient> mListener;

    mutable Mutex mEventLock;

    mutable Mutex mNotifyLock;



    sp<SharedLibrary> mLibrary;

    DrmFactory *mFactory;

    DrmPlugin *mPlugin;



    static KeyedVector<Vector<uint8_t>, String8> mUUIDToLibraryPathMap;

    static KeyedVector<String8, wp<SharedLibrary> > mLibraryPathToOpenLibraryMap;

    static Mutex mMapLock;



    void findFactoryForScheme(const uint8_t uuid[16]);

    bool loadLibraryForScheme(const String8 &path, const uint8_t uuid[16]);

    void closeFactory();

    void writeByteArray(Parcel &obj, Vector<uint8_t> const *array);



    DISALLOW_EVIL_CONSTRUCTORS(Drm);

};



}  // namespace android



#endif  // CRYPTO_H_