Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Notify on BAD_REMOVAL and pass fsUuid in broadcast" into mnc-dev

Browse Source
This commit is contained in:
Tony Mantler
2015-06-24 19:48:32 +00:00
committed by Android (Google) Code Review
parent 80b60bbb5e f0d710578e
commit e16ee482a6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/MountService.java
View File

@@ -1082,6 +1082,7 @@ class MountService extends IMountService.Stub
case VolumeInfo.STATE_EJECTING: case VolumeInfo.STATE_EJECTING:
case VolumeInfo.STATE_UNMOUNTED: case VolumeInfo.STATE_UNMOUNTED:
case VolumeInfo.STATE_UNMOUNTABLE: case VolumeInfo.STATE_UNMOUNTABLE:
case VolumeInfo.STATE_BAD_REMOVAL:
break; break;
default: default:
return false; return false;
@@ -1118,6 +1119,7 @@ class MountService extends IMountService.Stub
final Intent intent = new Intent(VolumeInfo.ACTION_VOLUME_STATE_CHANGED); final Intent intent = new Intent(VolumeInfo.ACTION_VOLUME_STATE_CHANGED);
intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, vol.id); intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, vol.id);
intent.putExtra(VolumeInfo.EXTRA_VOLUME_STATE, newState); intent.putExtra(VolumeInfo.EXTRA_VOLUME_STATE, newState);
intent.putExtra(VolumeRecord.EXTRA_FS_UUID, vol.fsUuid);
intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
mContext.sendBroadcastAsUser(intent, UserHandle.ALL, mContext.sendBroadcastAsUser(intent, UserHandle.ALL,
android.Manifest.permission.WRITE_MEDIA_STORAGE); android.Manifest.permission.WRITE_MEDIA_STORAGE);