From e78f853e469e37bc2cc4f22d9f102d38d756af04 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 14 Dec 2016 13:03:12 -0800 Subject: Move libstorage includes into frameworks/base/lib/storage Move the libstorage includes out of the global include path and into frameworks/base/lib/storage/include, and export it. Bug: 33630870 Test: m -j native Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1 --- libs/storage/Android.mk | 3 + libs/storage/include/storage/IMountService.h | 87 ++++++++++++++++++++++ .../include/storage/IMountServiceListener.h | 45 +++++++++++ .../include/storage/IMountShutdownObserver.h | 46 ++++++++++++ libs/storage/include/storage/IObbActionListener.h | 48 ++++++++++++ 5 files changed, 229 insertions(+) create mode 100644 libs/storage/include/storage/IMountService.h create mode 100644 libs/storage/include/storage/IMountServiceListener.h create mode 100644 libs/storage/include/storage/IMountShutdownObserver.h create mode 100644 libs/storage/include/storage/IObbActionListener.h (limited to 'libs') diff --git a/libs/storage/Android.mk b/libs/storage/Android.mk index d0eb6d4eb425..f8524e379599 100644 --- a/libs/storage/Android.mk +++ b/libs/storage/Android.mk @@ -9,6 +9,9 @@ LOCAL_SRC_FILES:= \ LOCAL_MODULE:= libstorage +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include + LOCAL_CFLAGS += -Wall -Werror LOCAL_SHARED_LIBRARIES := libbinder diff --git a/libs/storage/include/storage/IMountService.h b/libs/storage/include/storage/IMountService.h new file mode 100644 index 000000000000..c3d34d84958b --- /dev/null +++ b/libs/storage/include/storage/IMountService.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2010 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 ANDROID_IMOUNTSERVICE_H +#define ANDROID_IMOUNTSERVICE_H + +#include +#include +#include + +#include + +#include +#include + +namespace android { + +class IMountService: public IInterface { +public: + DECLARE_META_INTERFACE(MountService); + + virtual void registerListener(const sp& listener) = 0; + virtual void + unregisterListener(const sp& listener) = 0; + virtual bool isUsbMassStorageConnected() = 0; + virtual void setUsbMassStorageEnabled(const bool enable) = 0; + virtual bool isUsbMassStorageEnabled() = 0; + virtual int32_t mountVolume(const String16& mountPoint) = 0; + virtual int32_t unmountVolume( + const String16& mountPoint, const bool force, const bool removeEncryption) = 0; + virtual int32_t formatVolume(const String16& mountPoint) = 0; + virtual int32_t + getStorageUsers(const String16& mountPoint, int32_t** users) = 0; + virtual int32_t getVolumeState(const String16& mountPoint) = 0; + virtual int32_t createSecureContainer(const String16& id, + const int32_t sizeMb, const String16& fstype, const String16& key, + const int32_t ownerUid) = 0; + virtual int32_t finalizeSecureContainer(const String16& id) = 0; + virtual int32_t destroySecureContainer(const String16& id) = 0; + virtual int32_t mountSecureContainer(const String16& id, + const String16& key, const int32_t ownerUid) = 0; + virtual int32_t + unmountSecureContainer(const String16& id, const bool force) = 0; + virtual bool isSecureContainerMounted(const String16& id) = 0; + virtual int32_t renameSecureContainer(const String16& oldId, + const String16& newId) = 0; + virtual bool getSecureContainerPath(const String16& id, String16& path) = 0; + virtual int32_t getSecureContainerList(const String16& id, + String16*& containers) = 0; + virtual void shutdown(const sp& observer) = 0; + virtual void finishMediaUpdate() = 0; + virtual void mountObb(const String16& rawPath, const String16& canonicalPath, + const String16& key, const sp& token, + const int32_t nonce) = 0; + virtual void unmountObb(const String16& filename, const bool force, + const sp& token, const int32_t nonce) = 0; + virtual bool isObbMounted(const String16& filename) = 0; + virtual bool getMountedObbPath(const String16& filename, String16& path) = 0; + virtual int32_t decryptStorage(const String16& password) = 0; + virtual int32_t encryptStorage(const String16& password) = 0; +}; + +// ---------------------------------------------------------------------------- + +class BnMountService: public BnInterface { +public: + virtual status_t onTransact(uint32_t code, const Parcel& data, + Parcel* reply, uint32_t flags = 0); +}; + +} +; // namespace android + +#endif // ANDROID_IMOUNTSERVICE_H diff --git a/libs/storage/include/storage/IMountServiceListener.h b/libs/storage/include/storage/IMountServiceListener.h new file mode 100644 index 000000000000..5b1f21cf98b5 --- /dev/null +++ b/libs/storage/include/storage/IMountServiceListener.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2010 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 ANDROID_IMOUNTSERVICELISTENER_H +#define ANDROID_IMOUNTSERVICELISTENER_H + +#include +#include + +namespace android { + +class IMountServiceListener: public IInterface { +public: + DECLARE_META_INTERFACE(MountServiceListener); + + virtual void onUsbMassStorageConnectionChanged(const bool connected) = 0; + virtual void onStorageStateChanged(const String16& path, + const String16& oldState, const String16& newState) = 0; +}; + +// ---------------------------------------------------------------------------- + +class BnMountServiceListener: public BnInterface { +public: + virtual status_t onTransact(uint32_t code, const Parcel& data, + Parcel* reply, uint32_t flags = 0); +}; + +} +; // namespace android + +#endif // ANDROID_IMOUNTSERVICELISTENER_H diff --git a/libs/storage/include/storage/IMountShutdownObserver.h b/libs/storage/include/storage/IMountShutdownObserver.h new file mode 100644 index 000000000000..d019e019bc0d --- /dev/null +++ b/libs/storage/include/storage/IMountShutdownObserver.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2010 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 ANDROID_IMOUNTSHUTDOWNOBSERVER_H +#define ANDROID_IMOUNTSHUTDOWNOBSERVER_H + +#include +#include + +namespace android { + +class IMountShutdownObserver: public IInterface +{ +public: + DECLARE_META_INTERFACE(MountShutdownObserver); + + virtual void onShutDownComplete(const int32_t statusCode) = 0; +}; + +// ---------------------------------------------------------------------------- + +class BnMountShutdownObserver: public BnInterface +{ +public: + virtual status_t onTransact( uint32_t code, + const Parcel& data, + Parcel* reply, + uint32_t flags = 0); +}; + +}; // namespace android + +#endif // ANDROID_IMOUNTSHUTDOWNOBSERVER_H diff --git a/libs/storage/include/storage/IObbActionListener.h b/libs/storage/include/storage/IObbActionListener.h new file mode 100644 index 000000000000..d78273cf2dd4 --- /dev/null +++ b/libs/storage/include/storage/IObbActionListener.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2010 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 ANDROID_IOBBACTIONLISTENER_H +#define ANDROID_IOBBACTIONLISTENER_H + +#include +#include + +#include + +namespace android { + +class IObbActionListener: public IInterface +{ +public: + DECLARE_META_INTERFACE(ObbActionListener); + + virtual void onObbResult(const String16& filename, const int32_t nonce, const int32_t state) = 0; +}; + +// ---------------------------------------------------------------------------- + +class BnObbActionListener: public BnInterface +{ +public: + virtual status_t onTransact( uint32_t code, + const Parcel& data, + Parcel* reply, + uint32_t flags = 0); +}; + +}; // namespace android + +#endif // ANDROID_IOBBACTIONLISTENER_H -- cgit v1.2.3-59-g8ed1b