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

am eb6ba38c: Merge "Leave SettingsProvider running if cloning of a setting fails" into lmp-dev

Browse Source 
* commit 'eb6ba38c90ca52133cd5c82bc9a3ee3c77c9fd4c':
  Leave SettingsProvider running if cloning of a setting fails
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-12 18:51:42 +00:00
committed by Android Git Automerger
parent 66c365f2e3 11f72c0d97
commit 9ac94ed2e9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -789,8 +789,15 @@ public class SettingsProvider extends ContentProvider {
Slog.v(TAG, "putting to additional user "
+ mManagedProfiles.get(i).id);
}
insertForUser(Settings.Secure.CONTENT_URI, values,
mManagedProfiles.get(i).id);
try {
insertForUser(Settings.Secure.CONTENT_URI, values,
mManagedProfiles.get(i).id);
} catch (SecurityException e) {
// Temporary fix, see b/17450158
Slog.w(TAG, "Cannot clone request '" + request + "' with value '"
+ newValue + "' to managed profile (id "
+ mManagedProfiles.get(i).id + ")", e);
}
}
} finally {
Binder.restoreCallingIdentity(token);