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

10041 Commits

Author SHA1 Message Date
Daichi Hirono
85f7078f8b Add constans for MTP event codes. 
BUG=23368533

Change-Id: I922eb9a26812a44780ba81b8a391be45852cad08
 2015-10-13 12:49:16 -07:00
Wonsik Kim
8399506317 Implement pause/resume functionality to MediaRecorder 
Bug: 20092236
Change-Id: I02b9f11e210d15f6efe52d44f64ad8a3bc566d96
 2015-10-08 08:40:34 +00:00
Chien-Yu Chen
29f0c598c4 am c1a13439: am d07d0071: am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 
* commit 'c1a13439334c173802d582e6fefada38e0d165f5':
  MediaActionSound: Fix video stop sound
 2015-10-07 23:26:36 +00:00
Chien-Yu Chen
c1a1343933 am d07d0071: am 02e4400c: am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 
* commit 'd07d007161e2f64e88eba9f78778ab63b3dd6ab9':
  MediaActionSound: Fix video stop sound
 2015-10-07 23:22:24 +00:00
Chien-Yu Chen
02e4400cc7 am ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev 
* commit 'ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
  MediaActionSound: Fix video stop sound
 2015-10-07 23:11:20 +00:00
Wei Jia
cd860ac06c MediaPlayer: remove obsolete function setPlaybackRate from comments. 
Bug: 24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
 2015-10-07 15:38:12 -07:00
Chien-Yu Chen
d890f4f400 MediaActionSound: Fix video stop sound 
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
 2015-10-07 15:17:19 -07:00
Adam Lesinski
1619ed4706 Fix security issues when using Parcel.setDataPosition() with untrusted input 
When seeking forward in the Parcel, adding the extracted size to the Parcel.dataPosition()
can result in an overflow. Guard against this.

Bug:23909429
Change-Id: If37cdebbf05a92810300363d1a6ecd8b42b6da26
 2015-10-01 20:48:23 +00:00
Neil Fuller
2bf03c9681 am 29a631e1: am 08aa3309: am ead371de: Merge "Remove use of \'_\' variable name" 
* commit '29a631e14703d1705609da27650ecbcf766035a1':
  Remove use of '_' variable name
 2015-09-30 20:05:38 +00:00
Neil Fuller
29a631e147 am 08aa3309: am ead371de: Merge "Remove use of \'_\' variable name" 
* commit '08aa3309790672ccc4c9b899fdf4e6162cfbc37a':
  Remove use of '_' variable name
 2015-09-30 14:00:17 +00:00
Neil Fuller
08aa330979 am ead371de: Merge "Remove use of \'_\' variable name" 
* commit 'ead371ded06fcf14b7af86a92100b0c3c92fd320':
  Remove use of '_' variable name
 2015-09-30 13:54:53 +00:00
Neil Fuller
ead371ded0 Merge "Remove use of '_' variable name" 2015-09-30 13:48:16 +00:00
Neil Fuller
00d6b601e6 Remove use of '_' variable name 
'_' may become invalid in future versions of the Java language
and generates warnings in OpenJDK 8.

Bug: 24494019

Change-Id: Id77c8f003b0fdf295191d2d8dbd5b0b0edde2b44
 2015-09-29 15:22:40 +01:00
Daichi Hirono
aeaa12c34e Merge "Add readEvent method to MtpDevice." 2015-09-28 12:40:05 +00:00
Daichi Hirono
0b494663a4 Add readEvent method to MtpDevice. 
BUG=23368533

Change-Id: Ibefff559fa7dd0bee17e2812bd7cdd129108d804
 2015-09-25 14:54:17 +09:00
Elliott Hughes
434a481b21 am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master 
* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
  constify JNINativeMethod function pointer tables
 2015-09-24 17:23:00 +00:00
Elliott Hughes
ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master 
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables
 2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master 
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
 2015-09-24 10:01:32 -07:00
Phil Burk
100df4788d Merge "MidiService: update listener with current status when registered" 2015-09-22 22:15:14 +00:00
Phil Burk
f7781b913b Merge "BluetoothMidiDevice: change write type to support JamStik" 2015-09-22 22:11:53 +00:00
Daniel Micay
76f6a86de2 constify JNINativeMethod function pointer tables 
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
 2015-09-22 17:10:35 -04:00
Phil Burk
b2355940e3 MidiService: update listener with current status when registered 
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
 2015-09-22 12:45:55 -07:00
Phil Burk
95129f50c6 BluetoothMidiDevice: change write type to support JamStik 
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.

Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
 2015-09-22 12:30:52 -07:00
Marco Nelissen
2f01c806e0 Stop SoundPool on error instead of continuing 
otherwise we might end up looping forever.

Change-Id: I86e33de5387e3acd148d9bba83d18224bb79fd95
 2015-09-15 12:49:07 -07:00
Aaron Vaage
56abfa5ce6 Merge "Resolving createByteBufferFromABuffer null input" 2015-09-08 21:33:29 +00:00
Phil Burk
7cd06c0b9e BLE-MIDI: change binding for BluetoothMidiService 
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
 2015-09-08 13:48:16 -07:00
Aaron Vaage
e5b641e6ef Resolving createByteBufferFromABuffer null input 
It was found that createByteBufferFromABuffer was recieving a NULL buffer in bug
22726278. Based on returning NULL when buffer->base() == NULL, returning NULL
when buffer == NULL. This does not fix bug 22726278 - but address a problem found
while looking into it.

Bug: 22726278
Change-Id: I933b6a4a535d803576a4cdd7a1ffaf4a428c3201
 2015-09-04 10:16:57 -07:00
Tomasz Mikolajewski
bb430fa930 Remove MtpDocument. 
Change-Id: Ie4b0e55f6ff2c7b323cf767a5ed3d3c61c12734d
 2015-09-01 09:25:30 +09:00
Tomasz Mikolajewski
b80a3cfd05 Add support for uploading files via MTP. 
Change-Id: Id1811ab70cb28be471e0a99999e9ad5380deac49
 2015-08-28 10:50:23 +09:00
Eric Laurent
4803708270 am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp() 
* commit '155c1ad113dd6ec6bab9fdcb0934db255603237a':
  AudioTrack: error reporting for getTimestamp()
 2015-08-27 19:22:22 +00:00
Eric Laurent
38f6f487b2 am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp() 
* commit 'aef51d09ef33eb3f03789c71edc25a7b103728d1':
  AudioTrack: error reporting for getTimestamp()
 2015-08-27 18:33:41 +00:00
Eric Laurent
4a8034caea AudioTrack: error reporting for getTimestamp() 
Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
 2015-08-27 17:52:38 +00:00
Phil Burk
3b3b22140e Merge "MidiBluetoothService: add new device to HashMap" 2015-08-26 18:50:14 +00:00
Phil Burk
e5f722e55c MidiBluetoothService: add new device to HashMap 
The HashMap is being used but devices never added to the map.

Bug: 23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-25 23:15:17 +00:00
Phil Burk
0ca998d79f MidiManager: fix double BTLE callback 
Stop openBluetoothDevice() from calling its callback twice.

Bug: 23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-25 23:14:15 +00:00
Zach Johnson
fe12a31cbc am df98fdaf: am 5d636c8c: Merge "Fix AudioAttributes.usageToString() string return values" into cw-e-dev 
* commit 'df98fdaf2c6165dcd8bfb2ba8fd3e89d729af256':
  Fix AudioAttributes.usageToString() string return values
 2015-08-25 19:32:23 +00:00
Zach Johnson
fe8b2477d2 Fix AudioAttributes.usageToString() string return values 
Change-Id: I75642d043d647c921259dad20df504dd2e551644
 2015-08-25 11:30:51 -07:00
Zach Johnson
45228bf3e0 Fix AudioAttributes.usageToString() string return values 
Change-Id: I75642d043d647c921259dad20df504dd2e551644
 2015-08-25 00:35:27 +00:00
Eric Laurent
61483d885a Merge "AudioTrack: error reporting for getTimestamp()" 2015-08-24 17:06:32 +00:00
Glenn Kasten
d62b9fc172 am 6136d306: am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '6136d30641aae3f679aa768b7e8ed6d1025510cf':
  MIDI docs: fix buffer allocation
 2015-08-22 01:38:12 +00:00
Eric Laurent
4e1ccd370f AudioTrack: error reporting for getTimestamp() 
Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
 2015-08-21 18:11:21 -07:00
Glenn Kasten
6136d30641 am 0035f2ce: am 403eaaf2: am c445438e: am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit '0035f2ceba00d1ba52b34b94e491eb6899060902':
  MIDI docs: fix buffer allocation
 2015-08-22 00:41:20 +00:00
Glenn Kasten
b2c6413c70 am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev 
* commit 'd9eef3478ae2bea4d943082aaefd1a4a91a30600':
  MIDI docs: fix buffer allocation
 2015-08-21 23:31:48 +00:00
Tomasz Mikolajewski
87763e6a91 Wire uploading to MtpDocumentsProvider. 
This patch does not yet allow to upload files, but uploading (creating)
directories already works.

Bug: 22545670
Change-Id: If4d5a53aa26f791475bb1a783e0ac9540d6760c1
 2015-08-20 11:34:44 +09:00
Phil Burk
bda0caf07b MIDI docs: fix buffer allocation 
Also describe NoteOn more clearly.

Bug: 23303608
Change-Id: I35f88022c854c2eb16ec606e58f28e06c52d18b7
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-19 18:36:20 -07:00
Tomasz Mikolajewski
4a86977e3c Merge "Add API for uploading files to MTP devices." 2015-08-17 14:33:00 +00:00
Eino-Ville Talvala
db86989dfc am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 03:03:29 +00:00
Eino-Ville Talvala
3a94b2d22e am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:55:33 +00:00
Eino-Ville Talvala
c964884eb7 am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-15 00:54:18 +00:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras. 
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
 2015-08-14 14:52:57 -07:00