summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-194-5/+65
* Merge "camera2: Fix work-profile eviction handling." into mnc-devRuben Brunk2015-05-153-10/+86
|\
| * camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-143-10/+86
* | Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-devSailesh Nepal2015-05-151-1/+2
|\ \
| * | Fix in-call UI crash on Nova devcies (framework/base)Sailesh Nepal2015-05-141-1/+2
* | | Merge "Fix missing break in Icon class" into mnc-devYorke Lee2015-05-151-0/+1
|\ \ \
| * | | Fix missing break in Icon classYorke Lee2015-05-141-0/+1
* | | | Merge "Fix post dial for remote connections" into mnc-devSailesh Nepal2015-05-151-1/+1
|\ \ \ \
| * | | | Fix post dial for remote connectionsSailesh Nepal2015-05-141-1/+1
| | |/ / | |/| |
* | | | Merge "Start AnimationDrawable from the zeroth frame." into mnc-devDoris Liu2015-05-151-1/+3
|\ \ \ \
| * | | | Start AnimationDrawable from the zeroth frame.Doris Liu2015-05-141-1/+3
* | | | | Merge "Fix build: udpate parser factory method" into mnc-devDeepanshu Gupta2015-05-151-2/+11
|\ \ \ \ \
| * | | | | Fix build: udpate parser factory methodDeepanshu Gupta2015-05-141-2/+11
* | | | | | Merge "Check for setting to already set" into mnc-devJohn Reck2015-05-143-0/+24
|\ \ \ \ \ \
| * | | | | | Check for setting to already setJohn Reck2015-05-143-0/+24
* | | | | | | Merge "Fix grant/revoke to act on owner by default and log invalid user id." ...Svet Ganov2015-05-142-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix grant/revoke to act on owner by default and log invalid user id.Svet Ganov2015-05-142-1/+3
* | | | | | | | Merge "Adjust lockscreen style to spec" into mnc-devJorim Jaggi2015-05-149-7/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Adjust lockscreen style to specJorim Jaggi2015-05-149-7/+12
* | | | | | | | | Fix brightness mirror positioning.Jorim Jaggi2015-05-142-5/+11
* | | | | | | | | Merge "Don't keep LayoutlibCallback reference." into mnc-devDeepanshu Gupta2015-05-143-84/+12
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Don't keep LayoutlibCallback reference.Deepanshu Gupta2015-05-143-84/+12
* | | | | | | | | Merge "CEC: Remove obsolete TODOs" into mnc-devJinsuk Kim2015-05-141-4/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CEC: Remove obsolete TODOsJinsuk Kim2015-05-151-4/+0
* | | | | | | | | | Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS...Miao Wang2015-05-141-0/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [RenderScript] Add dummy getMinorID to maintain compatible with old RSMiao Wang2015-05-141-0/+14
* | | | | | | | | | | Fix closing stateJorim Jaggi2015-05-141-0/+3
* | | | | | | | | | | Merge "Move couple of intellij libraries to project level." into mnc-devDeepanshu Gupta2015-05-143-24/+26
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Move couple of intellij libraries to project level.Deepanshu Gupta2015-05-143-24/+26
* | | | | | | | | | | Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-devChristopher Tate2015-05-141-1/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clarify docs for BackupTransport.initializeDevice()Christopher Tate2015-05-141-1/+10
* | | | | | | | | | | | Merge "Camera: tonemap linkify update" into mnc-devYin-Chia Yeh2015-05-141-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Camera: tonemap linkify updateYin-Chia Yeh2015-05-061-6/+12
* | | | | | | | | | | | | Merge "ImageReader: Image getFormat should return the Image buffer format" in...Zhijun He2015-05-142-10/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ImageReader: Image getFormat should return the Image buffer formatZhijun He2015-05-062-10/+25
* | | | | | | | | | | | | | Merge "Image/Reader/Writer: address API review comments" into mnc-devZhijun He2015-05-146-171/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Image/Reader/Writer: address API review commentsZhijun He2015-05-146-171/+101
* | | | | | | | | | | | | | | am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before...Joe LaPenna2015-05-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" i...Joe LaPenna2015-05-141-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-m...Joe LaPenna2015-05-141-8/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Wait for KEY_SLEEP UP event before calling goToSleep()Nick Vaccaro2015-04-291-8/+15
* | | | | | | | | | | | | | | | | | Merge "MediaDataSource: address API council comments" into mnc-devChong Zhang2015-05-145-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | MediaDataSource: address API council commentsChong Zhang2015-05-145-22/+33
* | | | | | | | | | | | | | | | | | | Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-devLajos Molnar2015-05-144-101/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | media: remove setPlaybackRate from MediaPlayer and MediSyncLajos Molnar2015-05-144-101/+11
* | | | | | | | | | | | | | | | | | | | Merge "media: change final fields to accessors in MediaTimestamp" into mnc-devLajos Molnar2015-05-145-40/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | media: change final fields to accessors in MediaTimestampLajos Molnar2015-05-145-40/+52
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "wallpaper: avoid exception when user is not initialized" into mnc-devXiaohui Chen2015-05-141-18/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | wallpaper: avoid exception when user is not initializedXiaohui Chen2015-05-131-18/+20
* | | | | | | | | | | | | | | | | | | | Merge "Camera2: Fix reprocessing API naming and docs" into mnc-devChien-Yu Chen2015-05-1412-101/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \