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

Merge "Fixed a race contidion in StorageManagerService"

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2020-12-01 10:52:23 +00:00
committed by Gerrit Code Review
parent 3d37ba8a37 ed2716dd24
commit 782ef476df
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/os/storage/VolumeInfo.java
View File

@@ -200,6 +200,21 @@ public class VolumeInfo implements Parcelable {
internalPath = parcel.readString8(); internalPath = parcel.readString8();
} }
public VolumeInfo(VolumeInfo volumeInfo) {
this.id = volumeInfo.id;
this.type = volumeInfo.type;
this.disk = volumeInfo.disk;
this.partGuid = volumeInfo.partGuid;
this.mountFlags = volumeInfo.mountFlags;
this.mountUserId = volumeInfo.mountUserId;
this.state = volumeInfo.state;
this.fsType = volumeInfo.fsType;
this.fsUuid = volumeInfo.fsUuid;
this.fsLabel = volumeInfo.fsLabel;
this.path = volumeInfo.path;
this.internalPath = volumeInfo.internalPath;
}
@UnsupportedAppUsage @UnsupportedAppUsage
public static @NonNull String getEnvironmentForState(int state) { public static @NonNull String getEnvironmentForState(int state) {
final String envState = sStateToEnvironment.get(state); final String envState = sStateToEnvironment.get(state);

5
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -1391,12 +1391,13 @@ class StorageManagerService extends IStorageManager.Stub
final int oldState = vol.state; final int oldState = vol.state;
final int newState = state; final int newState = state;
vol.state = newState; vol.state = newState;
final VolumeInfo vInfo = new VolumeInfo(vol);
final SomeArgs args = SomeArgs.obtain(); final SomeArgs args = SomeArgs.obtain();
args.arg1 = vol; args.arg1 = vInfo;
args.arg2 = oldState; args.arg2 = oldState;
args.arg3 = newState; args.arg3 = newState;
mHandler.obtainMessage(H_VOLUME_STATE_CHANGED, args).sendToTarget(); mHandler.obtainMessage(H_VOLUME_STATE_CHANGED, args).sendToTarget();
onVolumeStateChangedLocked(vol, oldState, newState); onVolumeStateChangedLocked(vInfo, oldState, newState);
} }
} }
} }