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

9676 Commits

Author SHA1 Message Date
Ronghua Wu
2e52f82440 am 5054f906: am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev 
* commit '5054f906170f343312a299ec9e72aefb2ac24b7a':
  media: set codec exception reason.
 2015-04-30 16:25:14 +00:00
Ronghua Wu
5054f90617 am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev 
* commit 'c98070a46168c14e54899bfca69889154e3a565d':
  media: set codec exception reason.
 2015-04-30 16:16:08 +00:00
Ronghua Wu
1b12db9e62 Merge "media: set codec exception reason." into mnc-dev 2015-04-30 15:40:36 +00:00
Andy Hung
02f6890289 am 426a0c33: am f388c9e6: am f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 
* commit '426a0c3358099b909f72a34e04af4b0758d28b21':
  Check for null codec from AMediaCodec_createDecoderByType
 2015-04-30 01:21:03 +00:00
Andy Hung
426a0c3358 am f388c9e6: am f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 
* commit 'f388c9e654781c26debe53a0eecce5b6d9234373':
  Check for null codec from AMediaCodec_createDecoderByType
 2015-04-30 01:01:41 +00:00
Jean-Michel Trivi
5a56109d1f AudioService receives callback for dynamic policy mix state changes 
AudioService registers a callback for dynamic policies from
  AudioSystem.
AudioSystem keeps track of a single callback for dynamic policies.

Bug 20226914

Change-Id: I48899d20d1dbb47bb680e733a3bc9fd064b60f07
 2015-04-29 17:56:19 -07:00
Andy Hung
f3d3856f3e Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev 2015-04-30 00:37:58 +00:00
Andy Hung
6344c67e2b am edcf5e1e: am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 
* commit 'edcf5e1e05b7c258665476a75af8440b12050ace':
  Pass PlaybackSettings as class object for AudioTrack JNI
 2015-04-30 00:27:27 +00:00
Andy Hung
edcf5e1e05 am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 
* commit 'f17dd0b48c894fda00b1d2068ef54b05221b1d7a':
  Pass PlaybackSettings as class object for AudioTrack JNI
 2015-04-30 00:16:16 +00:00
Andy Hung
1afdbe3b77 Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 2015-04-29 23:50:46 +00:00
Mike Lockwood
4e17165287 am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev 
* commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb':
  MidiDeviceInfo: Add version string property
 2015-04-29 21:26:01 +00:00
Mike Lockwood
62b4cbceb3 am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev 
* commit 'bcec6a4980366f10182c8dc09ec1eff6f78d7043':
  MidiDeviceInfo: Add version string property
 2015-04-29 21:15:25 +00:00
Andy Hung
26eca01c49 Check for null codec from AMediaCodec_createDecoderByType 
NULL codec can now occur if codec cannot be created.

Bug: 20566134
Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
 2015-04-29 14:09:45 -07:00
Andy Hung
fe48e0dfb9 Pass PlaybackSettings as class object for AudioTrack JNI 
Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
 2015-04-29 14:09:18 -07:00
Mike Lockwood
e1d003958d Merge "MidiDeviceInfo: Add version string property" into mnc-dev 2015-04-29 20:50:35 +00:00
Mike Lockwood
02868b1625 MidiDeviceInfo: Add version string property 
For USB devices, this is populated with the USB device version string.

Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
 2015-04-29 13:44:34 -07:00
Svet Ganov
8baf2b6663 am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev 
* commit '0dbaba6c3a7ae0a45e2305a21b0ef5decbde59a4':
  Respect the record audio app op - framework
 2015-04-29 20:09:09 +00:00
Svet Ganov
0dbaba6c3a am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework" into mnc-dev 
* commit '5e47c802ef1ac9437b012bc70701ffaf048cb399':
  Respect the record audio app op - framework
 2015-04-29 19:55:31 +00:00
Svet Ganov
5686780404 Merge "Respect the record audio app op - framework" into mnc-dev 2015-04-29 19:34:06 +00:00
John Spurlock
d1a32bada1 am 23e46a4e: am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev 
* commit '23e46a4e8d9405e24169a0bb38ff6dc5b8d99ff2':
  Volume: Simple dialog footer, DND in quick settings.
 2015-04-29 14:36:23 +00:00
John Spurlock
23e46a4e8d am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev 
* commit '2d67b2887c0a279aa182646f0e23b176783a1aca':
  Volume: Simple dialog footer, DND in quick settings.
 2015-04-29 14:27:19 +00:00
John Spurlock
8dbcda1b33 Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev 2015-04-29 14:02:52 +00:00
John Spurlock
d9c75dba75 Volume: Simple dialog footer, DND in quick settings. 
- Show DND tile by default, this is now the only
   place to manage DND modes / end conditions.
 - Remove super footer from volume dialog, replace with
   a simplified version that displays the current mode
   and allows ending DND.
 - Remove obsolete text-only footer from codebase.
 - Migrate remaining volume items into main resource files.
 - Rename "No interruptions" to "Total silence".
 - Add new user information banner for "Total silence"
 - Crude media filtering for Total Silence.
   (deeper muting changes will be done as a followup)
 - Disable volume dialog sliders completely if muted due
   to zen.
 - Cleanup ZenModePanel: assume embedded mode, remove
   expandable subhead
 - Remember "favorite" DND mode inside the DND config panel.
 - AudioService: consult ringer-mode-delegate before voluming
   down into silent.
 - Add new hour options to time-based exit conditions.
 - Volume dialog visual updates to move closer to final visuals.
 - Unify ringer=silent with DND.

Bug: 19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717
 2015-04-29 09:58:38 -04:00
Dongwon Kang
13d43ff02a am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 
* commit 'd3fad391e1ccc79fbd0b9330f2aab60bf5b2075b':
  TIF: throw an exception if an operation takes too long.
 2015-04-29 06:04:43 +00:00
Dongwon Kang
d3fad391e1 am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 
* commit '633a45a0d4e095ae81fc2c3e882c23a6513bbaee':
  TIF: throw an exception if an operation takes too long.
 2015-04-29 05:52:39 +00:00
Dongwon Kang
25466e0a8f Merge "TIF: throw an exception if an operation takes too long." into mnc-dev 2015-04-29 05:34:26 +00:00
Dongwon Kang
21add3ecc9 TIF: throw an exception if an operation takes too long. 
Bug: 19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136
 2015-04-29 14:33:24 +09:00
Jae Seo
7e18baa354 Merge "TIF: Put comments for the newly added US and Canadian rating strings" 2015-04-29 02:57:27 +00:00
Svet Ganov
fa5ecdc4ac Respect the record audio app op - framework 
Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
 2015-04-28 16:31:58 -07:00
Ronghua Wu
fb621e8737 media: set codec exception reason. 
Bug: 19620911
Change-Id: I13c007bc82b367680e9a15dc6caed6ef8a81d0a6
 2015-04-28 10:57:57 -07:00
Marco Nelissen
8dc50416a2 resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aosp 
Change-Id: I5681890381beed09e8719b066d0c37accae1658d
 2015-04-28 09:42:54 -07:00
Marco Nelissen
375e21f811 Merge "Sometimes the application context is null" 2015-04-28 15:26:54 +00:00
Dongwon Kang
b73868ddf8 TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc. 
Bug: 20509313
Change-Id: I762bb74ae2a1688e1bc6cdbf6bf5a8b931ae0689
 2015-04-28 17:24:51 +09:00
Dan Stoza
3316452ffa ImageWriter: Change detach to sp<GraphicBuffer> 
Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.

Bug: 20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
 2015-04-27 11:31:12 -07:00
Arunesh Mishra
bc92227d6c Add near-ultrasound properties to AudioManager.java 
Change-Id: I582275aa5f2a2ca55d4028e81ff3e79cf7c793cc
 2015-04-27 10:37:17 -07:00
Andy Hung
09f9a7adb3 Merge "Hide stretch mode from PlaybackSettings" 2015-04-25 01:28:47 +00:00
Andy Hung
18cb3b5a27 Hide stretch mode from PlaybackSettings 
Different timestretch modes won't be ready for M.

Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
 2015-04-24 17:32:57 -07:00
Andy Hung
14862ad8a9 Merge "Move channel index computation to native AudioTrack JNI" 2015-04-25 00:18:22 +00:00
Andy Hung
50c1ed73cd Merge "Unhide new channel masks and deprecate old channel masks" 2015-04-24 23:43:35 +00:00
Jae Seo
344f9e5e9a Merge "TIF: Add TvContentRating constant for unrated content" 2015-04-24 23:41:21 +00:00
Arunesh Mishra
b4d533ba53 Merge "Add AudioManager property strings for ultrasound." 2015-04-24 23:29:39 +00:00
Andy Hung
30d794360f Move channel index computation to native AudioTrack JNI 
Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
 2015-04-24 16:08:27 -07:00
Zhijun He
f9c2dcf6b4 Merge "Image: fix build break" 2015-04-24 22:38:50 +00:00
Zhijun He
766ba09207 Image: fix build break 
Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da
 2015-04-24 15:34:11 -07:00
Jae Seo
9677822097 Merge "TIF: Use Preconditions.checkNotNull for null checking" 2015-04-24 22:03:44 +00:00
Zhijun He
18191b4a52 Merge "ImageWriter: fix and cleanup the closed Image Handling" 2015-04-24 21:59:21 +00:00
Lajos Molnar
e0112b51a1 MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed 
Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
 2015-04-24 14:47:38 -07:00
Wei Jia
197b3daed7 Merge "MediaSync: add OnErrorListener." 2015-04-24 21:46:22 +00:00
Wei Jia
746306521a MediaSync: add OnErrorListener. 
Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
 2015-04-24 14:32:36 -07:00
Andy Hung
7fdf51b18a Unhide new channel masks and deprecate old channel masks 
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
 2015-04-24 14:27:21 -07:00