summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-202-1/+35
|\
| * camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-192-1/+35
* | Merge "Allow DO/PO to go back to normal permission state." into mnc-devSvet Ganov2015-05-202-12/+39
|\ \
| * | Allow DO/PO to go back to normal permission state.Svet Ganov2015-05-202-12/+39
* | | Lower fingerprint permission protection levelJorim Jaggi2015-05-201-1/+1
* | | Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mn...Jorim Jaggi2015-05-201-1/+0
|\ \ \
| * | | Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)Jorim Jaggi2015-05-191-1/+0
* | | | Merge "Text selection: fix some issues with drag accelerator" into mnc-devMady Mellor2015-05-201-65/+50
|\ \ \ \ | |_|/ / |/| | |
| * | | Text selection: fix some issues with drag acceleratorMady Mellor2015-05-201-65/+50
* | | | Hide ProviderStatus and Authentication APIsBrian Attwell2015-05-201-0/+4
* | | | Merge "Fix selection handles on older API versions" into mnc-devMady Mellor2015-05-2011-2/+10
|\ \ \ \
| * | | | Fix selection handles on older API versionsMady Mellor2015-05-1511-2/+10
* | | | | Merge "AudioFormat: more compressed formats" into mnc-devEric Laurent2015-05-201-0/+20
|\ \ \ \ \
| * | | | | AudioFormat: more compressed formatsEric Laurent2015-05-191-0/+20
* | | | | | Merge "Reduce wasted buffer allocations" into mnc-devJohn Reck2015-05-202-1/+9
|\ \ \ \ \ \
| * | | | | | Reduce wasted buffer allocationsJohn Reck2015-05-192-1/+9
* | | | | | | Merge "Fix whitespace in TextureView" into mnc-devJohn Reck2015-05-201-74/+74
|\ \ \ \ \ \ \
| * | | | | | | Fix whitespace in TextureViewJohn Reck2015-05-201-74/+74
* | | | | | | | Merge "Fix NPE in setSurfaceTexure" into mnc-devJohn Reck2015-05-201-3/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix NPE in setSurfaceTexureJohn Reck2015-05-201-3/+7
* | | | | | | | Merge "Deal more gracefully with null smallIcons." into mnc-devDan Sandler2015-05-201-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Deal more gracefully with null smallIcons.Dan Sandler2015-05-201-3/+10
* | | | | | | | | Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-devPaul Jensen2015-05-201-6/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Undeprecate android.net.ProxyInfo as it's still used.Paul Jensen2015-05-191-6/+0
* | | | | | | | | | Merge "Landscape extracted mode - floating toolbar interference" into mnc-devAndrei Stingaceanu2015-05-201-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Landscape extracted mode - floating toolbar interferenceAndrei Stingaceanu2015-05-201-0/+18
* | | | | | | | | | | Merge "Set NLM_F_ACK in our RTM_NEWNEIGH requests" into mnc-devErik Kline2015-05-207-41/+148
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set NLM_F_ACK in our RTM_NEWNEIGH requestsErik Kline2015-05-207-41/+148
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Add a hidden method to clear the capabilities of a NetworkRequest" int...Lorenzo Colitti2015-05-201-0/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add a hidden method to clear the capabilities of a NetworkRequestLorenzo Colitti2015-05-201-0/+12
| |/ / / / / / / / /
* | | | | | | | | | Close netlink socket when shutting down IpReachabilityMonitorErik Kline2015-05-202-7/+31
* | | | | | | | | | am 9b716793: Merge "Revert "Make VPA.setInterpolator(null) unset the interpol...Yigit Boyar2015-05-191-4/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Make VPA.setInterpolator(null) unset the interpolator."Yigit Boyar2015-05-181-4/+11
* | | | | | | | | | | Merge "setCallbackType should be public for onlost/onfound apis" into mnc-devWei Wang2015-05-191-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | setCallbackType should be public for onlost/onfound apisPrerepa Viswanadham2015-05-191-2/+0
* | | | | | | | | | | | Push initial disk state, handle empty media.Jeff Sharkey2015-05-191-0/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Camera2: Fix session close callback" into mnc-devEino-Ville Talvala2015-05-191-45/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Camera2: Fix session close callbackEino-Ville Talvala2015-05-181-45/+26
* | | | | | | | | | | | Merge "Fix issue #20679383: Add text style to assist.ViewNode..." into mnc-devDianne Hackborn2015-05-193-0/+169
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix issue #20679383: Add text style to assist.ViewNode...Dianne Hackborn2015-05-193-0/+169
* | | | | | | | | | | | | Merge "Turning off logging in ALSA device connection routines." into mnc-devPaul McLean2015-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Turning off logging in ALSA device connection routines.Paul McLean2015-05-191-1/+1
* | | | | | | | | | | | | Merge "Query HTTP proxy for network via a new API to avoid permissions except...Paul Jensen2015-05-196-24/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Query HTTP proxy for network via a new API to avoid permissions exceptionsPaul Jensen2015-05-186-24/+38
* | | | | | | | | | | | | | Merge "Camera2: Add SDK annotations" into mnc-devEino-Ville Talvala2015-05-1912-73/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Camera2: Add SDK annotationsEino-Ville Talvala2015-05-1912-73/+188
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Allow creating a managed profile if there is only one user." into mnc-devNicolas Prevot2015-05-192-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Allow creating a managed profile if there is only one user.Nicolas Prevot2015-05-152-0/+17
* | | | | | | | | | | | | | | Merge "Remove controlBackground attribute, replace with direct reference" int...Alan Viverette2015-05-193-15/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove controlBackground attribute, replace with direct referenceAlan Viverette2015-05-183-15/+8
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |