337 Commits

Author SHA1 Message Date
Marco Nelissen
1851db6804 Always consider m4a files as audio, even when they contain a video track. 2009-09-28 09:03:33 -07:00
Marco Nelissen
aa50713649 am dba93b68: Merge change 27318 into eclair
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
  Check that playlist entries refer to a row in the audio table.
2009-09-27 19:50:49 -07:00
Android (Google) Code Review
dba93b6832 Merge change 27318 into eclair
* changes:
  Check that playlist entries refer to a row in the audio table.
2009-09-27 22:43:05 -04:00
Marco Nelissen
d4f3586c93 Check that playlist entries refer to a row in the audio table. 2009-09-27 15:06:03 -07:00
Ray Chen
1055e0d830 am cc96652c: Remove fflush when storing thumbanil to sdcard.
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
2009-09-27 14:03:32 -07:00
Ray Chen
cc96652c70 Remove fflush when storing thumbanil to sdcard. 2009-09-27 13:41:25 -07:00
Marco Nelissen
c46f886b63 am 0faa5c6c: Merge change 27271 into eclair
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
  Only scan windows media files when those codecs are enabled.
2009-09-27 12:24:17 -07:00
Marco Nelissen
0ddbc35dc4 Only scan windows media files when those codecs are enabled. 2009-09-27 11:25:49 -07:00
Ray Chen
d503453ca0 am 80d8ace4: Merge change 26997 into eclair
Merge commit '80d8ace484525f0272b8a56142ef838f5f4d38e4' into eclair-plus-aosp

* commit '80d8ace484525f0272b8a56142ef838f5f4d38e4':
  Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
2009-09-24 21:26:27 -07:00
Ray Chen
343449f018 Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail. 2009-09-24 20:22:37 -07:00
Ray Chen
94cdc3d0e2 am 830207ca: Merge change 25635 into eclair
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
2009-09-23 11:38:06 -07:00
Ray Chen
00c575a3fc Add new thumbnail API. 2009-09-23 11:23:45 -07:00
Chih-Chung Chang
1e577ced7d am 7b7029e0: Merge change 26236 into eclair
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.
2009-09-22 09:59:46 -07:00
Chih-Chung Chang
b8f4725d1b Make media scanner read the jpeg orientation tag. 2009-09-22 04:42:02 +08:00
Chih-Chung Chang
8701202834 am f22b7410: Merge change 25464 into eclair
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
2009-09-18 12:02:50 -07:00
Chih-Chung Chang
872a30ec72 Improve ExifInterface API.
Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
2009-09-18 11:30:47 -07:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Jean-Baptiste Queru
ea5f767246 Update documentation for getVideoWidth and getVideoHeight.
Ref: http://code.google.com/p/android/issues/detail?id=3024
2009-09-16 15:06:25 -07:00
Chih-Chung Chang
d5423a9fc8 am fc5f1026: Merge change 25291 into eclair
Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp

* commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70':
  Try to fix sdk build again.
2009-09-16 10:32:14 -07:00
Android (Google) Code Review
fc5f10265f Merge change 25291 into eclair
* changes:
  Try to fix sdk build again.
2009-09-16 13:23:35 -04:00
Chih-Chung Chang
8bc2495e5e am de88c515: Merge change 25286 into eclair
Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp

* commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df':
  Fix sdk build.
2009-09-16 10:22:56 -07:00
Chih-Chung Chang
9081aec61f Try to fix sdk build again. 2009-09-17 01:20:05 +08:00
Android (Google) Code Review
de88c515ce Merge change 25286 into eclair
* changes:
  Fix sdk build.
2009-09-16 13:15:45 -04:00
Chih-Chung Chang
7b886f9e8c Fix sdk build. 2009-09-17 01:09:08 +08:00
Chih-Chung Chang
53a673661c am d3ba4811: Merge change 25272 into eclair
Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
  Make ExifInterface public.
2009-09-16 09:19:41 -07:00
Android (Google) Code Review
d3ba4811d4 Merge change 25272 into eclair
* changes:
  Make ExifInterface public.
2009-09-16 12:12:03 -04:00
Jean-Michel Trivi
2edbd217af am b53eaac6: Merge change 25155 into eclair
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
2009-09-16 09:10:31 -07:00
Android (Google) Code Review
b53eaac659 Merge change 25155 into eclair
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
2009-09-16 12:07:37 -04:00
Chih-Chung Chang
017bb4ccf7 Make ExifInterface public. 2009-09-16 23:38:34 +08:00
Chih-Chung Chang
e1c64f8f14 am ccd064d4: Merge change 25255 into eclair
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
2009-09-16 05:21:54 -07:00
Chih-Chung Chang
700beb4846 Clean ExifInterface. Prepare to make it public.
Change-Id: Ibff719d02f525c1e8583d1892737224a0cc42c37
2009-09-16 20:03:48 +08:00
Jean-Michel Trivi
fccb25d207 Fix bug 2115258 where the AudioManager javadoc doesn't warn against
misuse of some of the methods that should only be used to implement
the Settings and Phone apps, and the audio service.
2009-09-15 16:13:59 -07:00
Nick Pelly
e7eb85cae0 am 005b228c: API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp

* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
  API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
2009-09-10 19:01:25 -07:00
Nick Pelly
005b228cdf API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
This is a large batch, and covers:

-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()

-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()

-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()

-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI

-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()

I deprecated BluetoothIntent and moved each intent into the class it relates
to.

Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
2009-09-10 18:52:21 -07:00
Eric Laurent
c6f6253ad2 am f63e3f3c: Merge change 24512 into eclair
Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 08:17:19 -07:00
Eric Laurent
dc1d17a1db Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
Add audio permission checks in setSpeakerphoneOn() and setBluetoothScoOn() methods.
2009-09-10 00:48:21 -07:00
James Stokebrand
7ff0d9a60a am 16b72bbb: Merge change 24391 into eclair
Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp

* commit '16b72bbbc985cba7c59f52bf6969b4015f185830':
  RIO-7461: Update media scanner to scan AAC files.
2009-09-09 14:50:19 -07:00
James Stokebrand
a79da2e9b4 RIO-7461: Update media scanner to scan AAC files.
(Change in frameworks/base git)
2009-09-09 11:22:21 -07:00
Eric Laurent
d3a31996e6 am db603b0b: Merge change 24114 into eclair
Merge commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d' into eclair-plus-aosp

* commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-08 23:07:51 -07:00
Eric Laurent
96c08a69ea Fix issue 1992233: DTMF tones on Sholes is really long.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
2009-09-08 22:56:07 -07:00
Jean-Baptiste Queru
be8e36e32b merge from donut 2009-09-03 15:19:21 -07:00
Marco Nelissen
5e52884107 am e1da8be5: Merge change 23835 into eclair
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp

* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
  When encountering a .nomedia file, notify the MediaScannerClient,
2009-09-03 12:29:51 -07:00
Android (Google) Code Review
e1da8be501 Merge change 23835 into eclair
* changes:
  When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
2009-09-03 12:27:26 -07:00
Marco Nelissen
8b04661700 When encountering a .nomedia file, notify the MediaScannerClient,
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
2009-09-03 11:22:28 -07:00
Eric Laurent
7838887af4 am cabd01f4: Merge change 23798 into eclair
Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp

* commit 'cabd01f42afd0661d6a29217c62353c2eae3149a':
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.
2009-09-03 08:02:46 -07:00
Eric Laurent
9d85d5adf9 Fix issue 2097083: STREAM_SYSTEM should be at max volume.
Changed default volume for STREAM_SYSTEM and STREAM_SYSTEM_ENFORCED to the maximum value.
2009-09-03 01:28:26 -07:00
Jean-Baptiste Queru
85a2c7f1ca merge from open-source master 2009-09-01 11:46:14 -07:00
Chih-Chung Chang
a7bdedabf4 Fix 2081525: NPE in MediaScannerService.
Handle the case where the datetime string in jpeg exif is not in the format we expect.

Change-Id: I5462052c3dd723d01bce45f4924137632d081400
2009-09-01 12:23:43 +08:00
Jean-Baptiste Queru
72b1f379d5 donut snapshot 2009-08-31 09:17:57 -07:00
Jaikumar Ganesh
78333dd750 Set Routing to A2DP only when state is Connected.
We were setting the routing to A2DP when the state was Connecting too.
This was incorrect and can cause problems. One such problem was when
handling an incoming connection we set the routing to A2DP before
authorization. And even if authorization succeeds we get out sync with
AVDTP command state.
2009-08-27 11:03:00 -07:00