diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-06-07 12:44:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-07 12:44:52 -0700 |
| commit | 65abc4531f1222ffa04350a3afc6d61fcc77b2a3 (patch) | |
| tree | 933c9e581180dac18434f1573e3a8b88984d1bdd /services/java | |
| parent | ffccff0864a39f59b7ec378c4cf69737a01b8599 (diff) | |
| parent | 8e8b280bd19fa6cb69bb19e1d90cf03a47ba2d72 (diff) | |
| download | frameworks_base-65abc4531f1222ffa04350a3afc6d61fcc77b2a3.zip frameworks_base-65abc4531f1222ffa04350a3afc6d61fcc77b2a3.tar.gz frameworks_base-65abc4531f1222ffa04350a3afc6d61fcc77b2a3.tar.bz2 | |
Merge "StorageVolume: Add allowMassStorage flag"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/MountService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index f78dca9..c86f962 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1121,16 +1121,20 @@ class MountService extends IMountService.Stub implements INativeDaemonConnectorC com.android.internal.R.styleable.Storage_emulated, false); int mtpReserve = a.getInt( com.android.internal.R.styleable.Storage_mtpReserve, 0); + boolean allowMassStorage = a.getBoolean( + com.android.internal.R.styleable.Storage_allowMassStorage, false); Slog.d(TAG, "got storage path: " + path + " description: " + description + " primary: " + primary + " removable: " + removable + - " emulated: " + emulated + " mtpReserve: " + mtpReserve); + " emulated: " + emulated + " mtpReserve: " + mtpReserve + + " allowMassStorage: " + allowMassStorage); if (path == null || description == null) { Slog.e(TAG, "path or description is null in readStorageList"); } else { String pathString = path.toString(); StorageVolume volume = new StorageVolume(pathString, - description.toString(), removable, emulated, mtpReserve); + description.toString(), removable, emulated, + mtpReserve, allowMassStorage); if (primary) { if (mPrimaryVolume == null) { mPrimaryVolume = volume; |