summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * Improve ExifInterface API.Chih-Chung Chang2009-09-182-94/+40
| | | | | | | | Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
* | merge from open-source masterJean-Baptiste Queru2009-09-161-4/+8
|\ \
| * | Update documentation for getVideoWidth and getVideoHeight.Jean-Baptiste Queru2009-09-161-4/+8
| | | | | | | | | | | | Ref: http://code.google.com/p/android/issues/detail?id=3024
| * | merge from donutJean-Baptiste Queru2009-09-032-1/+24
| |\ \
| | * | donut snapshotJean-Baptiste Queru2009-08-311-1/+4
| | | |
| | * | donut snapshotJean-Baptiste Queru2009-08-111-0/+20
| | | |
* | | | am fc5f1026: Merge change 25291 into eclairChih-Chung Chang2009-09-161-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp * commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70': Try to fix sdk build again.
| * | | Merge change 25291 into eclairAndroid (Google) Code Review2009-09-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Try to fix sdk build again.
| | * | | Try to fix sdk build again.Chih-Chung Chang2009-09-171-1/+1
| | | | |
* | | | | am de88c515: Merge change 25286 into eclairChih-Chung Chang2009-09-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp * commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df': Fix sdk build.
| * | | | Merge change 25286 into eclairAndroid (Google) Code Review2009-09-161-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * changes: Fix sdk build.
| | * | | Fix sdk build.Chih-Chung Chang2009-09-171-1/+1
| | | | |
* | | | | am d3ba4811: Merge change 25272 into eclairChih-Chung Chang2009-09-161-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp * commit 'd3ba4811d48e01e85b4faa57da159471022e6daa': Make ExifInterface public.
| * | | | Merge change 25272 into eclairAndroid (Google) Code Review2009-09-161-1/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * changes: Make ExifInterface public.
| | * | | Make ExifInterface public.Chih-Chung Chang2009-09-161-1/+0
| | | | |
* | | | | am b53eaac6: Merge change 25155 into eclairJean-Michel Trivi2009-09-161-0/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp * commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8': Fix bug 2115258 where the AudioManager javadoc doesn't warn against
| * | | | Merge change 25155 into eclairAndroid (Google) Code Review2009-09-161-0/+31
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 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.
| | * | | Fix bug 2115258 where the AudioManager javadoc doesn't warn againstJean-Michel Trivi2009-09-151-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
* | | | | am ccd064d4: Merge change 25255 into eclairChih-Chung Chang2009-09-162-221/+161
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp * commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1': Clean ExifInterface. Prepare to make it public.
| * | | | Clean ExifInterface. Prepare to make it public.Chih-Chung Chang2009-09-162-221/+161
| |/ / / | | | | | | | | | | | | Change-Id: Ibff719d02f525c1e8583d1892737224a0cc42c37
* | | | am 005b228c: API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.Nick Pelly2009-09-101-16/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp * commit '005b228cdfb369d9b3b325884c0337ba5968bf8c': API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
| * | | API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.Nick Pelly2009-09-101-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am f63e3f3c: Merge change 24512 into eclairEric Laurent2009-09-101-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp * commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79': Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
| * | | Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.Eric Laurent2009-09-101-0/+6
| | | | | | | | | | | | | | | | Add audio permission checks in setSpeakerphoneOn() and setBluetoothScoOn() methods.
* | | | am 16b72bbb: Merge change 24391 into eclairJames Stokebrand2009-09-091-10/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp * commit '16b72bbbc985cba7c59f52bf6969b4015f185830': RIO-7461: Update media scanner to scan AAC files.
| * | | RIO-7461: Update media scanner to scan AAC files.James Stokebrand2009-09-091-10/+17
| | | | | | | | | | | | | | | | (Change in frameworks/base git)
* | | | am db603b0b: Merge change 24114 into eclairEric Laurent2009-09-081-2/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d' into eclair-plus-aosp * commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d': Fix issue 1992233: DTMF tones on Sholes is really long.
| * | | Fix issue 1992233: DTMF tones on Sholes is really long.Eric Laurent2009-09-081-2/+13
| | | | | | | | | | | | | | | | | | | | 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.
* | | | am e1da8be5: Merge change 23835 into eclairMarco Nelissen2009-09-032-1/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp * commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9': When encountering a .nomedia file, notify the MediaScannerClient,
| * | | Merge change 23835 into eclairAndroid (Google) Code Review2009-09-032-1/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * 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.
| | * | | When encountering a .nomedia file, notify the MediaScannerClient,Marco Nelissen2009-09-032-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | am cabd01f4: Merge change 23798 into eclairEric Laurent2009-09-031-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp * commit 'cabd01f42afd0661d6a29217c62353c2eae3149a': Fix issue 2097083: STREAM_SYSTEM should be at max volume.
| * | | | Fix issue 2097083: STREAM_SYSTEM should be at max volume.Eric Laurent2009-09-031-2/+2
| |/ / / | | | | | | | | | | | | Changed default volume for STREAM_SYSTEM and STREAM_SYSTEM_ENFORCED to the maximum value.
* | | | merge from open-source masterJean-Baptiste Queru2009-09-011-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Documentation: Clarify that a FileDescriptor must be seekableKenny Root2009-08-241-1/+2
| |/ | | | | | | | | | | In MediaPlayer, methods with an offset specified must be passed a FileDescriptor that is seekable. This change notes that in the JavaDoc.
| * donut snapshotJean-Baptiste Queru2009-07-311-0/+1
| |
| * donut snapshotJean-Baptiste Queru2009-07-295-126/+592
| |
| * donut snapshotJean-Baptiste Queru2009-07-218-281/+959
| |
| * donut snapshotJean-Baptiste Queru2009-05-2010-183/+660
| |
| * AI 146667: Add advice in MediaRecorder Java docs about using MPEG-4 ↵Dave Sparks2009-04-161-0/+4
| | | | | | | | | | | | | | | | container format BUG=1753020 Automated import of CL 146667
| * AI 146654: Add java docs for SoundPoolDave Sparks2009-04-161-1/+189
| | | | | | | | | | | | BUG=1795461 Automated import of CL 146654
| * AI 145383: API review: clean up a bunch of @hides that have been pending API ↵Dianne Hackborn2009-04-091-1/+0
| | | | | | | | | | | | | | | | | | review. Either expose them, or official hide them with an explanation for why. BUG=1779439 Automated import of CL 145383
| * Automated import from //branches/cupcake/...@142374,142374Jean-Michel Trivi2009-03-241-5/+21
| |
| * auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-194-131/+129
| |
* | Fix 2081525: NPE in MediaScannerService.Chih-Chung Chang2009-09-011-0/+1
| | | | | | | | | | | | Handle the case where the datetime string in jpeg exif is not in the format we expect. Change-Id: I5462052c3dd723d01bce45f4924137632d081400
* | Set Routing to A2DP only when state is Connected.Jaikumar Ganesh2009-08-271-1/+2
| | | | | | | | | | | | | | | | 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.
* | Fix issue 2076322: AudioService, too many stream volume steps.Eric Laurent2009-08-261-10/+10
| | | | | | | | MAX_STREAM_VOLUME[] now contains the maximum valid index instead of the number of indexes for all stream types.
* | Fix build.Dianne Hackborn2009-08-241-1/+1
| | | | | | | | Change-Id: I7a21bc2151fb2a9a1135f676b563f40609bc997b
* | I am getting tired of the java doc warnings, so fix them.Dianne Hackborn2009-08-244-11/+19
| | | | | | | | Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
* | Fix AudioService on HFP power off due to new Bluetooth API.Nick Pelly2009-08-191-14/+19
| | | | | | | | | | HEADSET_STATE_CHANGED_ACTION contains a null BluetoothDevice when the HFP disconnects.