vold: remove some dead code
Change-Id: Iaeb5d3334ec22ed31da9734bb8d7cd17e6a40eaf Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
parent
cb4dac8a52
commit
befd59c152
5 changed files with 0 additions and 80 deletions
|
@ -16,7 +16,6 @@ LOCAL_SRC_FILES:= \
|
|||
VoldCommand.cpp \
|
||||
NetlinkManager.cpp \
|
||||
NetlinkHandler.cpp \
|
||||
BlockDevice.cpp \
|
||||
Volume.cpp \
|
||||
DirectVolume.cpp \
|
||||
logwrapper.c \
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2008 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.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#define LOG_TAG "Vold"
|
||||
|
||||
#include <cutils/log.h>
|
||||
|
||||
#include "BlockDevice.h"
|
||||
|
||||
BlockDevice::BlockDevice(const char *devpath, int major, int minor) {
|
||||
mDevpath = strdup(devpath);
|
||||
mMajor = major;
|
||||
mMinor = minor;
|
||||
}
|
||||
|
||||
BlockDevice::~BlockDevice() {
|
||||
free(mDevpath);
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2008 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 _BLKDEVICE_H
|
||||
#define _BLKDEVICE_H
|
||||
|
||||
#include <utils/List.h>
|
||||
|
||||
class BlockDevice {
|
||||
|
||||
char *mDevpath;
|
||||
int mMajor;
|
||||
int mMinor;
|
||||
|
||||
public:
|
||||
BlockDevice(const char *devpath, int major, int minor);
|
||||
virtual ~BlockDevice();
|
||||
|
||||
const char *getDevpath() { return mDevpath; }
|
||||
int getMajor() { return mMajor; }
|
||||
int getMinor() { return mMinor; }
|
||||
};
|
||||
|
||||
typedef android::List<BlockDevice *> BlockDeviceCollection;
|
||||
|
||||
#endif
|
|
@ -51,7 +51,6 @@ VolumeManager *VolumeManager::Instance() {
|
|||
|
||||
VolumeManager::VolumeManager() {
|
||||
mDebug = false;
|
||||
mBlockDevices = new BlockDeviceCollection();
|
||||
mVolumes = new VolumeCollection();
|
||||
mActiveContainers = new AsecIdCollection();
|
||||
mBroadcaster = NULL;
|
||||
|
@ -59,7 +58,6 @@ VolumeManager::VolumeManager() {
|
|||
}
|
||||
|
||||
VolumeManager::~VolumeManager() {
|
||||
delete mBlockDevices;
|
||||
delete mVolumes;
|
||||
delete mActiveContainers;
|
||||
}
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
#include <utils/List.h>
|
||||
#include <sysutils/SocketListener.h>
|
||||
|
||||
#include "BlockDevice.h"
|
||||
#include "Volume.h"
|
||||
|
||||
typedef android::List<char *> AsecIdCollection;
|
||||
|
@ -33,7 +32,6 @@ private:
|
|||
|
||||
private:
|
||||
SocketListener *mBroadcaster;
|
||||
BlockDeviceCollection *mBlockDevices;
|
||||
|
||||
VolumeCollection *mVolumes;
|
||||
AsecIdCollection *mActiveContainers;
|
||||
|
|
Loading…
Reference in a new issue