drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,958 Commits 1 Branch 0 Tags
Commit Graph

139958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
15d0f97473 Merge "Camera2: Call onCaptureSequenceAborted when appropriate" 2014-06-20 02:04:45 +00:00
Jeff Tinker
6a9687109c Merge "Add diagnostic error code to MediaDrm IllegalStateExceptions" 2014-06-20 20:43:34 +00:00
RoboErik
726735586c Merge "Add volume handling APIs to sessions" 2014-06-20 20:43:34 +00:00
Igor Murashkin
1788b0466b camera2: Shim fix hwLevel and minimumFocusDistance 
Change-Id: Ie4ab330a738ac4c8e465eacade1bbc39bdb776fe
 2014-06-20 13:45:46 -07:00
Jeff Tinker
d712e1a387 Add diagnostic error code to MediaDrm IllegalStateExceptions 
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
 2014-06-20 13:41:30 -07:00
RoboErik
ef3c9e9b05 Add volume handling APIs to sessions 
This renames and moves the VolumeProvider and adds apis to
MediaController to get the current state of volume on a session and
to request changes to the volume.

Change-Id: I290e9efefb6676c805819a29e1d054c3192c6773
 2014-06-20 13:39:41 -07:00
Eino-Ville Talvala
ee37e30c22 Camera2: Call onCaptureSequenceAborted when appropriate 
Bug: 15524101
Change-Id: I4615d0b4ae3cae80609586f7dfa8373691a9e384
 2014-06-20 17:24:40 +00:00
George Mount
9285d1bf9c Exclude views that aren't on screen from Activity Transitions. 
Bug 15704207

Change-Id: I114a5191536b5c59c6c2d1074fab8505a8ad2fdb
 2014-06-20 14:09:57 +00:00
Nicolas Prevot
1e2f374e71 Merge "Making more ContentProviders work across users." 2014-06-20 04:43:13 +00:00
Andreas Gampe
b325ce8203 Add a null check to UserAvatarView.setBitmap 
Adds a null check for the bitmap to set. Resets the paint's shader
in case of a null bitmap to release any previous image.

Change-Id: I1adf3c8ef44522a593fe3f25726b6c83120d7556
 2014-06-19 23:51:12 -07:00
Dianne Hackborn
5ff885cd3b Revert "Add support for tint attribute in VectorDrawable" 
This reverts commit ab41ea17e6b0407fa76bc9f9183190a9bbc7f560.

Was causing system UI to crash.
 2014-06-19 23:02:37 -07:00
Dianne Hackborn
a427fcf2cb Merge "Fix issue #15689396: pre-installed DemoAPI tests fail..." 2014-06-20 02:15:46 +00:00
Dianne Hackborn
b65ea7bfc6 Fix issue #15689396: pre-installed DemoAPI tests fail... 
...with a NPE on emulators running Google x86 API 19 image

Change-Id: Ib989127f48b0c02ec645b99827a9b775188684d8
 2014-06-20 12:18:55 -07:00
RoboErik
60c958cd9f Merge "Remove dead code from keyguard" 2014-06-20 02:09:17 +00:00
George Mount
53ad2a15d5 Merge "Make public basic transitions." 2014-06-20 02:09:17 +00:00
George Mount
7da1f58219 Make public basic transitions. 
Bug 15727908

Adds slide, explode and fade transitions.

Change-Id: I8badb3a1e9230d66d9ca3d1edeec0510bc89d556
 2014-06-20 07:07:18 -07:00
Ruben Brunk
a783875420 Merge "camera2: Add AE antibanding + fps range metadata." 2014-06-20 02:04:45 +00:00
Igor Murashkin
e76e8bce93 Merge "camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass" 2014-06-20 03:08:23 +00:00
Eric Laurent
1cff3844da update SCO audio test app 
Added test for startBluetoothScoVirtualCall()

Change-Id: I1b47b60a8c5fb0158d4e224252a9d511c612ca2f
 2014-06-20 17:49:06 +00:00
Ruben Brunk
5776aafc7e camera2: Add AE antibanding + fps range metadata. 
Bug: 15116722
Change-Id: I627748e162f26c42f6bbcfc21ee4b1081e1f25ad
 2014-06-19 19:20:36 -07:00
John Reck
0916423712 Merge "Add negative guard" 2014-06-20 02:04:45 +00:00
John Reck
7aab5a1f9f Add negative guard 
Bug: 15631600

Change-Id: Idd7740f58876e73694fafb8ef55ebaff511f6dca
 2014-06-20 09:59:56 -07:00
Andres Morales
626861c5a5 Merge "Framework changes to support NFC trustlet." 2014-06-20 02:15:46 +00:00
Andres Morales
3b33fd283c Framework changes to support NFC trustlet. 
Adds a system-only ability to register for receiving
tags from NfcService at the lockscreen.

Change-Id: I4b50941031e8d1f40ebb6314211226e70a2ad187
 2014-06-20 10:05:52 -07:00
Eric Laurent
2930764885 Merge "AudioManager: add startBluetoothScoVirtualCall()" 2014-06-20 02:09:17 +00:00
Eric Laurent
83900754f3 AudioManager: add startBluetoothScoVirtualCall() 
Add API to start bluetooth SCO audio connection explicitly
in virtual call mode.

Bug: 11824396.
Change-Id: I1dfab13c659f5855e0b78467ac48b3186af7874c
 2014-06-20 10:17:47 -07:00
Yorke Lee
4d9950d13a Merge "Revert "Add ability to set and get DefaultPhoneApplication"" 2014-06-20 02:09:17 +00:00
Yorke Lee
cf9bc5e76d Revert "Add ability to set and get DefaultPhoneApplication" 
This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4.

Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af
 2014-06-20 10:05:17 -07:00
Igor Murashkin
49b2b13510 camera2: Fix deadlocks in shim #close and make #testInvalidCapture pass 
* Also fixes configureOutputs to allow it to unconfigure
* Adds IAE checks in a few spots to validate surfaces aren't null

Bug: 15116722
Change-Id: I9ec88bccb3600eb12747d84436ead27952e87646
 2014-06-19 17:36:07 -07:00
Mike Reed
402c8f5a07 Merge "stop using (deprecated) SkBitmap::Config" 2014-06-20 00:30:35 +00:00
Mike Reed
b933055cf3 stop using (deprecated) SkBitmap::Config 
Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
 2014-06-20 10:28:37 -04:00
Jeff Brown
af861ab879 Merge "Perform haptic feedback for wake gesture." 2014-06-20 02:04:45 +00:00
John Spurlock
ffb9439172 Merge "If we're not showing switch text, don't include in measure." 2014-06-20 00:24:32 +00:00
John Spurlock
e599488968 If we're not showing switch text, don't include in measure. 
Naive fix for switch crashes when !showText.

Bug:15770311
Change-Id: I68839b61b907d62159e2c12349005683e9ac6436
 2014-06-20 10:53:54 -04:00
Yorke Lee
eff9661b2a Merge "Revert "Add getSystemPhoneApplication to TelecommManager"" 2014-06-20 00:24:32 +00:00
RoboErik
56a004e936 Merge "Remove more dead audio service code" 2014-06-20 00:20:03 +00:00
Baligh Uddin
9e3dcfa25f am 1c74e20d: (-s ours) am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1c74e20db1c59fdb4e9512339c1251830842c905':
  Import translations. DO NOT MERGE
 2014-06-20 19:57:15 +00:00
Robert Ly
922d0e7963 am 149c1b09: am c9334fb1: fix typo on lmp-prev page 
* commit '149c1b09ee683b1af90a9f21488ded197e31ffa7':
  fix typo on lmp-prev page
 2014-06-20 19:57:10 +00:00
Robert Ly
a69c1c8197 am f6c5ee40: am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev 
* commit 'f6c5ee4079291c5779ff3c5083eab60734f52c62':
  add new image and landing page for l-preview
 2014-06-20 19:57:04 +00:00
Baligh Uddin
1c74e20db1 am 1b3a5217: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1b3a52170ab0f2ec82532a689d271eaf8b8997f9':
  Import translations. DO NOT MERGE
 2014-06-20 19:48:52 +00:00
Robert Ly
149c1b09ee am c9334fb1: fix typo on lmp-prev page 
* commit 'c9334fb1b884031ad0f522085542e80e71f73685':
  fix typo on lmp-prev page
 2014-06-20 19:48:48 +00:00
Robert Ly
f6c5ee4079 am 3323e554: Merge "add new image and landing page for l-preview" into klp-modular-dev 
* commit '3323e554391e7cf5ddba03d9f468c8acfb35ee0e':
  add new image and landing page for l-preview
 2014-06-20 19:48:40 +00:00
RoboErik
6f0e4ddd66 Remove more dead audio service code 
Hit a snag in remote volume changes. Trying off this round of
removal so I can work on fixing remote volume handling in a
separate CL.

Change-Id: I49b1ba4b75d770ba7c77da081755f3210a9e9483
 2014-06-20 11:35:20 -07:00
Elliott Hughes
f44d499956 am 19597647: am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit '19597647f957c4f9755af2f405160f76460ca26d':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 18:19:42 +00:00
Elliott Hughes
19597647f9 am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:34:36 +00:00
Elliott Hughes
ff6b0e2472 am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface" 
* commit 'f18961066b7029652dacb9016bacbf192a6cf73d':
  Fixed VM memory leak in AudioSystem JNI interface
 2014-06-20 16:30:40 +00:00
Elliott Hughes
f18961066b Merge "Fixed VM memory leak in AudioSystem JNI interface" 2014-06-20 02:09:57 +00:00
Christopher Tate
85ef6ff60c Merge "Collapse a bunch of verbose boilerplate" 2014-06-20 02:09:17 +00:00
Christopher Tate
63d9ae1e75 Collapse a bunch of verbose boilerplate 
Objects.equals() is your friend!

Change-Id: I728bbff6c20309b42ec31f2d87748d9fa19aa00f
 2014-06-20 12:04:31 -07:00
Selim Cinek
89faff1dac Closing the QS when tapping on the notifications now. 
Bug: 15394230
Change-Id: Ib9f750db69529afc0d56685fb88a13d183b0d3d5
 2014-06-20 00:27:37 +00:00