drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev

Browse Source 
* commit '0100625bb316ecbd99873b72756ffba8613c3456':
  Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
This commit is contained in:
Fabrice Di Meglio
2012-05-24 10:45:54 -07:00
committed by Android Git Automerger
parent 4f31367680 0100625bb3
commit 07e28d1e9b
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/java/com/android/server/MountService.java
View File

@ -1065,7 +1065,9 @@ class MountService extends IMountService.Stub
private static final String TAG_STORAGE_LIST = "StorageList";
private static final String TAG_STORAGE = "storage";
private void readStorageList(Resources resources) {
private void readStorageList() {
Resources resources = mContext.getResources();
int id = com.android.internal.R.xml.storage_list;
XmlResourceParser parser = resources.getXml(id);
AttributeSet attrs = Xml.asAttributeSet(parser);
@ -1084,6 +1086,8 @@ class MountService extends IMountService.Stub
CharSequence path = a.getText(
com.android.internal.R.styleable.Storage_mountPoint);
int descriptionId = a.getResourceId(
com.android.internal.R.styleable.Storage_storageDescription, -1);
CharSequence description = a.getText(
com.android.internal.R.styleable.Storage_storageDescription);
boolean primary = a.getBoolean(
@ -1110,7 +1114,7 @@ class MountService extends IMountService.Stub
} else {
String pathString = path.toString();
StorageVolume volume = new StorageVolume(pathString,
description.toString(), removable, emulated,
descriptionId, removable, emulated,
mtpReserve, allowMassStorage, maxFileSize);
if (primary) {
if (mPrimaryVolume == null) {
@ -1151,8 +1155,7 @@ class MountService extends IMountService.Stub
*/
public MountService(Context context) {
mContext = context;
Resources resources = context.getResources();
readStorageList(resources);
readStorageList();
if (mPrimaryVolume != null) {
mExternalStoragePath = mPrimaryVolume.getPath();