summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
Commit message (Expand)AuthorAgeFilesLines
* am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager AP...Wink Saville2014-11-241-1/+0
|\
| * Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-221-1/+0
* | am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as ...Wink Saville2014-11-211-0/+1
|\ \ | |/
| * Merge "Revert "Additional changes to SubscriptionManager API as per API counc...Wink Saville2014-11-201-0/+1
| |\
| | * Revert "Additional changes to SubscriptionManager API as per API council."Wink Saville2014-11-201-0/+1
* | | am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API ...Wink Saville2014-11-211-1/+0
|\ \ \ | |/ /
| * | Merge "Additional changes to SubscriptionManager API as per API council." int...Wink Saville2014-11-201-1/+0
| |\ \ | | |/
| | * Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-191-1/+0
* | | am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process...Dianne Hackborn2014-11-211-3/+3
|\ \ \ | |/ /
| * | Merge "Fix issue with call backs from media process." into lmp-mr1-devDianne Hackborn2014-11-201-3/+3
| |\ \ | | |/ | |/|
| | * Fix issue with call backs from media process.Dianne Hackborn2014-11-191-3/+3
* | | am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into...Amit Mahajan2014-11-191-0/+9
|\ \ \ | |/ /
| * | Adding new setting LTE_SERVICE_FORCED.Amit Mahajan2014-11-181-0/+9
| |/
* | am 7ff92f42: am 9522055f: Merge "Add time estimates to batterystats dump." in...Dianne Hackborn2014-11-181-3/+3
|\ \ | |/
| * Add time estimates to batterystats dump.Dianne Hackborn2014-11-181-3/+3
* | Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev au...Junda Liu2014-11-121-0/+8
|\ \ | |/
| * Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-devJunda Liu2014-11-121-0/+8
| |\
| | * Add HIDE_CARRIER_NETWORK_SETTINGS global setting.Junda Liu2014-11-071-0/+8
* | | am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROX...Ignacio Solla2014-11-071-7/+0
|\ \ \ | |/ /
| * | Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-devIgnacio Solla2014-11-071-7/+0
| |\ \
| | * | [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.Ignacio Solla2014-10-311-7/+0
* | | | am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into ...Jason Monk2014-11-031-6/+7
|\ \ \ \ | |/ / /
| * | | Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-devJason Monk2014-11-031-6/+7
| |\ \ \
| | * | | Move LOCK_TO_APP_EXIT_LOCKED from System to SecureJason Monk2014-10-311-6/+7
| | |/ /
* | | | am 8079a812: Merge "Backup and restore battery saver trigger level" into lmp-...Amith Yamasani2014-10-311-1/+2
|\ \ \ \ | |/ / /
| * | | Backup and restore battery saver trigger levelAmith Yamasani2014-10-311-1/+2
| |/ /
* | | am a0adb0bd: am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTING...John Spurlock2014-10-311-2/+3
|\ \ \ | |/ /
| * | Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.John Spurlock2014-10-301-2/+3
* | | am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1...Chris Wren2014-10-301-4/+3
|\ \ \ | |/ /
| * | Merge "Reveal notification listener settings APIs." into lmp-mr1-devChris Wren2014-10-291-4/+3
| |\ \
| | * | Reveal notification listener settings APIs.Chris Wren2014-10-281-4/+3
* | | | am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbb...Shishir Agrawal2014-10-301-7/+56
|\ \ \ \ | |/ / /
| * | | Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37Shishir Agrawal2014-10-281-7/+56
| | |/ | |/|
* | | Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev automerge: 49c1527Jeff Sharkey2014-10-281-3/+0
|\ \ \ | |/ /
| * | Drop DEV network stats to save RAM.Jeff Sharkey2014-10-241-3/+0
* | | am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enab...Pavel Zhamaitsiak2014-10-231-1/+1
|\ \ \ | |/ /
| * | Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE...Etan Cohen2014-10-231-1/+1
* | | am 477fa012: am 49cb52e2: Merge "resolved conflicts for merge of f03ba4f1 to ...Bryce Lee2014-10-231-0/+6
|\ \ \ | |/ /
| * | resolved conflicts for merge of f03ba4f1 to lmp-mr1-devBryce Lee2014-10-221-0/+6
| |\ \ | | |/ | |/|
| | * [Theater Mode] framework implementation through global settingBryce Lee2014-10-211-0/+6
* | | am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db.Libin.Tang@motorola.com2014-10-151-0/+8
|\ \ \ | |/ /
| * | IMS:change enhanced 4g setting to store in setting db.Libin.Tang@motorola.com2014-10-151-0/+8
* | | am 1a02efb1: am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox opt...Jim Miller2014-10-151-0/+9
|\ \ \ | |/ /
| * | am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password ...Jim Miller2014-10-151-0/+9
| |\ \ | | |/
| | * am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'"...Jim Miller2014-10-151-0/+9
| | |\
| | | * Add a checkbox option to 'require password to decrypt'Jim Miller2014-10-141-0/+9
* | | | am 58d0b623: am 1db0cce0: Merge "Fix a race where NLP consent dialog can be s...Tom O'Neill2014-10-101-2/+11
|\ \ \ \ | |/ / /
| * | | Fix a race where NLP consent dialog can be shown unnecessarilyTom O'Neill2014-10-091-2/+11
| |/ /
* | | am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code"...Dianne Hackborn2014-10-101-3/+3
|\ \ \ | |/ /
| * | am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-091-3/+3
| |\ \ | | |/