summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 34e4dc4b: am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT ↵Pavel Zhamaitsiak2014-10-231-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev * commit '34e4dc4b09045c882ad7a30b26d78d787d74c264': Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
| * | | am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to ↵Pavel Zhamaitsiak2014-10-231-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev * commit 'b01a597924ab7afed689f7710c264684d1fac944': Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
| | * | am c8a09d54: Merge "Separate VoLTE and VT configurations to enable ↵Pavel Zhamaitsiak2014-10-231-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | devices/carriers to have VoLTE without VT." into lmp-mr1-dev * commit 'c8a09d543429e1a937a13e2173c96255579495f7': Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
| | | * Separate VoLTE and VT configurations to enable devices/carriers to have ↵Etan Cohen2014-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | VoLTE without VT. Change-Id: I233b003af57a550f2f51b12213700ab0451039e5
* | | | am 1d918403: am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge ↵Bryce Lee2014-10-232-3/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | of f03ba4f1 to lmp-mr1-dev" into lmp-mr1-dev * commit '1d9184035d5d74c850d688cd269e97ea3f77953e': [Theater Mode] framework implementation through global setting
| * | | am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to ↵Bryce Lee2014-10-232-3/+28
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev" into lmp-mr1-dev * commit '477fa012865c3c59ebc2dd834c53c7ee33fe3a95': [Theater Mode] framework implementation through global setting
| | * | am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev" ↵Bryce Lee2014-10-232-3/+28
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '49cb52e296c48613c2177bfcb14fc67e21b9ae03': [Theater Mode] framework implementation through global setting
| | | * resolved conflicts for merge of f03ba4f1 to lmp-mr1-devBryce Lee2014-10-222-3/+28
| | | |\ | | | | | | | | | | | | | | | Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
| | | | * [Theater Mode] framework implementation through global settingBryce Lee2014-10-212-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17684570 Change-Id: I64a9c9c0620049cdfcca0150648fa201281f7178
| | | | * Import translations. DO NOT MERGEGeoff Mendal2014-10-2017-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38 Auto-generated-cl: translation import
* | | | | am 2203e532: am 04e6827a: Fix settings db update sequence automerge: 281763bChristopher Tate2014-10-221-10/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '2203e532d6593a9b792cec7fd11d4aa189b9d939': Fix settings db update sequence
| * | | | am 04e6827a: Fix settings db update sequenceChristopher Tate2014-10-221-10/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 281763b * commit '281763ba1b4a6255799046f78930b586cd7e541c': Fix settings db update sequence
| | * | | am 04e6827a: Fix settings db update sequenceChristopher Tate2014-10-221-10/+12
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '04e6827ace936e0cbb666d8ef94635b73672aa41': Fix settings db update sequence
| | | * | Fix settings db update sequenceChristopher Tate2014-10-221-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'global' table only exists in the owner-user db instance; make sure to apply global-setting update steps only when bringing up that instance. Bug 18069830 Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
| | | * | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-1617-0/+19
| | | |\ \ | | |/ / /
| | | * | Import translations. DO NOT MERGEGeoff Mendal2014-10-1517-0/+19
| | | |/ | | | | | | | | | | | | | | | | Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723 Auto-generated-cl: translation import
* | | | am c2814749: am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to ↵Libin.Tang@motorola.com2014-10-162-2/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | store in setting db. * commit 'c28147490a0f7c5cceaaa4d0746ffa0d4842e8b6': IMS:change enhanced 4g setting to store in setting db.
| * | | am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db.Libin.Tang@motorola.com2014-10-152-2/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '4798bca2742a3e2ec7e13aa20a61fc447eadf29b': IMS:change enhanced 4g setting to store in setting db.
| | * | IMS:change enhanced 4g setting to store in setting db.Libin.Tang@motorola.com2014-10-152-2/+18
| | |/ | | | | | | | | | Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
* | | am 2fc4d811: am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix ↵Dianne Hackborn2014-10-031-3/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | issue #17811029: Settings provider race when removing users" into lmp-dev * commit '2fc4d81113d713022c5f31d7387e7687090168b4': Fix issue #17811029: Settings provider race when removing users
| * | am d6bcda99: am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue ↵Dianne Hackborn2014-10-031-3/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | #17811029: Settings provider race when removing users" into lmp-dev * commit 'd6bcda99b062eb0bb8511d7a4a1cefc23df3cb77': Fix issue #17811029: Settings provider race when removing users
| | * am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when ↵Dianne Hackborn2014-10-031-3/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | removing users" into lmp-dev * commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278': Fix issue #17811029: Settings provider race when removing users
| | | * Fix issue #17811029: Settings provider race when removing usersDianne Hackborn2014-10-031-3/+15
| | | | | | | | | | | | | | | | Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
* | | | am 2483cf54: am 88b01d88: am 27cee100: am bdcfc01b: am 3de09018: Merge ↵Kenny Guy2014-10-021-8/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev * commit '2483cf54ac6f140a62af6b9222a420298ed83234': SettingsProvider should use correct cache when redirecting to user 0.
| * | | am 88b01d88: am 27cee100: am bdcfc01b: am 3de09018: Merge "SettingsProvider ↵Kenny Guy2014-10-021-8/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | should use correct cache when redirecting to user 0." into lmp-dev * commit '88b01d88a2f343256a426280297e9587bfebff87': SettingsProvider should use correct cache when redirecting to user 0.
| | * | am 3de09018: Merge "SettingsProvider should use correct cache when ↵Kenny Guy2014-10-021-8/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | redirecting to user 0." into lmp-dev * commit '3de09018a9611b1791cc29ed5200b7d9694189a9': SettingsProvider should use correct cache when redirecting to user 0.
| | | * Merge "SettingsProvider should use correct cache when redirecting to user ↵Kenny Guy2014-10-021-8/+6
| | | |\ | | | | | | | | | | | | | | | 0." into lmp-dev
| | | | * SettingsProvider should use correct cache when redirecting to user 0.Kenny Guy2014-10-011-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SettingsProvider reads secure and system settings for managed profiles from user 0 instead. However it still checks the cache for the managed profile not user 0. Bug: 17736586 Change-Id: I15d44b8a5779b01e6b9032e528dc34f5c5602449
* | | | | am 7cf6cac5: am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More ↵Dianne Hackborn2014-10-021-14/+45
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev * commit '7cf6cac507df68ecb1d6484a5287687e4df61573': More work on issue #17656716: Unhandled exception in Window Manager
| * | | | am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on ↵Dianne Hackborn2014-10-021-14/+45
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | issue #17656716: Unhandled exception in Window Manager" into lmp-dev * commit '03e173edce42a5ae0de8a7718330d83664a84a9e': More work on issue #17656716: Unhandled exception in Window Manager
| | * | | am c338784b: Merge "More work on issue #17656716: Unhandled exception in ↵Dianne Hackborn2014-10-021-14/+45
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Window Manager" into lmp-dev * commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a': More work on issue #17656716: Unhandled exception in Window Manager
| | | * | Merge "More work on issue #17656716: Unhandled exception in Window Manager" ↵Dianne Hackborn2014-10-021-14/+45
| | | |\ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| | | | * | More work on issue #17656716: Unhandled exception in Window ManagerDianne Hackborn2014-10-011-14/+45
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Slog.wtf to not acquire the activity manager lock in its code path, so that it can never deadlock. This was the original intention of it, but part was missed. Now we can put back in the code to detect when strict mode data is getting large (a little more targeted now to the actual problem), and use Slog.wtf to report it. And as a bonus, when this happens we will now clear all of the collected violations, to avoid getting in to the bad case where IPCs start failing. So this should be good enough for L to fix the problem, with wtf reports for us to see if the underlying issue is still happening. Finally, switch a butch of stuff in the system process from Log.wtf to Slog.wtf, since many of those are deadlocks waiting to happen. Oh and fix a crash in the settings provider I noticed in APR. Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
* | | | | am c7cbbe8e: am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge ↵Erik Pasternak2014-10-022-1/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | "Implement auto-sleep functionality." into lmp-dev * commit 'c7cbbe8e82b2dda4889a6663a83586f1e6759282': Implement auto-sleep functionality.
| * | | | am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement ↵Erik Pasternak2014-10-022-1/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | auto-sleep functionality." into lmp-dev * commit 'd68362b962be2237418a1a10ebec7a2f75b9b267': Implement auto-sleep functionality.
| | * | | am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-devErik Pasternak2014-10-022-1/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607': Implement auto-sleep functionality.
| | | * | Implement auto-sleep functionality.Jeff Brown2014-10-012-1/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new SLEEP_TIMEOUT setting which governs how long the device will remain awake or dreaming without user activity. By default this value is set to -1 which maintains today's existing behavior. We basically represent the time we are allowed to be dreaming as a new kind of user activity summary state called DREAM, similar to BRIGHT and DIM. When the sleep timeout expires, the state is cleared and the dream ends. Bug: 17665809 Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
* | | | am cc4d4562: am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge ↵Amith Yamasani2014-09-241-16/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "Return masked location mode for managed profiles" into lmp-dev * commit 'cc4d4562b88f4467b76b8598c1f4e51a2e3d1266': Return masked location mode for managed profiles
| * | | am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked ↵Amith Yamasani2014-09-241-16/+34
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | location mode for managed profiles" into lmp-dev * commit 'bc1ec524ec5b91864547fb06af2132145b296c0a': Return masked location mode for managed profiles
| | * | am eb5fb023: Merge "Return masked location mode for managed profiles" into ↵Amith Yamasani2014-09-241-16/+34
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'eb5fb0236f3ed0c8068d5e65f2396047ae69f78b': Return masked location mode for managed profiles
| | | * Return masked location mode for managed profilesAmith Yamasani2014-09-241-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there's a user restriction on location sharing in a managed profile, always return empty string for location providers so that location can be disabled by the admin even if the primary user has location enabled. Also fix an incorrect update of the cache. Shouldn't update the primary user's cache when the caller is the managed profile. Bug: 17478855 Change-Id: Icab3459ae351c5cfc287e21df6a5ba1df9dfbdb4
| | | * Import translations. DO NOT MERGEBaligh Uddin2014-09-202-5/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If5c2ca9461d0d7846374fda66e3d091dfa8f05e7 Auto-generated-cl: translation import
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-09-202-5/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4e30e9bfaa1032d9e2cd8ca170945b4c4f16d597 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-202-5/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I3747af453da6584d90fd2f91ace4ea7d9cff1e60 Auto-generated-cl: translation import
* | | | am 1f2e31ef: am 1c1ffb64: am 4cd2c811: am ebff637b: am c9a016dd: Merge ↵Christopher Tate2014-09-201-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | "Always give wifi a chance to quiet down during restore" into lmp-dev * commit '1f2e31efb8ce78f99c86f7847b7498e23937d2ff': Always give wifi a chance to quiet down during restore
| * | | am ebff637b: am c9a016dd: Merge "Always give wifi a chance to quiet down ↵Christopher Tate2014-09-201-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | during restore" into lmp-dev * commit 'ebff637b894a60a20e62b12089c29779cc6f9e98': Always give wifi a chance to quiet down during restore
| | * | am c9a016dd: Merge "Always give wifi a chance to quiet down during restore" ↵Christopher Tate2014-09-201-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c9a016dd4eefd01ab6acc916d2a1bad854933e58': Always give wifi a chance to quiet down during restore
| | | * Merge "Always give wifi a chance to quiet down during restore" into lmp-devChristopher Tate2014-09-201-2/+2
| | | |\
| | | | * Always give wifi a chance to quiet down during restoreChristopher Tate2014-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not just when the current scan-always setting is on. Bug 17571997 Change-Id: Idc56c9682c18f5e23c0bde98736522a79583af5e
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-09-1666-126/+66
| | | |/ | | | | | | | | | | | | | | | | Change-Id: Iea95517012e1ac1c31a11f63c34f9f431118d2f3 Auto-generated-cl: translation import