summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 05ade73e: Merge "Ensure that setting an empty password clears it" into lmp...Adrian Roos2014-09-251-1/+2
|\
| * Merge "Ensure that setting an empty password clears it" into lmp-devAdrian Roos2014-09-251-1/+2
| |\
| | * Ensure that setting an empty password clears itAdrian Roos2014-09-251-1/+2
* | | am 7b6a4acd: Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into ...Eino-Ville Talvala2014-09-251-0/+1
|\ \ \ | |/ /
| * | Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-devEino-Ville Talvala2014-09-251-0/+1
| |\ \
| | * | Camera2 Legacy: Clear JPEG ids when reconfiguring.Eino-Ville Talvala2014-09-251-0/+1
* | | | am 233bbabf: Merge "Specify a device identifier for keyboard layout notificat...Michael Wright2014-09-251-0/+13
|\ \ \ \ | |/ / /
| * | | Merge "Specify a device identifier for keyboard layout notification." into lm...Michael Wright2014-09-251-0/+13
| |\ \ \ | | |/ / | |/| |
| | * | Specify a device identifier for keyboard layout notification.Michael Wright2014-09-231-0/+13
* | | | am 93f0b612: Camera2 legacy: Improve robustness to camera service crashesEino-Ville Talvala2014-09-252-3/+25
|\ \ \ \ | |/ / /
| * | | Camera2 legacy: Improve robustness to camera service crashesEino-Ville Talvala2014-09-252-3/+25
* | | | am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-devRuben Brunk2014-09-251-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "camera2: Fix null check in PictureCallback." into lmp-devRuben Brunk2014-09-251-3/+3
| |\ \ \
| | * | | camera2: Fix null check in PictureCallback.Ruben Brunk2014-09-251-3/+3
* | | | | am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-devPaul Lawrence2014-09-251-8/+15
|\ \ \ \ \ | |/ / / /
| * | | | Fix pause when setting pin/pattern/passwordPaul Lawrence2014-09-251-8/+15
* | | | | am 15653a91: Merge "getCurrentInterruptionFilter should return the filter val...Chris Wren2014-09-251-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "getCurrentInterruptionFilter should return the filter value, not the h...Chris Wren2014-09-251-1/+1
| |\ \ \ \
| | * | | | getCurrentInterruptionFilter should return the filter value, not the hints.Chris Wren2014-09-241-1/+1
* | | | | | am e5831979: Missing null checkJohn Reck2014-09-251-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Missing null checkJohn Reck2014-09-251-3/+4
| | |_|_|/ | |/| | |
* | | | | am 14cb7b8a: Add config to control phone switchSukanya Rajkhowa2014-09-252-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add config to control phone switchSukanya Rajkhowa2014-09-252-0/+6
* | | | | am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" in...Andre Eisenbach2014-09-245-41/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove remanents of onConnectionCongested in framwork" into lmp-devAndre Eisenbach2014-09-245-41/+0
| |\ \ \ \
| | * | | | Remove remanents of onConnectionCongested in framworkPrerepa Viswanadham2014-09-245-41/+0
* | | | | | am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-devVinit Deshpande2014-09-242-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Introduce config setting for scanning mac OUI" into lmp-devVinit Deshpande2014-09-242-0/+4
| |\ \ \ \ \
| | * | | | | Introduce config setting for scanning mac OUIVinit Deshpande2014-09-232-0/+4
| | | |_|_|/ | | |/| | |
* | | | | | am 45ef18b6: Merge "Include reason when wiping data." into lmp-devJeff Sharkey2014-09-243-18/+78
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Include reason when wiping data." into lmp-devJeff Sharkey2014-09-243-18/+78
| |\ \ \ \ \
| | * | | | | Include reason when wiping data.Jeff Sharkey2014-09-243-18/+78
* | | | | | | am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-247-89/+132
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-devRuben Brunk2014-09-247-89/+132
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | camera2: Hide JPEGs in RGBA gralloc buffers.Ruben Brunk2014-09-247-89/+132
* | | | | | resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aospAndreas Gampe2014-09-244-16/+58
|\ \ \ \ \ \
| * \ \ \ \ \ am 6f954cf2: Merge "Frameworks/base: Early init native bridge"Andreas Gampe2014-09-244-16/+59
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Frameworks/base: Early init native bridge"Andreas Gampe2014-09-244-16/+59
| | |\ \ \ \ \ \
| | | * | | | | | Frameworks/base: Early init native bridgejgu212014-09-224-16/+59
| | * | | | | | | Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO N...Bill Yi2014-09-241-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGEBill Yi2014-09-241-0/+3
* | | | | | | | | | am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-devIgor Murashkin2014-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "camera2: Increase preview frame timeout" into lmp-devIgor Murashkin2014-09-241-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | camera2: Increase preview frame timeoutIgor Murashkin2014-09-241-1/+1
* | | | | | | | | | am c37e905a: Merge "Fix memory leak where we close the descriptor instead of ...Derek Sollenberger2014-09-241-5/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix memory leak where we close the descriptor instead of the file." in...Derek Sollenberger2014-09-241-5/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-09-241-5/+11
| | |/ / / / / / / /
* | | | | | | | | | am a061388d: Merge "Fix dalvik map names" into lmp-devMathieu Chartier2014-09-241-16/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix dalvik map names" into lmp-devMathieu Chartier2014-09-241-16/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix dalvik map namesMathieu Chartier2014-09-241-16/+8