diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-01-16 11:36:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 11:36:46 +0000 |
| commit | 2dc53c560bcba5d423eb4f87533897ac34047eee (patch) | |
| tree | 11a86bc8ee8cd7fe6794b9a6cb9acf31e5d02982 /services/devicepolicy/java | |
| parent | d3ef970ca89f768550c8d54f8e2315a18178a200 (diff) | |
| parent | 4be433dc0b817fd4129e2bd99edb4c484f980600 (diff) | |
| download | frameworks_base-2dc53c560bcba5d423eb4f87533897ac34047eee.zip frameworks_base-2dc53c560bcba5d423eb4f87533897ac34047eee.tar.gz frameworks_base-2dc53c560bcba5d423eb4f87533897ac34047eee.tar.bz2 | |
am 4be433dc: am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev
* commit '4be433dc0b817fd4129e2bd99edb4c484f980600':
Sync file before using JournaledFile commit.
Diffstat (limited to 'services/devicepolicy/java')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 4860321..d0c4744 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -61,6 +61,7 @@ import android.os.AsyncTask; import android.os.Binder; import android.os.Bundle; import android.os.Environment; +import android.os.FileUtils; import android.os.Handler; import android.os.IBinder; import android.os.PersistableBundle; @@ -1349,6 +1350,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { out.endTag(null, "policies"); out.endDocument(); + stream.flush(); + FileUtils.sync(stream); stream.close(); journal.commit(); sendChangedNotification(userHandle); |