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

8390 Commits

Author SHA1 Message Date
Jae Seo
5b1caaf7d8 TIF: Fix some comment warnings 
Also fixed some other obvious warnings from Eclipse

Bug: 16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
 2014-08-18 23:25:48 +00:00
Andy Hung
d6533db146 am 9e18ddf9: am c089fd1a: am 5c73ba37: Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 
* commit '9e18ddf9ea21bc4b3ffb3539863512c92d9751c6':
  Fix 48kHz limitation on AudioTrack
 2014-08-18 21:22:42 +00:00
Michael Wright
d86ecd26d7 Add callbacks for MediaProjection start / stop. 
Also, enforce that there is only one valid MediaProjection at a time.

Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
 2014-08-17 16:06:56 -07:00
Andy Hung
2aaed141fa Merge "Fix 48kHz limitation on AudioTrack" into lmp-dev 2014-08-16 04:32:18 +00:00
Andy Hung
70b395e8c1 Fix 48kHz limitation on AudioTrack 
Changed to 96kHz.

Bug: 12979141
Bug: 17069369
Change-Id: I7643901f6d365d8b46da4872bd2266ec20cb0339
 2014-08-18 11:25:22 -07:00
Jaewan Kim
67d666f604 Merge "Fix NPE when passing null TvContentRating" into lmp-dev 2014-08-16 04:12:14 +00:00
Jaewan Kim
a42be3c950 Fix NPE when passing null TvContentRating 
Change-Id: I80b0ca60b1623356fd39015521b50ae9f1eaef07
 2014-08-19 11:55:07 +09:00
Jinsuk Kim
ac33c6cb56 am 28920008: am c68c9dbd: am 47a91229: Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 
* commit '28920008ff3835c8febcad58f638530ec6253112':
  CEC: Replace the usage of logical address with id for HdmiDeviceInfo
 2014-08-18 04:06:25 +00:00
Michael Wright
16e6811deb am 0ad986bf: am a08b5883: am 4d568b1c: Merge "Remove MediaProjection#createAudioRecord API" into lmp-dev 
* commit '0ad986bf9d89b15334fa53bcd8bc91dfc835f460':
  Remove MediaProjection#createAudioRecord API
 2014-08-18 04:06:20 +00:00
Jae Seo
e482a3f5da am 697896b0: am b6ba4f21: am d250789a: TIF: Make passthrough related method names consistent 
* commit '697896b0a1af1d34b9aa10983d6c0cf11dfae914':
  TIF: Make passthrough related method names consistent
 2014-08-16 05:22:12 +00:00
Jae Seo
c22d0c0941 TIF: Make passthrough related method names consistent 
Bug: 17063792
Change-Id: Id76b37ae1507db5d78319b8786b395353ded70e1
 2014-08-16 04:52:56 +00:00
Jinsuk Kim
98f4c16a7b Merge "CEC: Replace the usage of logical address with id for HdmiDeviceInfo" into lmp-dev 2014-08-16 04:12:14 +00:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE) 
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
 2014-08-19 20:08:52 -07:00
Michael Wright
d5bfcff975 Remove MediaProjection#createAudioRecord API 
Change-Id: I60def1944a1669b9c1da4cd9aa28af36ad852e94
 2014-08-17 17:59:22 -07:00
Lajos Molnar
59437f8dfa am d995d23c: am 29f4a0b4: am b5caee71: Merge "media: minor fixes for MediaCodecInfo" into lmp-dev 
* commit 'd995d23ccb968258a6270722af7bd5b98bec329a':
  media: minor fixes for MediaCodecInfo
 2014-08-16 03:33:23 +00:00
Andy Hung
39da4fc39a am 368b9954: am 2c0b3eb3: am 97c46ebd: Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev 
* commit '368b995487fb25397849b572c6d26f33cab670dc':
  Fix 7.1 audio playback from AudioTrack
 2014-08-16 01:00:24 +00:00
Andy Hung
efb3a8b37a Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev 2014-08-15 21:23:40 +00:00
Andy Hung
ad720aeea7 Fix 7.1 audio playback from AudioTrack 
Uses AudioFormat.CHANNEL_OUT_7POINT1_SURROUND.

Bug: 16951383
Change-Id: I7e94598d5cae1a741b8b1e0492b202163bf9f9fd
 2014-08-15 14:23:06 -07:00
RoboErik
97a837389b am a955d872: am 4ed18b42: am 9ea4316f: Merge "Fix crash in legacy apps that register without a looper" into lmp-dev 
* commit 'a955d8721edbd5f7355fe7c95dad721e03a19ac1':
  Fix crash in legacy apps that register without a looper
 2014-08-15 21:11:20 +00:00
Lajos Molnar
be5e3359b1 Merge "media: minor fixes for MediaCodecInfo" into lmp-dev 2014-08-15 19:14:43 +00:00
Lajos Molnar
981c344ee7 media: minor fixes for MediaCodecInfo 
- use equals() for Range singularity checks
- parse max-channel-count properly
- add platform defaults to G711 and GSM audio codecs
- allow xml to override platform limits if format,
  profile or level is not supported (but recognized to be
  possibly valid) by the platform
- set defaut format fields

Bug: 11990470
Change-Id: I06114e2d10dcc205a8a963605a01e6d4f6ecd0f0
 2014-08-15 17:35:30 -07:00
RoboErik
e0d866b278 am c92a770d: am 866ae744: am bc0d11a6: Merge "Pipe caller\'s identity through volume methods" into lmp-dev 
* commit 'c92a770de89fae371d51600c8d06ac175244ef5a':
  Pipe caller's identity through volume methods
 2014-08-15 11:43:07 +00:00
Jae Seo
8026650d17 am e83533ee: am cecfd8e4: am 5152ff49: Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 
* commit 'e83533ee160ebb079e4a92f2a59ca46a257ae412':
  TIF: Rename R.attr.contentRatingSystemXml and fix documentation
 2014-08-15 05:07:18 +00:00
RoboErik
f194dac397 am 3e3ad51f: am 8ce00c8b: am cf7e33d3: Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev 
* commit '3e3ad51fef38f574bc16ff76f231f9360b350ad7':
  Remove REMOTE_STREAM_MUSIC references from AudioService
 2014-08-15 05:07:08 +00:00
RoboErik
f31549da00 am ff09ed72: am ff97fe6a: am 9d006c55: Merge "Post MediaSessionManager callbacks to the caller\'s thread" into lmp-dev 
* commit 'ff09ed72cd34b7ebfe0dea7af7cbd7e8499f37f1':
  Post MediaSessionManager callbacks to the caller's thread
 2014-08-15 05:06:58 +00:00
RoboErik
0016b5f6a7 am 2dea60c8: am 1e553dc7: am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 
* commit '2dea60c8390ab4c2c12bc865819be983d5d6b3e0':
  Add an onSessionDestroyed callback to MediaController.Callback
 2014-08-15 05:06:50 +00:00
RoboErik
78c64cdbd8 Fix crash in legacy apps that register without a looper 
Some legacy apps registered their media button receiver in a thread
without a looper. If this happens we need to use the main looper to
prevent a crash.

bug: 16306226
Change-Id: Idf472e649393e2a7ce2a3e1cbb3476003ab17f34
 2014-08-14 18:42:54 -07:00
Lajos Molnar
f642d52941 am e3cd62bf: am 4f1245eb: am 266abcaf: Merge "media: release allocated strings on error" into lmp-dev 
* commit 'e3cd62bf63706c663f85f31b7925efd85a41efc3':
  media: release allocated strings on error
 2014-08-14 18:10:20 +00:00
Dongwon Kang
1931dfb5b3 am 2074d17a: am 9b46af77: am b2e06223: TIF: resolve SecurityException on loadCustomLabel(). 
* commit '2074d17ad1120de598e558c43b7b6fe2bfcc3b8c':
  TIF: resolve SecurityException on loadCustomLabel().
 2014-08-14 17:57:09 +00:00
Sungsoo Lim
e11c22b65d am 9297918a: am 052d64a2: am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev 
* commit '9297918ade48c5523804bffad1cf389cf5cabbfb':
  Update Java doc for TV Rating system
 2014-08-14 17:57:04 +00:00
Jaewan Kim
b35075f8d4 am f4b9e968: am aa0b328f: am 640ec96b: TIF: Change data type of custom labels and hide inputs 
* commit 'f4b9e9681c290fd18a975c05d75ded2b8202ddc2':
  TIF: Change data type of custom labels and hide inputs
 2014-08-14 17:56:36 +00:00
RoboErik
5ca4a78e32 Merge "Post MediaSessionManager callbacks to the caller's thread" into lmp-dev 2014-08-14 16:46:52 +00:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
Mike Reed
021a3443c6 SkBitmap::Config is deprecated 
Change-Id: I0bbd929074474ae3c1d497c2f645417e4876d9e3
 2014-08-14 09:57:06 -04:00
Dongwon Kang
d4eb10a88d TIF: resolve SecurityException on loadCustomLabel(). 
Bug: 17001118
Change-Id: I357ac2506562c028116c3e4f6dd611ef2b744d28
 2014-08-14 03:43:07 +00:00
Jinsuk Kim
8960d1b155 CEC: Replace the usage of logical address with id for HdmiDeviceInfo 
Introduced 'id' of HdmiDeviceInfo to replace the direct use of logical address
as id. This accomodates the identification of MHL device with ease. Also updated
TIF to use id instead of logical address.

Bug: 16986744
Change-Id: Ifa827fb5e5fcf1d2f612f0845accbfe5c03734aa
 2014-08-14 10:52:23 +09:00
Jaewan Kim
e2c83c97fb TIF: Change data type of custom labels and hide inputs 
Change-Id: I2783245671a2a2a5500c6f97acf6375f44db8bf4
 2014-08-14 01:12:41 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback 
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
 2014-08-13 15:00:21 -07:00
Lajos Molnar
eed01e068b Merge "media: release allocated strings on error" into lmp-dev 2014-08-13 16:52:03 +00:00
RoboErik
1d2a1c917f Merge "Pipe caller's identity through volume methods" into lmp-dev 2014-08-13 01:30:58 +00:00
RoboErik
0dac35af2c Pipe caller's identity through volume methods 
setStreamVolume and adjustStreamVolume were always being called
from the session service's uid/package. This adds the plumbing to
allow the original app's info to be passed in to the audio service
when volume is changed.

Change-Id: Ib36639dab1e518b435161dc453c8ba9351df3e9b
 2014-08-14 10:21:26 -07:00
Jae Seo
e8deca1a0e Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 2014-08-13 01:30:58 +00:00
Jae Seo
fc27d6db08 TIF: Rename R.attr.contentRatingSystemXml and fix documentation 
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
  describes TV content rating, not a component name.
- Replace the DTD with an XML example.

Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
 2014-08-14 17:28:07 +00:00
Sungsoo Lim
1d11640127 Update Java doc for TV Rating system 
Bug: 17007100
Change-Id: Idb3f2184ea6d0421875ccd1e10b7539b3c17080a
 2014-08-14 12:24:41 +09:00
Glenn Kasten
34cc4db180 Move setting to disable automatic USB routing 
This moves the setting from System to Secure per review.

Bug: 16381952
Change-Id: I2497ca66b4f346839490c29295528fac70e94494
 2014-08-13 13:31:04 -07:00
Chulwoo Lee
81d1b4def0 TIF: Enable to build uri for browsableOnly channels 
BUG: 16966138
Change-Id: Idf3a349547a269777a8336b6bbbf933b52f5582a
 2014-08-13 12:28:34 -07:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
Sungsoo Lim
a9a29a29e5 Fix hashCode of TvContentRating 
Bug: 16963556
Change-Id: I0d419e4a47cd4b0a364d3b05063dcdbfc8a168ae
 2014-08-13 08:32:29 +00:00
RoboErik
2811dd3372 Remove REMOTE_STREAM_MUSIC references from AudioService 
This removes the fake stream from AudioService and cleans up
references to it. Also removes isLocalOrRemoteMusicActive.

bug:15884752
Change-Id: I1c2b57a2f8ba80061313737f254463f4c80ce8c3
 2014-08-14 17:23:34 +00:00
Jean-Michel Trivi
81f871e2b9 Add support for AudioAttributes in android.media.Ringtone 
Deprecate use of stream types.
Map deprecated API to AudioAttributes.
Add new methods to specify AudioAttributes on a Ringtone instance.

Bug 16790748

Change-Id: Ifb3c2e838e1f119614459ad7d71d83a4d7c9ffdb
 2014-08-12 15:53:15 -07:00