Scott Main
6b6bc26e59
Merge branch 'readonly-p4-master'
2009-04-21 14:30:39 -07:00
Scott Main
98c5a2daec
Merge branch 'readonly-p4-donut' into donut
2009-04-21 14:28:13 -07:00
Dirk Dougherty
896ef7b1cf
Merge branch 'readonly-p4-master'
2009-04-21 14:18:43 -07:00
Dirk Dougherty
0bfa1bf0c6
Merge branch 'readonly-p4-donut' into donut
2009-04-21 14:15:40 -07:00
Android (Google) Code Review
e2ac5fddd8
Merge change 352 into donut
...
* changes:
Remove dangling media recorder client reference when setCamera() is used.
2009-04-21 13:20:07 -07:00
Android (Google) Code Review
7e6a65edbb
Merge change 368 into donut
...
* changes:
location: Add some null pointer checks.
2009-04-21 12:44:57 -07:00
Andy Stadler
e40e6bc039
Merge branch 'readonly-p4-master'
2009-04-21 11:58:49 -07:00
Andy Stadler
55cf040e52
Merge branch 'readonly-p4-donut' into donut
2009-04-21 11:56:08 -07:00
Andy Stadler
218eeb96ed
Merge branch 'readonly-p4-master'
2009-04-21 11:55:49 -07:00
Andy Stadler
09acf6e6c7
Merge branch 'readonly-p4-donut' into donut
2009-04-21 11:53:07 -07:00
Android (Google) Code Review
3912875a1c
Merge change 360 into donut
...
* changes:
location: Location Manager wakelock cleanup, phase 1
2009-04-21 09:40:38 -07:00
Android (Google) Code Review
f22aa61a51
Merge change 336 into donut
...
* changes:
Ensure ongoing progress updates after using the scroll ball to adjust position.
2009-04-21 08:18:50 -07:00
Eric Laurent
4dd495b72c
Fix issue 1745312: Various cleanups in media framework
...
AudioTrack, AudioRecord:
- remove useless mAudioFlinger member of AudioTrack and AudioRecord.
- signal cblk.cv condition in stop() method to speed up stop completion.
- extend wait condition timeout in obtainBuffer() when waitCount is -1 to avoid waking up callback thread unnecessarily
AudioFlinger:
- remove some warnings in AudioFlinger.cpp.
- remove function AudioFlinger::MixerThread::removetrack_l() as its content is never executed.
- remove useless call to setMasterVolume in AudioFlinger::handleForcedSpeakerRoute().
- Offset VOICE_CALL stream volume to reflect actual volume that is never 0 in hardware (this fix has been made in the open source): 0.01 + v * 0.99.
AudioSystem.java:
- correct typo in comment
IAudioflinger, IAudioFlingerClient:
- make AudioFlinger binder interfaces used for callbacks ONEWAY.
AudioHardwareInterface:
- correct routeStrings[] table in AudioHardwareInteface.cpp
2009-04-21 07:56:33 -07:00
Dirk Dougherty
2d06d8af61
Merge branch 'readonly-p4-donut' into donut
2009-04-21 01:06:57 -07:00
Dirk Dougherty
2d8d226165
Merge branch 'readonly-p4-donut' into donut
2009-04-21 01:01:28 -07:00
Dirk Dougherty
2da23a2ab2
Merge branch 'readonly-p4-master'
2009-04-20 21:58:07 -07:00
James Dong
0ae13e36e1
Remove dangling media recorder client reference when setCamera() is used.
2009-04-20 19:35:28 -07:00
Android (Google) Code Review
4473649451
Merge change 339
...
* changes:
adding concept of features to accounts
2009-04-20 18:21:44 -07:00
Dirk Dougherty
e9b75aad41
Merge branch 'readonly-p4-master'
2009-04-20 17:58:05 -07:00
Android (Google) Code Review
1739a1f600
Merge change 326
...
* changes:
modify wait mechanism so that it checks whether activity has already finished or not first
2009-04-20 16:54:55 -07:00
Jean-Michel Trivi
4f5ecb5b29
Merge branch 'readonly-p4-master'
2009-04-20 16:33:36 -07:00
Jean-Michel Trivi
ecb28b3021
Merge branch 'readonly-p4-donut' into donut
2009-04-20 16:31:35 -07:00
Marco Nelissen
afc2553342
Merge branch 'readonly-p4-master'
2009-04-20 16:17:25 -07:00
Marco Nelissen
4ab7abd796
Merge branch 'readonly-p4-master'
2009-04-20 12:49:56 -07:00
Marco Nelissen
760b67af39
AI 146964: tabs -> spaces
...
Automated import of CL 146964
2009-04-20 12:48:39 -07:00
Jean-Michel Trivi
adbb2fa003
Merge branch 'readonly-p4-master'
2009-04-20 10:48:16 -07:00
Jean-Michel Trivi
f1542eacc0
Merge branch 'readonly-p4-donut' into donut
2009-04-20 10:47:31 -07:00
Android (Google) Code Review
0cd2f4c878
Merge change 261
...
* changes:
Enable Application Caches.
2009-04-20 10:04:34 -07:00
Dmitry Shmidt
d7d33c36b0
Merge branch 'readonly-p4-master'
2009-04-20 09:54:14 -07:00
Dmitry Shmidt
2ad33d01a9
Merge branch 'readonly-p4-donut' into donut
2009-04-20 09:50:17 -07:00
Evan Millar
9a110fee1c
Merge branch 'readonly-p4-master'
2009-04-18 23:36:20 -07:00
Dave Sparks
8eadf141f6
Merge branch 'readonly-p4-master'
2009-04-18 23:02:23 -07:00
Jean-Michel Trivi
c732d9df1d
Merge branch 'readonly-p4-master'
2009-04-18 22:59:37 -07:00
Urs Grob
ea5ee32872
Merge branch 'readonly-p4-master'
2009-04-18 22:48:29 -07:00
Dave Sparks
dc46d966d6
Merge branch 'readonly-p4-master'
2009-04-18 22:26:57 -07:00
Dave Sparks
51925b69e3
Merge branch 'readonly-p4-master'
2009-04-18 22:21:29 -07:00
Brandon Ballinger
7b59cf703a
Merge branch 'readonly-p4-master'
2009-04-18 22:05:19 -07:00
Dirk Dougherty
1d11e2671c
Merge branch 'readonly-p4-master'
2009-04-18 22:02:32 -07:00
Dirk Dougherty
67f56a11af
Merge branch 'readonly-p4-master'
2009-04-18 21:59:48 -07:00
Xavier Ducrohet
aea732c8d6
Merge branch 'readonly-p4-master'
2009-04-18 21:43:30 -07:00
Dirk Dougherty
ec199f6634
Merge branch 'readonly-p4-master'
2009-04-18 21:11:00 -07:00
Dirk Dougherty
cbf8225789
Merge branch 'readonly-p4-master'
2009-04-18 21:08:19 -07:00
Scott Main
ac08d9c38b
Merge branch 'readonly-p4-master'
2009-04-18 16:14:56 -07:00
Scott Main
4bb4aab510
Merge branch 'readonly-p4-master'
2009-04-18 16:12:09 -07:00
Guang Zhu
d0604d37af
Merge branch 'readonly-p4-master'
2009-04-18 15:58:39 -07:00
Ramanan Rajeswaran
53d361410d
Merge branch 'readonly-p4-master'
2009-04-18 15:29:04 -07:00
Evan Millar
287657b079
Merge branch 'readonly-p4-donut' into donut
2009-04-18 12:27:51 -07:00
Android (Google) Code Review
3e8a53e769
Merge change 287 into donut
...
* changes:
Get Sketch compiling.
2009-04-17 16:24:12 -07:00
Android (Google) Code Review
9b187e977a
Merge change 279 into donut
...
* changes:
Add sketch gesture demo application.
2009-04-17 14:20:38 -07:00
Android (Google) Code Review
4573f5982d
Merge change 263 into donut
...
* changes:
location: Generalize support for location provider usage tracking.
2009-04-17 14:05:57 -07:00
