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

am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo

Browse Source
This commit is contained in:
Jim Miller
2010-06-08 16:37:12 -07:00
committed by Android Git Automerger
parent 570898098f db603bb54f
commit 1a0ce1cc6f
3 changed files with 76 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -447,6 +447,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
out.endDocument();
stream.close();
journal.commit();
sendChangedNotification();
} catch (IOException e) {
try {
if (stream != null) {
@@ -459,6 +460,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
}
private void sendChangedNotification() {
Intent intent = new Intent(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
mContext.sendBroadcast(intent);
}
private void loadSettingsLocked() {
JournaledFile journal = makeJournaledFile();
FileInputStream stream = null;