Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,125 Commits 3 Branches 0 Tags
dfb103ee647aa4518f0a291d1550b76407aaa524
Commit Graph

3307 Commits

Author SHA1 Message Date
Yao Chen
7fe33786d6 am ff3796bd: am d4895aa0: am b0def77c: am 3f544e0b: am 31f80f0f: Assign bindService() result to a boolean directly. One less if-else 
* commit 'ff3796bd875d259ba5a0edf7994ff02faecebc05':
  Assign bindService() result to a boolean directly. One less if-else
 2014-09-29 19:47:17 +00:00
Marco Nelissen
664d4c64b6 am fa1f0380: am 13d7d40c: am 83c23dda: am c8db4536: am 7e51102c: Merge "Validate MTP path" into lmp-dev 
* commit 'fa1f03801ea98b32d172e2129dd9e1de6990e404':
  Validate MTP path
 2014-09-29 19:47:10 +00:00
RoboErik
95cf034365 am 66aec18a: am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward media keys to the app if the phone session is active" into lmp-dev 
* commit '66aec18ad3ce02f13ad162f3c0edd73f648a316c':
  Don't forward media keys to the app if the phone session is active
 2014-09-29 19:46:10 +00:00
Yao Chen
c8a3e0dc9d Assign bindService() result to a boolean directly. One less if-else 
Bug: 17637058
Change-Id: If2f4db2ebf95f1912a752794a1ab482cf30ab014
 2014-09-27 01:08:39 +00:00
Marco Nelissen
f8c4f9efcb Merge "Validate MTP path" into lmp-dev 2014-09-27 01:03:50 +00:00
Marco Nelissen
5f411696a6 Validate MTP path 
Bug: 17673184
Change-Id: I51a64f065d9b3609557af81e596ebeb8720ab6c5
 2014-09-26 16:07:49 -07:00
RoboErik
de9ba39c17 Don't forward media keys to the app if the phone session is active 
This checks if the phone app is currently getting or in a call when a
media key event is sent and sends it to the phone session instead of the
foreground app if it is.

bug:17527302
Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
 2014-09-26 14:53:06 -07:00
RoboErik
7cf4a1e689 am 594858c9: am 765ef814: am 5120438b: am 66bc433a: am cab05d54: Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 
* commit '594858c9d5b7c93bb0c70928c27fb4381fcb0226':
  Disable MediaSessionLegacyHelper debugging
 2014-09-26 21:03:17 +00:00
RoboErik
92c622ef82 am 22069b65: am 3c99bd4b: am 298314cb: am 7d111759: am c80873d5: Merge "Remove BT routes when BT is turned off" into lmp-dev 
* commit '22069b6592c821487fc024b59e103c39fa4bbd34':
  Remove BT routes when BT is turned off
 2014-09-26 21:03:12 +00:00
Yao Chen
babfa52acb am 1fe66b74: am 1769e28d: am a4930277: am 000dd0f8: am 86d77815: Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 
* commit '1fe66b74b60921b15e8fd1125d4ad79cf65aef0e':
  Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false.
 2014-09-26 19:43:26 +00:00
RoboErik
2b731e7b7c Merge "Disable MediaSessionLegacyHelper debugging" into lmp-dev 2014-09-26 16:25:45 +00:00
RoboErik
9b2e567ad4 Merge "Remove BT routes when BT is turned off" into lmp-dev 2014-09-26 16:25:29 +00:00
Yao Chen
08fccd0093 Merge "Check the return value of bindService, and notify media browser client onConnectionFailed if it returns false." into lmp-dev 2014-09-26 15:55:52 +00:00
RoboErik
f5085b518c am 90b89adb: am 7df93654: am 54218f6b: am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 
* commit '90b89adb01087fbaae7ac6499b95dc085b02a531':
  Ensure MediaBrowser state is set to connecting after a reconnect
 2014-09-26 15:26:00 +00:00
RoboErik
4932877113 am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev 
* commit '00cbb751533bf683480ba80f0c450c59c6ca96a1':
  Allow null queues to be set in MediaSession
 2014-09-26 15:25:55 +00:00
RoboErik
1dc5ba8665 Disable MediaSessionLegacyHelper debugging 
Switched over to using Log.isLoggable instead for release.

Change-Id: Iebd6871adb9994e23292953f14b6a997c83957a0
 2014-09-25 14:57:35 -07:00
RoboErik
5535ea8ef8 Remove BT routes when BT is turned off 
A behavior change in the BT stack caused it to stop sending connection
changes for connected devices when you turn BT off. To work around this
we need to remove the connected BT route when BT is turned off.

bug:17512270
Change-Id: I3e5aa8863409c5abac51aa4e93a15f1978cf74b3
 2014-09-25 14:57:35 -07:00
RoboErik
f099e7c214 Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 2014-09-25 18:28:52 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00
Ronghua Wu
bf957c2fb5 am 0a84c4c9: am bf14a4e6: am 2f1e6478: am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit '0a84c4c9ad2c62b788047e762ef73ca0623e4a0a':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 17:18:59 +00:00
Lajos Molnar
0677a41661 am 11148f96: am a91920f0: am f4bab345: am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit '11148f9683a0eec69101d87177d69d96ce944d92':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 17:18:49 +00:00
Lajos Molnar
b2fe00034d am 4d53a61b: am 36dbe967: am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '4d53a61b6636dcc4be7089daef59a159d567636a':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 17:18:36 +00:00
Ruben Brunk
4656e6bb16 am 043d6fff: am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '043d6fffee2b2fe3aa8821914ba761eae964cf2e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:35:00 +00:00
Ronghua Wu
7e1d525b47 Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 2014-09-25 00:23:03 +00:00
Ronghua Wu
e19a80def2 MediaCodecList: fix findEncoderForFormat. 
Bug: 17460057
Bug: 17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
 2014-09-25 00:17:15 +00:00
Lajos Molnar
b15ed6337c MediaCodec: revalidate cached queued input buffers if queue fails (2) 
Handle the other ways queueBuffer can fail.  Revalidate the buffers
properly, e.g. without clearing them.

Bug: 17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
 2014-09-24 16:44:47 -07:00
Lajos Molnar
7e28fc7370 Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 2014-09-24 23:40:56 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
Yao Chen
2354c5eb92 Check the return value of bindService, and notify media browser client 
onConnectionFailed if it returns false.

Bug: 17637058
Change-Id: I2284c3a982e5ac6323f51ff7d98aae7699c695e5
 2014-09-24 21:45:58 +00:00
RoboErik
88b84178d6 Ensure MediaBrowser state is set to connecting after a reconnect 
When the binder had disconnected we were setting the state to suspended
and then not setting it back to connecting when we reconnected. This sets
the state correctly when we are trying to connect again.

bug:17593681
Change-Id: I3fe95fa23ba43ac2dc3692fd28309b2f8e5a3599
 2014-09-24 14:35:32 -07:00
RoboErik
03fce072ca Allow null queues to be set in MediaSession 
Also add some test code for it to OneMedia.

bug:17593962
Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
 2014-09-24 14:35:32 -07:00
Lajos Molnar
00bbc7d9fa MediaCodec: revalidate cached queued input buffers if queue fails 
For legacy behavior (using getInputBuffers) input buffer needs to
be made valid if queue fails.  Otherwise, it becomes unusable,
and the buffer still belongs to the user.

In the new model, buffers obtained by getIn/OutputBuffer will
become invalid even if queue/release fails.

We do not do the same logic for output buffers, as these should
not be accessed even if releaseBuffer fails (which really should not
happen anyway unless codec is in bad state).

Bug: 17630446
Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
 2014-09-24 14:12:08 -07:00
Ruben Brunk
4ba5bc9580 am 0b0ee601: am 58dfddad: am b0069340: am 96cf7438: am e9858c6a: Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 
* commit '0b0ee601ad824d0090d10407b0040887b72a57ae':
  camera2: Update CamcorderProfile documentation.
 2014-09-24 18:36:37 +00:00
Ruben Brunk
63c8e126e7 Merge "camera2: Update CamcorderProfile documentation." into lmp-dev 2014-09-24 17:54:18 +00:00
Ruben Brunk
0fd198ad89 camera2: Hide JPEGs in RGBA gralloc buffers. 
Bug: 17379185

- WAR for SW Write usage flags being unavailable on
  certain devices for JPEG (blob) format buffers.

Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
 2014-09-24 10:43:12 -07:00
Eric Laurent
dfc90e5e9d am e4c51fb1: am 2e0cb3c9: am 02e49c71: am b7e8fdce: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev 
* commit 'e4c51fb10501a1bc6d57813cc7b2aedfdd982d55':
  AudioRecord: add HW hotword capture flag
 2014-09-24 17:18:01 +00:00
Ruben Brunk
27a845cf7c camera2: Update CamcorderProfile documentation. 
Bug: 17447258

- Update documentation in CamcorderProfile for LEGACY
  mode video handling.

Change-Id: If65b93788a38ffe28caec053f81b9afa538c38a0
 2014-09-24 06:59:53 +00:00
Eric Laurent
c1823452ad Merge "AudioRecord: add HW hotword capture flag" into lmp-dev 2014-09-24 01:39:35 +00:00
Jeff Tinker
8a8ac646c7 am 1762f744: am a55b9bcc: am 064b5a29: am cc1ba123: am 3eeac344: Merge "Implement API review feedback." into lmp-dev 
* commit '1762f7449695500670ebb86dd4ab0b3744e448d7':
  Implement API review feedback.
 2014-09-23 20:56:20 +00:00
Christoph Studer
0c07268aa4 am d894e9b8: am b83d9dc3: am dfd80a4e: am 1ff283b8: am 5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev 
* commit 'd894e9b8d0aeccaf14c52152bffc87d43ce5bd83':
  SysUI: Correctly compare MediaControllers
 2014-09-23 20:55:48 +00:00
Jeff Tinker
f7efd5c6a8 Merge "Implement API review feedback." into lmp-dev 2014-09-23 17:39:31 +00:00
Jeff Tinker
21069d1914 Implement API review feedback. 
bug: 17607941
Change-Id: I136b5d7662a1c51395aa3cd545be40714cd4ac6b
 2014-09-23 01:35:41 +00:00
Eric Laurent
bdad1afa92 AudioRecord: add HW hotword capture flag 
Bug: 17575019.
Change-Id: Ifa8b8342dffa12e1943b8f9105f6ab1fa4a2b1a6
 2014-09-19 17:43:29 -07:00
Christoph Studer
b5245d8904 SysUI: Correctly compare MediaControllers 
Instead of comparing MediaControllers via reference equality
(which is never true), go deeper and check whether the two
controllers are connected to the same IBinder.

Bug: 17571414
Change-Id: Id25d70be0a60d1900e977310dedcc7063552e018
 2014-09-19 16:55:45 +02:00
Jungshik Jang
55eef07db6 am d4fcdd1f: am 85467640: am f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev 
* commit 'd4fcdd1fef11beaa81621d3eff93c52b7ba3f0db':
  Adjust volume bar visibility in HDMI-CEC system audio mode
 2014-09-17 02:24:06 +00:00
Jungshik Jang
1a6be6ed39 Adjust volume bar visibility in HDMI-CEC system audio mode 
When HDMI-CEC system audio mode is activated.
1. Hide volume bar when volume button is pressed in TV
2. Show volume bar when TV receives volume notification from
   Audio Receiver.

Otherwise, (system audio mode off) follows normal TV's behavior.

Bug: 17347499

Change-Id: I1f5bc14285d60d8626a8fbbef9e1959cae7d193b
 2014-09-17 10:28:40 +09:00
Andrew Lee
fb748b69d4 am 5325e9bf: am 2167e7dd: am 258f835f: Merge "Add new DisconnectCause class to telecomm." into lmp-dev 
* commit '5325e9bf00c1a0b057cd66ede9f5ef10ee6c7f1e':
  Add new DisconnectCause class to telecomm.
 2014-09-16 22:18:08 +00:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm. 
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
 2014-09-16 12:07:41 -07:00
Jungshik Jang
1ac03738be am a5600691: am a7287581: am 8904a3c6: Merge "Fix volume change failure in HDMI-CEC system audio mode." into lmp-dev 
* commit 'a5600691e2ffe449422333a86edc1798a678411f':
  Fix volume change failure in HDMI-CEC system audio mode.
 2014-09-16 09:12:43 +00:00
Jeff Tinker
1db9c4145a am 96534140: am e05de24f: am 2596d6de: Merge "Document retry behavior for MediaCodec.CryptoException" into lmp-dev 
* commit '9653414015e185787a475bebcc5a99063b9dd54b':
  Document retry behavior for MediaCodec.CryptoException
 2014-09-16 09:11:37 +00:00