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

4216 Commits

Author SHA1 Message Date
Hemal Patel
7f21500b1c Merge "Docs: Fixed a typo" into mnc-io-docs 
am: 31707f0185

* commit '31707f01851ab18ab7b60d8cd8a825b07e83e840':
  Docs: Fixed a typo

Change-Id: Icdd5d354cedea96a70d74c0e63604e1c69eae370
 2016-05-21 00:58:14 +00:00
Hemal Patel
b40e1aa065 Docs: Fixed a typo 
Bug: 27583289
Change-Id: Ice0208182d98bb9e55343a915907c2b86a0bba65
 2016-05-19 15:36:09 -07:00
Glenn Kasten
fad0efcdb9 Update MIDI package summary am: 15a9a35bee 
am: c1b551aba6

* commit 'c1b551aba6f760ac41bcaf4391c1ff861803de27':
  Update MIDI package summary

Change-Id: Ic7a9920dc3f4a70f5f4eb718bc9f2dd00c1bbb7c
 2016-05-06 06:07:28 +00:00
Glenn Kasten
15a9a35bee Update MIDI package summary 
Bug: 28625060
Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324
(cherry picked from commit 9a279ef267f194dd3f0b777da5a219b6ef04abac)
 2016-05-06 02:03:22 +00:00
Trevor Johns
a5060ee80d Merge branch 'mnc-mr-docs' into mnc-ub-dev 
Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	docs/html-intl/intl/es/index.jd
	docs/html-intl/intl/es/preview/download.jd
	docs/html-intl/intl/es/preview/index.jd
	docs/html-intl/intl/ja/index.jd
	docs/html-intl/intl/ja/preview/download.jd
	docs/html-intl/intl/ja/preview/index.jd
	docs/html-intl/intl/ko/index.jd
	docs/html-intl/intl/ko/preview/download.jd
	docs/html-intl/intl/ko/preview/index.jd
	docs/html-intl/intl/pt-br/index.jd
	docs/html-intl/intl/pt-br/preview/download.jd
	docs/html-intl/intl/pt-br/preview/index.jd
	docs/html-intl/intl/ru/index.jd
	docs/html-intl/intl/ru/preview/download.jd
	docs/html-intl/intl/ru/preview/index.jd
	docs/html-intl/intl/zh-cn/index.jd
	docs/html-intl/intl/zh-cn/preview/download.jd
	docs/html-intl/intl/zh-cn/preview/index.jd
	docs/html-intl/intl/zh-tw/index.jd
	docs/html-intl/intl/zh-tw/preview/download.jd
	docs/html-intl/intl/zh-tw/preview/index.jd
	docs/html/guide/topics/manifest/compatible-screens-element.jd
	docs/html/guide/topics/manifest/uses-feature-element.jd
	docs/html/preview/download.jd
	docs/html/preview/features/runtime-permissions.jd
	docs/html/sdk/index.jd
	docs/html/tools/revisions/studio.jd
	docs/html/tools/sdk/eclipse-adt.jd
	docs/html/tools/support-library/features.jd
	telephony/java/android/telephony/TelephonyManager.java

Bug: 28000173
Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94
 2016-04-05 20:32:07 -07: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
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
Glenn Kasten
54af8573a8 Merge "Update AudioManager.getProperty documentation" into mnc-docs 2015-11-04 19:18:51 +00:00
Glenn Kasten
ea79455d91 Update AudioManager.getProperty documentation 
Change-Id: I004bfdbbac9b0897931fa206bff865bdb600ebf6
(cherry picked from commit 0b986af895ac42e4ad46919cd6c59fcfce443cdb)
 2015-11-02 19:55:59 +00:00
Glenn Kasten
ff3761cfe6 Explain ENCODING_PCM_FLOAT 
Change-Id: Icf680f65f07023ca6e416a1ef6067132daf607b9
(cherry picked from commit a217f8f9ca270d0dac299131085ccbdeb05384d8)
 2015-11-02 19:09:35 +00:00
Phil Burk
2dc7685cc3 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 20:24:41 +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
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
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
Wei Jia
10594aa926 MediaPlayer: remove obsolete function setPlaybackRate from comments. 
Bug: 24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
(cherry picked from commit cd860ac06ca7a46e9638dd741ba731f066705eb5)
 2015-10-12 22:51:30 +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
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
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
Glenn Kasten
f9a799afab Use correct frequency range for near ultrasound 
Bug: 21072209
Change-Id: I892fe020fd8f6787247f1553afaf1c9376dfc263
 2015-09-25 14:43:21 -07: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
fe8b2477d2 Fix AudioAttributes.usageToString() string return values 
Change-Id: I75642d043d647c921259dad20df504dd2e551644
 2015-08-25 11:30:51 -07:00
Phil Burk
191f23a48d MIDI docs: fix buffer allocation 
Also describe NoteOn more clearly.

Bug: 23303608
Change-Id: I35f88022c854c2eb16ec606e58f28e06c52d18b7
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit bda0caf07b786633381a029f782b9d2e1caa8a3f)
 2015-08-21 23:27:33 +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
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
1135457a3d Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API. 
Bug: 22729461
Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
 2015-08-07 14:45:24 -06:00
Paul Mclean
5fa8939d6f Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." 
This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523.

Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
 2015-08-07 12:57:55 -06:00
Wei Jia
a89e9f6d32 Merge "MediaSync: fix API comments." into mnc-dev 2015-08-06 21:31:22 +00:00
Wei Jia
5d177fff2f MediaSync: fix API comments. 
Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
 2015-08-06 12:51:36 -07:00
Paul Mclean
af7748efb6 Merge "Consider channel index masks when calculating channel counts." into mnc-dev 2015-08-06 18:59:06 +00:00
Paul Mclean
c770b7a537 Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 2015-08-06 18:58:33 +00:00
Paul McLean
8b2562b14c Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test. 
Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
 2015-08-06 10:03:13 -06:00
Paul Mclean
8eaf18b0ab Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev 2015-08-05 20:50:29 +00:00
Paul McLean
22cfec3cb8 Documenting behavior of returning a 0-length array for formats, 
channels, rates queries for analog devices.

Bug: 22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
 2015-08-05 14:06:28 -06:00
Phil Burk
881cd15519 Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 2015-08-05 19:43:21 +00:00
Paul McLean
3115960bde Consider channel index masks when calculating channel counts. 
Bug: 22874806
Change-Id: I04b74f5939bb81350d9e37b9629f8bbc242bffe7
 2015-08-05 09:03:51 -06:00
Phil Burk
a95faf78bf MidiManager: use ConcurrentHashMap 
So that adding and removing device listeners is thread-safe.

Bug: 22909752
Change-Id: I1369ab53c865b54e6e5eb8ea3e8d437fdd1d7197
Signed-off-by: Phil Burk <philburk@google.com>
 2015-08-04 15:38:55 -07:00
Jean-Michel Trivi
fc5a4bf0e1 Merge "AudioService: check for audio device connection success" into mnc-dev 2015-08-04 20:45:18 +00:00
Jean-Michel Trivi
6d00e41145 AudioService: check for audio device connection success 
When connecting/disconnecting and audio device, AudioService
  was assuming that the call was always successful through
  AudioSystem.setDeviceConnectionState(). In the case of the
  connection of a wired headset (mic + headphones), this also
  causes A2DP to not be used for media playback.
The connection can fail if the audio device being connected
  is not supported by the platform. But if this failure is
  not taken into account for DEVICE_OUT_WIRED_HEADSET or
  HEADPHONES, A2DP would still be avoided even when an A2DP
  device reconnects at boot.
The fix consists in executing the connection logic only when
  the connection was deemed successful. Nothing is altered
  on the disconnection code path, or the direct connection
  of A2DP.
The javadoc is updated in AudioSystem to indicate the return
  codes to take into account in setDeviceConnectionState().

Bug 22511833

Change-Id: I22f0d2c7d4ab4fb9ee1be2f248907f721596a16f
 2015-08-03 17:26:01 -07:00
Jeff Sharkey
3ba2bfa7b2 Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 2015-08-03 20:54:32 +00:00
Jeff Sharkey
449e5fd5f8 Expand ringtone titles to support OGG and FLAC. 
These file types don't have "audio/" MIME type, so check for those
MIME types explicitly.

Bug: 22803550
Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
 2015-08-03 13:51:13 -07:00