}
}
- /** returns the FAT file system volume ID for the volume mounted
- * at the given mount point, or -1 for failure
- * @param mountPoint point for FAT volume
- * @return volume ID or -1
- */
- public static native int getFatVolumeId(String mountPoint);
-
/**
* Perform an fsync on the given FileOutputStream. The stream at this
* point must be flushed but not yet closed.
import android.os.Parcelable;
import android.os.UserHandle;
+import com.android.internal.util.IndentingPrintWriter;
+
+import java.io.CharArrayWriter;
import java.io.File;
/**
/** When set, indicates exclusive ownership of this volume */
private final UserHandle mOwner;
+ private String mUuid;
+ private String mUserLabel;
+
// StorageVolume extra for ACTION_MEDIA_REMOVED, ACTION_MEDIA_UNMOUNTED, ACTION_MEDIA_CHECKING,
// ACTION_MEDIA_NOFS, ACTION_MEDIA_MOUNTED, ACTION_MEDIA_SHARED, ACTION_MEDIA_UNSHARED,
// ACTION_MEDIA_BAD_REMOVAL, ACTION_MEDIA_UNMOUNTABLE and ACTION_MEDIA_EJECT broadcasts.
mAllowMassStorage = in.readInt() != 0;
mMaxFileSize = in.readLong();
mOwner = in.readParcelable(null);
+ mUuid = in.readString();
+ mUserLabel = in.readString();
}
public static StorageVolume fromTemplate(StorageVolume template, File path, UserHandle owner) {
return mOwner;
}
+ public void setUuid(String uuid) {
+ mUuid = uuid;
+ }
+
+ public String getUuid() {
+ return mUuid;
+ }
+
+ /**
+ * Parse and return volume UUID as FAT volume ID, or return -1 if unable to
+ * parse or UUID is unknown.
+ */
+ public int getFatVolumeId() {
+ if (mUuid == null || mUuid.length() != 9) {
+ return -1;
+ }
+ try {
+ return Integer.parseInt(mUuid.replace("-", ""), 16);
+ } catch (NumberFormatException e) {
+ return -1;
+ }
+ }
+
+ public void setUserLabel(String userLabel) {
+ mUserLabel = userLabel;
+ }
+
+ public String getUserLabel() {
+ return mUserLabel;
+ }
+
@Override
public boolean equals(Object obj) {
if (obj instanceof StorageVolume && mPath != null) {
@Override
public String toString() {
- final StringBuilder builder = new StringBuilder("StorageVolume [");
- builder.append("mStorageId=").append(mStorageId);
- builder.append(" mPath=").append(mPath);
- builder.append(" mDescriptionId=").append(mDescriptionId);
- builder.append(" mPrimary=").append(mPrimary);
- builder.append(" mRemovable=").append(mRemovable);
- builder.append(" mEmulated=").append(mEmulated);
- builder.append(" mMtpReserveSpace=").append(mMtpReserveSpace);
- builder.append(" mAllowMassStorage=").append(mAllowMassStorage);
- builder.append(" mMaxFileSize=").append(mMaxFileSize);
- builder.append(" mOwner=").append(mOwner);
- builder.append("]");
- return builder.toString();
+ final CharArrayWriter writer = new CharArrayWriter();
+ dump(new IndentingPrintWriter(writer, " ", 80));
+ return writer.toString();
+ }
+
+ public void dump(IndentingPrintWriter pw) {
+ pw.println("StorageVolume:");
+ pw.increaseIndent();
+ pw.printPair("mStorageId", mStorageId);
+ pw.printPair("mPath", mPath);
+ pw.printPair("mDescriptionId", mDescriptionId);
+ pw.printPair("mPrimary", mPrimary);
+ pw.printPair("mRemovable", mRemovable);
+ pw.printPair("mEmulated", mEmulated);
+ pw.printPair("mMtpReserveSpace", mMtpReserveSpace);
+ pw.printPair("mAllowMassStorage", mAllowMassStorage);
+ pw.printPair("mMaxFileSize", mMaxFileSize);
+ pw.printPair("mOwner", mOwner);
+ pw.printPair("mUuid", mUuid);
+ pw.printPair("mUserLabel", mUserLabel);
+ pw.decreaseIndent();
}
public static final Creator<StorageVolume> CREATOR = new Creator<StorageVolume>() {
parcel.writeInt(mAllowMassStorage ? 1 : 0);
parcel.writeLong(mMaxFileSize);
parcel.writeParcelable(mOwner, flags);
+ parcel.writeString(mUuid);
+ parcel.writeString(mUserLabel);
}
}
android_text_AndroidCharacter.cpp \
android_text_AndroidBidi.cpp \
android_os_Debug.cpp \
- android_os_FileUtils.cpp \
android_os_MemoryFile.cpp \
android_os_MessageQueue.cpp \
android_os_Parcel.cpp \
extern int register_android_os_SystemClock(JNIEnv* env);
extern int register_android_os_Trace(JNIEnv* env);
extern int register_android_os_FileObserver(JNIEnv *env);
-extern int register_android_os_FileUtils(JNIEnv *env);
extern int register_android_os_UEventObserver(JNIEnv* env);
extern int register_android_os_MemoryFile(JNIEnv* env);
extern int register_android_net_LocalSocketImpl(JNIEnv* env);
REG_JNI(register_android_database_SQLiteDebug),
REG_JNI(register_android_os_Debug),
REG_JNI(register_android_os_FileObserver),
- REG_JNI(register_android_os_FileUtils),
REG_JNI(register_android_os_MessageQueue),
REG_JNI(register_android_os_SELinux),
REG_JNI(register_android_os_Trace),
+++ /dev/null
-/* //device/libs/android_runtime/android_util_Process.cpp
-**
-** Copyright 2006, 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.
-*/
-
-#define LOG_TAG "FileUtils"
-
-#include <utils/Log.h>
-
-#include <android_runtime/AndroidRuntime.h>
-
-#include "JNIHelp.h"
-
-#include <sys/errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <linux/msdos_fs.h>
-
-namespace android {
-
-jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring path)
-{
- if (path == NULL) {
- jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
- return -1;
- }
- const char *pathStr = env->GetStringUTFChars(path, NULL);
- int result = -1;
- // only if our system supports this ioctl
- #ifdef VFAT_IOCTL_GET_VOLUME_ID
- int fd = open(pathStr, O_RDONLY);
- if (fd >= 0) {
- result = ioctl(fd, VFAT_IOCTL_GET_VOLUME_ID);
- close(fd);
- }
- #endif
-
- env->ReleaseStringUTFChars(path, pathStr);
- return result;
-}
-
-static const JNINativeMethod methods[] = {
- {"getFatVolumeId", "(Ljava/lang/String;)I", (void*)android_os_FileUtils_getFatVolumeId},
-};
-
-static const char* const kFileUtilsPathName = "android/os/FileUtils";
-
-int register_android_os_FileUtils(JNIEnv* env)
-{
- return AndroidRuntime::registerNativeMethods(
- env, kFileUtilsPathName,
- methods, NELEM(methods));
-}
-
-}
import android.os.storage.StorageVolume;
import android.text.TextUtils;
import android.util.AttributeSet;
+import android.util.Log;
import android.util.Slog;
import android.util.Xml;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IMediaContainerService;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import com.android.internal.util.XmlUtils;
import com.android.server.NativeDaemonConnector.Command;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
* 600 series - Unsolicited broadcasts.
*/
public static final int VolumeStateChange = 605;
+ public static final int VolumeUuidChange = 613;
+ public static final int VolumeUserLabelChange = 614;
public static final int VolumeDiskInserted = 630;
public static final int VolumeDiskRemoved = 631;
public static final int VolumeBadRemoval = 632;
notifyVolumeStateChange(
cooked[2], cooked[3], Integer.parseInt(cooked[7]),
Integer.parseInt(cooked[10]));
+ } else if (code == VoldResponseCode.VolumeUuidChange) {
+ // Format: nnn <label> <path> <uuid>
+ final String path = cooked[2];
+ final String uuid = (cooked.length > 3) ? cooked[3] : null;
+
+ final StorageVolume vol = mVolumesByPath.get(path);
+ if (vol != null) {
+ vol.setUuid(uuid);
+ }
+
+ } else if (code == VoldResponseCode.VolumeUserLabelChange) {
+ // Format: nnn <label> <path> <label>
+ final String path = cooked[2];
+ final String userLabel = (cooked.length > 3) ? cooked[3] : null;
+
+ final StorageVolume vol = mVolumesByPath.get(path);
+ if (vol != null) {
+ vol.setUserLabel(userLabel);
+ }
+
} else if ((code == VoldResponseCode.VolumeDiskInserted) ||
(code == VoldResponseCode.VolumeDiskRemoved) ||
(code == VoldResponseCode.VolumeBadRemoval)) {
}
@Override
- protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP) != PackageManager.PERMISSION_GRANTED) {
- pw.println("Permission Denial: can't dump ActivityManager from from pid="
- + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()
- + " without permission " + android.Manifest.permission.DUMP);
- return;
- }
+ protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
- synchronized (mObbMounts) {
- pw.println(" mObbMounts:");
+ final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ", 160);
- final Iterator<Entry<IBinder, List<ObbState>>> binders = mObbMounts.entrySet().iterator();
+ synchronized (mObbMounts) {
+ pw.println("mObbMounts:");
+ pw.increaseIndent();
+ final Iterator<Entry<IBinder, List<ObbState>>> binders = mObbMounts.entrySet()
+ .iterator();
while (binders.hasNext()) {
Entry<IBinder, List<ObbState>> e = binders.next();
- pw.print(" Key="); pw.println(e.getKey().toString());
+ pw.println(e.getKey() + ":");
+ pw.increaseIndent();
final List<ObbState> obbStates = e.getValue();
for (final ObbState obbState : obbStates) {
- pw.print(" "); pw.println(obbState.toString());
+ pw.println(obbState);
}
+ pw.decreaseIndent();
}
+ pw.decreaseIndent();
- pw.println("");
- pw.println(" mObbPathToStateMap:");
+ pw.println();
+ pw.println("mObbPathToStateMap:");
+ pw.increaseIndent();
final Iterator<Entry<String, ObbState>> maps = mObbPathToStateMap.entrySet().iterator();
while (maps.hasNext()) {
final Entry<String, ObbState> e = maps.next();
- pw.print(" "); pw.print(e.getKey());
- pw.print(" -> "); pw.println(e.getValue().toString());
+ pw.print(e.getKey());
+ pw.print(" -> ");
+ pw.println(e.getValue());
}
+ pw.decreaseIndent();
}
- pw.println("");
-
synchronized (mVolumesLock) {
- pw.println(" mVolumes:");
-
- final int N = mVolumes.size();
- for (int i = 0; i < N; i++) {
- final StorageVolume v = mVolumes.get(i);
- pw.print(" ");
- pw.println(v.toString());
- pw.println(" state=" + mVolumeStates.get(v.getPath()));
+ pw.println();
+ pw.println("mVolumes:");
+ pw.increaseIndent();
+ for (StorageVolume volume : mVolumes) {
+ pw.println(volume);
+ pw.increaseIndent();
+ pw.println("Current state: " + mVolumeStates.get(volume.getPath()));
+ pw.decreaseIndent();
}
+ pw.decreaseIndent();
}
pw.println();
- pw.println(" mConnection:");
+ pw.println("mConnection:");
+ pw.increaseIndent();
mConnector.dump(fd, pw, args);
+ pw.decreaseIndent();
}
/** {@inheritDoc} */
OSDN Git Service
