summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
Commit message (Expand)AuthorAgeFilesLines
* am 4a88acfc: Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-devBryce Lee2015-02-061-0/+1
|\
| * Make THEATER_MODE_ON a System API.Bryce Lee2015-02-061-0/+1
* | am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a syste...Bryce Lee2015-01-281-1/+0
|\ \ | |/
| * Revert "Make THEATER_MODE_ON setting a system api."Bryce Lee2015-01-281-1/+0
* | am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." ...Bryce Lee2015-01-281-0/+1
|\ \ | |/
| * Make THEATER_MODE_ON setting a system api.Bryce Lee2015-01-261-0/+1
* | am f9f41951: am ee435b16: Merge "telephony: Update comments for preferred net...Elliott Hughes2014-12-261-8/+1
|\ \
| * \ Merge "telephony: Update comments for preferred network mode"Elliott Hughes2014-12-261-8/+1
| |\ \
| | * | telephony: Update comments for preferred network modeSungmin Choi2014-12-251-8/+1
| * | | am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'"...Jim Miller2014-10-151-0/+9
| |\ \ \
| * \ \ \ am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-081-3/+3
| |\ \ \ \
| * \ \ \ \ am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-devErik Pasternak2014-10-021-2/+20
| |\ \ \ \ \
| * \ \ \ \ \ am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Setting...Hui Shu2014-10-011-0/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into ...Hui Shu2014-10-011-15/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 233bbabf: Merge "Specify a device identifier for keyboard layout notificat...Michael Wright2014-09-251-0/+13
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into l...Jeff Davidson2014-12-171-0/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Add global setting for ephemeral network timeout.Jeff Davidson2014-12-161-0/+12
* | | | | | | | | | am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functi...Erik Kline2014-12-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.Erik Kline2014-12-081-1/+1
* | | | | | | | | | am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than...Jeremy Joslin2014-12-081-0/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Don't send the same PendingIntent more than once.Jeremy Joslin2014-12-051-0/+10
* | | | | | | | | | am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DE...Pavel Zhamaitsiak2014-12-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"Erik Kline2014-12-051-1/+1
* | | | | | | | | | am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends...Erik Kline2014-12-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-devErik Kline2014-12-041-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove CONNECTIVITY_CHANGE_DELAY and friends.Erik Kline2014-10-311-1/+1
* | | | | | | | | | | am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves...Etan Cohen2014-12-031-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add a global override for VoLTE calls (which leaves user setting in place)Etan Cohen2014-12-031-0/+8
* | | | | | | | | | | am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1...Narayan Kamath2014-12-011-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | resolved conflicts for merge of 7377998d to lmp-mr1-devNarayan Kamath2014-11-271-0/+7
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of a42f7c1d to lmp-sprout-devNarayan Kamath2014-11-261-0/+7
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Be increasingly aggressive about fstrim if it isn't being runChristopher Tate2014-11-251-0/+7
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
* | | | | | | | | | | | 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