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

10031 Commits

Author SHA1 Message Date
Wei Jia
92a1b8cab2 am 559f28ec: am d32df662: am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. 
* commit '559f28ec67636f7bed82550be7590db46b47f1d0':
  MediaPlayer: remove obsolete function setPlaybackRate from comments.
 2015-10-13 22:02:44 +00:00
Wei Jia
d32df6623e am de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments. 
* commit 'de612dc1d10d25e017ac911d0e7cca6709bdbb96':
  MediaPlayer: remove obsolete function setPlaybackRate from comments.
 2015-10-13 21:47:04 +00:00
Wei Jia
de612dc1d1 MediaPlayer: remove obsolete function setPlaybackRate from comments. 
Bug: 24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
(cherry picked from commit cd860ac06ca7a46e9638dd741ba731f066705eb5)
 2015-10-13 21:31:22 +00:00
Phil Burk
246b66cbcb am 1bc47a6e: am bfaa71bb: am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 
* commit '1bc47a6e7020799ae7eb5ee3e91bc452144a3d64':
  BluetoothMidiDevice: change write type to support JamStik
 2015-10-13 18:58:26 +00:00
Phil Burk
bfaa71bb31 am 8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 
* commit '8e82755dfdfee837cb73d3db3f6319301d2a5903':
  BluetoothMidiDevice: change write type to support JamStik
 2015-10-13 18:43:35 +00:00
Phil Burk
8e82755dfd Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev 2015-10-13 18:36:13 +00:00
Phil Burk
61cf82778f am 92ae0a54: am 7bbb6fed: am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService 
* commit '92ae0a5480f8ac2107688bf2f6bb58d49cb52bd1':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-10-13 18:21:44 +00:00
Phil Burk
7bbb6fedbc am 977fe03b: BLE-MIDI: change binding for BluetoothMidiService 
* commit '977fe03b36a7783f9cee8497efe550a69b128473':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-10-13 18:10:29 +00:00
Ronghua Wu
f807c4fc9e am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream 
* commit 'c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235':
  media: ignore null InputStream
 2015-10-13 15:50:57 +00:00
Ronghua Wu
57c332bd4a am c024de3c: media: ignore null InputStream 
* commit 'c024de3c946c18e8e4799eb8d372fdec3146f8cf':
  media: ignore null InputStream
 2015-10-13 15:40:48 +00:00
Phil Burk
977fe03b36 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>
(cherry picked from commit 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
 2015-10-13 15:40:03 +00:00
Ronghua Wu
c024de3c94 media: ignore null InputStream 
Bug: 22854896
Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4
 2015-10-13 15:29:42 +00:00
Eric Laurent
ac86c21c4c am 8738d736: am a14d1bd7: am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 
* commit '8738d736592554d9a814a3cbd676206992fd81a0':
  MidiBluetoothService: add new device to HashMap
 2015-10-13 01:41:30 +00:00
Eric Laurent
a14d1bd798 am c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 
* commit 'c1c462cbaa8b65c6240f947de503619482296222':
  MidiBluetoothService: add new device to HashMap
 2015-10-13 01:16:56 +00:00
Eric Laurent
c1c462cbaa Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev 2015-10-13 01:09:32 +00:00
Phil Burk
42fcca169c am ff1e8f7e: am 1b3eb741: am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 
* commit 'ff1e8f7eeeb037a296d1fe49600927b5665fe8b7':
  MidiManager: fix double BTLE callback
 2015-10-13 00:20:17 +00:00
Phil Burk
ae885d6520 am 69ddaafa: am 0a64b146: am e39def48: MidiService: update listener with current status when registered 
* commit '69ddaafac41a21b35b226ee22e189b9e7840e70f':
  MidiService: update listener with current status when registered
 2015-10-13 00:20:06 +00:00
Phil Burk
af3e489c1e 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>
(cherry picked from commit 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
 2015-10-12 23:29:46 +00:00
Phil Burk
1b3eb741b5 am ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 
* commit 'ca296978e7f2a1f70b8dca32b1db9372c2392458':
  MidiManager: fix double BTLE callback
 2015-10-12 22:04:43 +00:00
Phil Burk
ca296978e7 Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev 2015-10-12 22:01:03 +00:00
Phil Burk
0a64b146d0 am e39def48: MidiService: update listener with current status when registered 
* commit 'e39def480fd2d1bcc3a89751dd492d4634c38194':
  MidiService: update listener with current status when registered
 2015-10-12 21:35:12 +00:00
Phil Burk
7688911b9f 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>
(cherry picked from commit e5f722e55c5708c2b48b8c9688c135e451225032)
 2015-10-12 21:03:30 +00:00
Phil Burk
afa038c074 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>
(cherry picked from commit 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
 2015-10-12 21:01:35 +00:00
Phil Burk
e39def480f 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>
(cherry picked from commit b2355940e3e697deeecd1b6511cd5094f9dc553a)
 2015-10-12 20:59:57 +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
Chien-Yu Chen
d890f4f400 MediaActionSound: Fix video stop sound 
Bug: 24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
 2015-10-07 15:17:19 -07: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
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
Daniel Micay
76f6a86de2 constify JNINativeMethod function pointer tables 
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
 2015-09-22 17:10:35 -04: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
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
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
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
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
Eino-Ville Talvala
159a16ab79 am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit 'f21ecd037e7d17626416e3247b83ab93d81d2559':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:53:52 +00:00
Eino-Ville Talvala
09c62671e9 am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev 
* commit '242ff8a89d851cc5c53b11dadd871fa55e00fbb5':
  Camera: Fix framework bugs with DEPTH-only camera devices
 2015-08-12 20:12:35 +00:00
Eino-Ville Talvala
72064af7e7 Camera: Fix framework bugs with DEPTH-only camera devices 
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.

Bug: 20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
 2015-08-11 15:04:56 -07:00
Paul Mclean
8ec87bb167 am ba6fad74: am ac112990: am e6639066: am a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev 
* commit 'ba6fad7406fabef6d3fa94043d7f64732fd98726':
  Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.
 2015-08-10 14:16:52 +00:00
Paul Mclean
bb3228c2d9 am fa63af34: am c81abd9a: am 1d19dc58: am beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev 
* commit 'fa63af340a291532e50b86fd0f4bab3e3060ef36':
  Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."
 2015-08-10 14:16:46 +00:00