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

8911 Commits

Author SHA1 Message Date
Andreas Gampe
cba06c2272 resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19
 2014-11-10 19:41:52 -08:00
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail 
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
 2014-11-10 19:32:28 -08:00
Andreas Gampe
a4a13480dd Frameworks/base: Wall Werror in media/tests 
Turn on -Wall -Werror in media/tests. Fix warnings.

Change-Id: I7177e795d4896f62dfa0b0a5990386e564763384
 2014-11-10 18:44:43 -08:00
Andreas Gampe
6957369d13 Merge "Frameworks/base: Wall Werror in media/jni" 2014-11-11 02:30:00 +00:00
Andreas Gampe
390854c490 am 538b00f6: Merge "Frameworks/base: Wall Werror in media/mca" 
* commit '538b00f6e583dfd38f6e329ef6715fb72f924160':
  Frameworks/base: Wall Werror in media/mca
 2014-11-11 02:20:54 +00:00
Andreas Gampe
5a15d0d31b Frameworks/base: Wall Werror in media/jni 
Turn on -Wall -Werror in media/jni. Fix warnings.

Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
 2014-11-10 18:19:40 -08:00
Andreas Gampe
e5160e7e59 Frameworks/base: Wall Werror in media/mca 
Turn on -Wall -Werror in media/mca. Fix warnings.

Change-Id: I2a43df1d0639babe240b91942a5ea3f8babdef93
 2014-11-10 17:49:02 -08:00
Dan Stoza
1437146a3e am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'bb8a87f48a9978d8faec11819d5fabbbc97cac47':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:58:51 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
Jason Parks
e8d0fe98a6 am ae61ea93: am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit 'ae61ea936ab2323419383993b09f2943787c299a':
  Fix NPE for CTS.
 2014-11-07 00:24:53 +00:00
RoboErik
fcfe6f5c7e am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1 
* commit 'bd94aff236502f5b4fe19bd773a10d0fd1ccfe49':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-07 00:07:06 +00:00
Jason Parks
220b65d21d am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev 
* commit '94c3e3bfcfe8d91283560082c737cb62e8d06742':
  Fix NPE for CTS.
 2014-11-07 00:05:47 +00:00
RoboErik
b1d52e1d20 Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev 
* changes:
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered
 2014-11-06 21:20:19 +00:00
Jason Parks
de709869ae Fix NPE for CTS. 
The effect list can be empty and will return null
from native code. This fixes the CTS crash.

Bug: 18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
 2014-11-06 14:08:52 -06:00
RoboErik
a13846ddf3 Update metadata artwork and uri docs 
This updates the Javadoc on the bitmap and uri fields to strongly
suggest Uris be used for high res artwork and strongly suggest Uris
use the content: style and support EXTRA_SIZE.

Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e
 2014-11-06 10:55:06 -08:00
Jeff Tinker
0d8d6ba807 am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit 'e7f66ada24c2b4098e9fea1c07d570543149c806':
  Add missing secure stop methods
 2014-11-06 02:49:08 +00:00
Jeff Tinker
fc4e6f70f6 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:23 +00:00
Eric Laurent
c3a61d9838 am 29218f24: am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 
* commit '29218f24719490e26ba41db2875d54853866e39f':
  AudioEffect JNI: use new max preprocessing constant
 2014-11-05 22:10:20 +00:00
Eric Laurent
e43bf0821b Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev 2014-11-05 22:02:54 +00:00
RoboErik
3e0cfcda31 skip MediaController callbacks if it's been unregistered 
This gives slightly better gaurantees around when an app will receive
a callback. As long as they remove a callback on the same thread calls
get posted on they won't receive any callbacks after the remove.

bug:18104724
Change-Id: Id9878186f005bf0b35c0380cd35f8fd7e67d1d90
 2014-11-05 13:07:38 -08:00
Andrew Solovay
cf6e9c2213 am 4f0850a1: am fbc3bdec: am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs automerge: 8d7d7b4 
* commit '4f0850a138f02a9bda405f987a0623fa84da2615':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:44:07 +00:00
Andrew Solovay
fbc3bdec7a am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
automerge: 8d7d7b4

* commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
  docs: Removed broken link to non-existent method.
 2014-11-05 20:22:24 +00:00
Eric Laurent
b27a8a5bcc AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
 2014-11-05 12:20:49 -08:00
RoboErik
5468f292f3 am acbdb4fe: am 9af44ddf: Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 
* commit 'acbdb4fe5d2e4bd7729f3685b2d78421d5d13cc8':
  Post volume requests to the handler thread in MediaSession
 2014-11-05 18:55:53 +00:00
RoboErik
6651cd3830 am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* commit 'e2b8dab0d0f541e4a014536f8088ac51afc06c49':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:55:46 +00:00
Andrew Solovay
8d7d7b448f am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs 
* commit '56576838a8e8c4f44f8df13cc40295a918540b86':
  docs: Removed broken link to non-existent method.
 2014-11-05 18:52:27 +00:00
RoboErik
9af44ddf03 Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 2014-11-05 18:29:32 +00:00
RoboErik
5604a85ac6 Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev 
* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
 2014-11-05 18:26:00 +00:00
RoboErik
131e63adaa Add extras to the PlaybackState 
This allows apps to include extras that are atomic with play state
changes.

bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a
 2014-11-04 13:47:45 -08:00
RoboErik
566c1ed18f Add setRatingType to MediaSession 
This was missing in L. Needed to tell controllers how to rate content.

bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b
 2014-11-04 13:14:19 -08:00
Dan Stoza
2c34b5e813 Add a BufferItem parameter to onFrameAvailable 
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
 2014-11-04 11:36:33 -08:00
Eric Laurent
d9764f1c23 am 13e4928a: am fe91d4e6: Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 
* commit '13e4928a49f6e86b5dd8c5a34b38550f110f1e99':
  AudioService: fix wired headset insertion delay.
 2014-11-04 17:09:57 +00:00
Eric Laurent
fe91d4e6a2 Merge "AudioService: fix wired headset insertion delay." into lmp-mr1-dev 2014-11-04 17:02:25 +00:00
Dongwon Kang
89ff872654 am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b 
* commit 'e2e7e9df8b8db998d9d2cb2e43eae84df3edad64':
  TIF: Fix a typo and remove an unused method in TvInputService
 2014-11-04 03:16:30 +00:00
Eric Laurent
12f6a11de6 am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f 
* commit '8e264a7703c79fff52dedcd867b9f134d93199f6':
  AudioService: fix cross deadlock
 2014-11-04 03:16:23 +00:00
Dongwon Kang
085329b69a Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev 2014-11-04 02:41:54 +00:00
Eric Laurent
adbe8bf85f AudioService: fix wired headset insertion delay. 
Do not systematically delay a device connection
message by 1 second if another message is still in the queue
but calculate delay based on last message insertion time.

Bug: 17882912.

Change-Id: Id86c338488f41eebfa1dfd926032468be0294cec
 2014-11-03 18:26:57 -08:00
Eric Laurent
8befd6fd05 Merge "AudioService: fix cross deadlock" into lmp-mr1-dev 2014-11-04 02:00:32 +00:00
Eric Laurent
8fa4d6f585 AudioService: fix cross deadlock 
Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312
 2014-11-03 17:30:41 -08:00
Andrew Solovay
4034546812 docs: Removed broken link to non-existent method. 
Doc had included link to method MediaBrowserService.onLoadIcon().
Per bug http://b/17205016 that method was removed before release.

Revised doc is staged to:

http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html

(Note that the other "See Also" link, which I didn't remove, is badly
formatted because Javadoc seems to choke on links to methods that are
passed generic types. JoeFernandez@, if you can suggest a better way
to format that link I'll make that change too.)

bug: 18229650
Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
 2014-11-04 01:25:26 +00:00
Jeff Tinker
1b51c72e91 Add missing secure stop methods 
b/18053197
b/18076411

Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
 2014-11-03 16:22:04 -08:00
Dongwon Kang
79d2b4c810 TIF: Fix a typo and remove an unused method in TvInputService 
Change-Id: I2c0233678c08a7070ffe507d9671e1ab669fdfd8
 2014-11-03 16:04:12 +09:00
Dongwon Kang
099003bd20 am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '664eddfdc76cbe17f8b26d65528335d5430a6874':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:19:40 +00:00
Dongwon Kang
4dd56c93e3 TIF: Add more documentation on start/end time of TvContract.Program 
Bug: 18163685
Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f
 2014-11-03 10:58:00 +09:00
Jean-Michel Trivi
9e0fc95d08 am 38b00a63: Merge "More AudioPolicy registration" into lmp-mr1-dev 
automerge: 5a51050

* commit '5a51050519a3738488a4f7186e9822c448362a37':
  More AudioPolicy registration
 2014-10-31 16:42:48 +00:00
Jean-Michel Trivi
38b00a63c9 Merge "More AudioPolicy registration" into lmp-mr1-dev 2014-10-31 16:32:53 +00:00
Jean-Michel Trivi
8fdb0d4def More AudioPolicy registration 
Define new usage in AudioAttributes to describe "virtual" sources.
Maintain a registration string in AudioPolicy and AudioMix that
 is used for the address of the mix in the native policy manager.
AudioPolicy registration marks the audio policy configuration and
 the audio mixes as registered.
The AudioPolicy class is used as the factory for the AudioTrack
 and AudioRecord objects that are respectively used as the
 source and sink of the mixes created by the policy owner.

Bug 16009464

Change-Id: I8e5bd351495257597c513d22597e273fcabdbc55
 2014-10-30 17:22:34 -07:00
Dongwon Kang
c86090ea0c am c78d450b: TIF: handle inputs holding the overlay view even after the session release automerge: ce34c6d 
* commit 'c78d450b2ecc4668572ef6b312ff0d9d31cfd2f8':
  TIF: handle inputs holding the overlay view even after the session release
 2014-10-31 00:15:40 +00:00
Dongwon Kang
27219325d5 am 39567dd6: am c1f26faa: Merge "TIF: Handle notifyXXX() calls requested before the session initialization" into lmp-mr1-dev 
* commit '39567dd6480ae2527af8f53199e0f42e1de80b2c':
  TIF: Handle notifyXXX() calls requested before the session initialization
 2014-10-31 00:15:33 +00:00
Andre Eisenbach
1bf7bca511 am 34964701: am db41880d: Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev 
* commit '34964701e0ff9c07e8d3456fe6d1246d6e8078d1':
  Fix exception in AudioService when no BT Headset is connected.
 2014-10-30 23:42:40 +00:00