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

9128 Commits

Author SHA1 Message Date
Narayan Kamath
a6f7099343 am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '031acc4b3920336e58c56abb99322cbeb9be9e5c':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 20:09:12 +00:00
Narayan Kamath
031acc4b39 am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '3787decd8d41320ec9201405ec4cc893b2c99d78':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 10:16:34 +00:00
Narayan Kamath
5137415e39 Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 2015-01-06 10:06:06 +00:00
Haitao Feng
8bd6a203ca Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod. 
CallStaticVoidMethod is varargs function, and calling it with
a literal 0 like CallStaticVoidMethod(..., 0) will treat the
argument as a 4 byte int in both 32 and 64 bit processes.

This is incorrect for pointer arguments where NULL should be
used instead.

Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>

Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
 2015-01-06 09:57:13 +00:00
Narayan Kamath
c82be5f27f am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" 
automerge: b7974bd

* commit 'b7974bd31d06d439cb75f8a3a0ad032fa689c729':
  Race-condition in SoundPool during release
 2015-01-05 18:10:33 +00:00
Narayan Kamath
b7974bd31d am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" 
* commit 'dd65a4f735a311fe60c065449e394974807ff297':
  Race-condition in SoundPool during release
 2015-01-05 18:08:06 +00:00
Narayan Kamath
ea4cdd4454 Merge "Race-condition in SoundPool during release" 2015-01-05 17:57:27 +00:00
Glenn Kasten
cd4ac0a204 Merge "Fix build" 2014-12-29 19:08:48 +00:00
Glenn Kasten
41edd7cb86 Merge "Update API documentation for static AudioTrack" 2014-12-29 19:08:04 +00:00
Glenn Kasten
b5e5efbab8 Fix build 
Change-Id: I1119c37ac317d0ce86c53a6c134c664d2f1c2cb3
 2014-12-29 08:17:56 -08:00
John Spurlock
aa5adac6d2 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev automerge: db41690 
automerge: bbe3087

* commit 'bbe3087ec08b22bf3778e1ed77a0d6bfc13611a4':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
 2014-12-28 05:57:49 +00:00
John Spurlock
bbe3087ec0 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 
automerge: db41690

* commit 'db416907b831010cc2854292aa7de85fd8857a77':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
 2014-12-28 05:42:43 +00:00
Jean-Michel Trivi
d3f58b0214 am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev 
automerge: 6fa5d8d

* commit '6fa5d8dab0314e095af07f8e58c76a3af3de0c15':
  AudioRecord: filter attributes
 2014-12-26 20:33:40 +00:00
Jean-Michel Trivi
6fa5d8dab0 am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev 
* commit '98ba8409876087f32114d889435b7f1bd7a73ffb':
  AudioRecord: filter attributes
 2014-12-26 20:30:04 +00:00
John Spurlock
af84e073bc Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 2014-12-24 01:16:14 +00:00
Glenn Kasten
ac322096d8 Update API documentation for static AudioTrack 
Change-Id: Ie9e2c020680a5264eb0074f30f33eb1204c1a106
 2014-12-23 16:52:50 -08:00
John Spurlock
af88a19165 Audio Policy: Clear calling identity for all paths setting ringer mode. 
For proper appops bookkeeping and zen setting changes.

Bug: 18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
 2014-12-23 16:14:44 -05:00
Jean-Michel Trivi
996af72b0c Merge "AudioRecord: filter attributes" into lmp-mr1-dev 2014-12-22 18:55:40 +00:00
Jean-Michel Trivi
43bcd8fa74 AudioRecord: filter attributes 
When creating an AudioRecord instance, filter the tags in the
  AudioAttributes to remove tags that are handled at the Java
  layer.

Bug: 18733215
Bug: 18736417

Change-Id: I16a3497742086deced4e8677bd6231290396c5f6
 2014-12-22 18:15:32 +00:00
Eric Laurent
ddac2a7b31 am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev 
automerge: b418537

* commit 'b4185370d22457e8893ab5da07870e6d56910fbe':
  AudioService: fix permission check.
 2014-12-19 17:31:14 +00:00
Eric Laurent
b4185370d2 am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev 
* commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3':
  AudioService: fix permission check.
 2014-12-19 17:28:03 +00:00
Eric Laurent
8d24fe235a Merge "AudioService: fix permission check." into lmp-mr1-dev 2014-12-19 17:11:28 +00:00
Oliver Woodman
c2597f0e09 am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 
automerge: 20e52c3

* commit '20e52c3453b2683cccfc4ac0841c9d6ef0796f88':
  MediaSessionLegacyHelper uses global Application context
 2014-12-19 11:49:15 +00:00
Oliver Woodman
20e52c3453 am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 
* commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5':
  MediaSessionLegacyHelper uses global Application context
 2014-12-19 11:47:38 +00:00
Oliver Woodman
69fd01d3e6 Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev 2014-12-19 11:37:04 +00:00
Eric Laurent
38edfda9bd AudioService: fix permission check. 
Clear caller identity before calling TelecomManager.isInCall().

Bug: 18702149.
Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
 2014-12-18 17:40:43 -08:00
Jean-Michel Trivi
9b5257c9c9 MediaSessionLegacyHelper uses global Application context 
MediaSessionLegacyHelper used a Context passed by an application
  which can cause a leak of Activity instances. Use the global
  Application context instead.
Also prevent crash if a null Context is supplied (method not
  documented as requesting a non-null Context).

Bug 18767503

Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
 2014-12-18 16:42:59 -08:00
John Spurlock
01a8d29e27 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
automerge: 09ab7d0

* commit '09ab7d0663210f7b87c830b4560474a05564c37a':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:27:39 +00:00
John Spurlock
09ab7d0663 am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate api." into lmp-mr1-dev 
* commit 'caba360367ea9900a48066f97f4b6e59877a9df6':
  Audio policy: Fix deprecated shouldVibrate api.
 2014-12-17 20:23:55 +00:00
John Spurlock
57627794b6 Audio policy: Fix deprecated shouldVibrate api. 
And apply zen mode immediately to avoid race conditions
in tests.

Bug: 18702149
Change-Id: Iad156a29b9e6a5998e7c2dafa8b79a71447066f9
 2014-12-17 12:34:00 -05:00
Nick Chalko
02ce449b70 Merge "Include documentation for a null surface in TvInputService.Session.onSetSurface." 2014-12-17 04:35:16 +00:00
Nick Chalko
922a6f3766 Include documentation for a null surface in TvInputService.Session.onSetSurface. 
Bug: 18718144
Change-Id: I359a918da4ceeb01e44b38e6e82a501c0360e681
 2014-12-16 18:58:14 -08:00
Ying Wang
4a3b5bdc7f am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
automerge: cd69b5a

* commit 'cd69b5a2de1bb130cdc7e8e1761409cd1f98f1c4':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:59:18 +00:00
Ying Wang
cd69b5a2de am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit '49b2f00acf8eca17bd6dbffc45a5bd1b4a2d525e':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 20:57:35 +00:00
Ying Wang
34db51cdd7 Cleanup Obsolete LOCAL_PRELINK_MODULE. 
Bug: 18675947
Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
 2014-12-16 12:45:49 -08:00
Jinsuk Kim
c45ea929bc am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
automerge: 584c3df

* commit '584c3dfb53f7a795627a4ea8082ff54e83e4336a':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:55:40 +00:00
Jinsuk Kim
584c3dfb53 am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 
* commit 'd8858fa91712b5e5d2a832e1993b6e265dafcf39':
  audioservice: Clear calling identity upon calling HdmiControlService
 2014-12-13 23:53:29 +00:00
Jinsuk Kim
a2bc055eeb Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 2014-12-13 23:41:48 +00:00
Chong Zhang
e079f8ee2d am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
automerge: d7383a8

* commit 'd7383a8f00b533d00dc48f7aca7ee89d1fc52a36':
  parse bitrate range for video/audio caps
 2014-12-12 21:07:38 +00:00
Chong Zhang
d7383a8f00 am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 
* commit 'd4bef185a5057904f0e230ac8a2c5866e590094f':
  parse bitrate range for video/audio caps
 2014-12-12 21:02:36 +00:00
Chong Zhang
bb177db1fe Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 2014-12-12 20:49:36 +00:00
Jeff Tinker
969ac0b2f3 Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest"" 2014-12-12 19:35:50 +00:00
Jeff Tinker
2888e90701 Revert "Fix Crash when sending null in HashMap to getKeyRequest" 
This reverts commit 5bec0266358f28a91b38f8aefbcb918219aa4ce9.

Change-Id: I78c2f04be03dbdf8da6ea1e1f600c7c12668e433
 2014-12-12 19:35:12 +00:00
Chong Zhang
216e11dcbb parse bitrate range for video/audio caps 
Bug: 18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
 2014-12-12 11:34:42 -08:00
Jinsuk Kim
48cbf292ba audioservice: Clear calling identity upon calling HdmiControlService 
This makes sure that accessing the HdmiControlService via audio service
should be possible without the system permission.

Bug: 18730526
Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
 2014-12-13 02:22:19 +09:00
Chih-hung Hsieh
17a0826e5d am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
automerge: d1aa67b

* commit 'd1aa67b8e19ae96bd2ae4e6719d13902a8b6d845':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:05:00 +00:00
Chih-hung Hsieh
d1aa67b8e1 am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:02:08 +00:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Eric Laurent
7a27bc3a76 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 21:57:35 +00:00
Michael Wright
18a635c2a1 am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 
* commit '584674c39dad11be182ea3763df557d35554157b':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-10 21:32:45 +00:00