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

10084 Commits

Author SHA1 Message Date
Ian Pedowitz
c9711721f3 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6 am: 44df02fc17 
am: 4ab979e6cc

* commit '4ab979e6cc0c63b97b79441b478e30c8febdc3ee':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 22:13:11 +00:00
Ian Pedowitz
4ab979e6cc Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev am: 88d4cc1001 am: 4f22c781b6 
am: 44df02fc17

* commit '44df02fc17bb0f3f1c445166c6cbd7f4d92b4eb6':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 22:04:28 +00:00
Ian Pedowitz
4f22c781b6 Merge "Revert "Fix race condition when setting default ringtones"" into mnc-dr-dev 
am: 88d4cc1001

* commit '88d4cc100175a54be3b7d560a91c38197f59f4bf':
  Revert "Fix race condition when setting default ringtones"
 2015-11-11 21:46:06 +00:00
Ian Pedowitz
05ce0c6bb0 Revert "Fix race condition when setting default ringtones" 
This reverts commit f2cb9341ff864e6d9cc6797857665b2281643a74.

Change-Id: I151972052aea47bf8c6823eb8bbf8161c5a7a4f0
 2015-11-11 21:38:04 +00:00
Jeff Tinker
807ea28eef Merge "Improve MediaCodec.CryptoException log messages" 2015-11-10 21:16:44 +00:00
Jeff Tinker
3ccb34d707 Improve MediaCodec.CryptoException log messages 
The message being logged is "Unknown error" even for
known error types.  This change provides more descriptive
error strings, for the case when the message isn't
explicitly provided by the DRM plugin.

Change-Id: Ic86478d7685cd33e21ecd2f875ef7dbed351e52e
related-to-bug: 25477595
 2015-11-09 17:31:05 -08:00
Jeff Tinker
b801f7b891 Merge "Extend MediaCodec.CryptoInfo to support Sample AES" 2015-11-09 23:11:21 +00:00
Marco Nelissen
ff5fe15d34 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90 am: 8fb0121cb6 
am: b67ae42ad0

* commit 'b67ae42ad07ed6a5b4927c41089076e6eafd6949':
  Fix race condition when setting default ringtones
 2015-11-09 21:46:06 +00:00
Marco Nelissen
b67ae42ad0 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90 
am: 8fb0121cb6

* commit '8fb0121cb60ddf54a22bff088670594f422edea9':
  Fix race condition when setting default ringtones
 2015-11-09 21:39:41 +00:00
Marco Nelissen
02bf433f90 Merge "Fix race condition when setting default ringtones" into mnc-dr-dev 
am: 83702ec3ed

* commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff':
  Fix race condition when setting default ringtones
 2015-11-09 21:28:32 +00:00
Marco Nelissen
f2cb9341ff Fix race condition when setting default ringtones 
If the device was powered off during first boot, after media scanner
inserted some entries but before the default ringtone settings were
set (or committed to disk), the default settings would not be set
on subsequent boots.

Bug: 18625739
Bug: 22349910
Change-Id: Iff07da59a9c6d53bf2950bd107ee74d02b7f48d6
 2015-11-06 10:50:47 -08:00
Jeff Tinker
45eb9b39f4 Extend MediaCodec.CryptoInfo to support Sample AES 
API changes only, implementation to follow

b/23719082

Change-Id: I7cbd0cdf03a8b5b67628cde200c3df6a9253fdbf
 2015-11-05 14:21:25 -08:00
Glenn Kasten
1662ccc975 Merge "Update AudioManager.getProperty documentation" 2015-11-02 19:55:37 +00:00
Glenn Kasten
0b986af895 Update AudioManager.getProperty documentation 
Change-Id: I004bfdbbac9b0897931fa206bff865bdb600ebf6
 2015-10-30 18:27:14 -07:00
Glenn Kasten
a217f8f9ca Explain ENCODING_PCM_FLOAT 
Change-Id: Icf680f65f07023ca6e416a1ef6067132daf607b9
 2015-10-30 18:27:02 -07:00
Dongwon Kang
082aed1ab4 MediaBrowser: Handle onServiceConnected/Disconnected in the given thread 
The class assumes that the member variables are accessed in the same thread
when the class was created, but onServiceConnected/Disconnected is called
in the main thread according to the documentation.

Bug: 25307613
Change-Id: I86b63cc45fbc6995cedce39f5c151e99f76172d0
 2015-10-29 00:35:01 +00:00
Dongwon Kang
ec7bf63d59 MediaBrowser: Fix a wrong ISE message 
Change-Id: Ic0b376bdc52dd01d9d687468104ffe6a797adb30
 2015-10-28 00:57:47 +00:00
Phil Burk
2cce579ed2 Merge "MIDI docs: add missing bracket" 2015-10-26 20:26:11 +00:00
Phil Burk
908d5bc82e MIDI docs: add missing bracket 
The example code for openDevice() was missing a close bracket.

Bug: 25283941
Change-Id: I8fac6a6dee2393125ad4e057cb857fe21e43b491
Signed-off-by: Phil Burk <philburk@google.com>
 2015-10-26 11:41:11 -07:00
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
Daichi Hirono
85f7078f8b Add constans for MTP event codes. 
BUG=23368533

Change-Id: I922eb9a26812a44780ba81b8a391be45852cad08
 2015-10-13 12:49:16 -07: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
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