ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,492 Commits 2 Branches 0 Tags 54 MiB
df360ef5dd
Commit Graph

14492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
6141ec0536 Merge commit 'goog/readonly-p4-donut' into HEAD 
Conflicts:
	location/java/android/location/Geocoder.java
 2009-04-22 12:09:59 -07:00
Android (Google) Code Review
cd77dffe55 Merge change 358 into donut 
* changes:
  Fix issue 1745312: Various cleanups in media framework
 2009-04-22 09:57:03 -07:00
Android (Google) Code Review
c8d3410981 Merge change 416 into donut 
* changes:
  Remove debug messages. 	modified:   core/java/android/hardware/Camera.java
 2009-04-22 01:59:31 -07:00
Wu-cheng Li
81d763f77a Remove debug messages. 
modified:   core/java/android/hardware/Camera.java

	modified:   camera/libcameraservice/CameraService.cpp
 2009-04-22 16:22:01 +08:00
Dirk Dougherty
37cb461e21 Merge branch 'readonly-p4-master' 2009-04-22 01:08:00 -07:00
Dirk Dougherty
b6f96a25e0 Merge branch 'readonly-p4-master' 2009-04-22 01:05:08 -07:00
Scott Main
08e1a554ab Merge branch 'readonly-p4-master' 2009-04-22 01:02:14 -07:00
Scott Main
567ad3235a Merge branch 'readonly-p4-master' 2009-04-22 00:56:26 -07:00
Scott Main
f43a286257 Merge branch 'readonly-p4-master' 2009-04-22 00:53:37 -07:00
Scott Main
2e972031c3 Merge branch 'readonly-p4-master' 2009-04-22 00:50:50 -07:00
Dirk Dougherty
880ce8cde8 Merge branch 'readonly-p4-master' 2009-04-22 00:47:58 -07:00
Android (Google) Code Review
bd737ca301 Merge change 404 into donut 
* changes:
  normalize the DATA_STATE_RADIO_OFF event log id definition
 2009-04-21 23:44:04 -07:00
Android (Google) Code Review
dc50547df9 Merge change 403 into donut 
* changes:
  remove superfluous lines
 2009-04-21 23:43:45 -07:00
Xavier Ducrohet
03236a7c04 Merge branch 'readonly-p4-master' 2009-04-21 18:48:41 -07:00
Android (Google) Code Review
35e5ee4e97 Merge change 387 into donut 
* changes:
  Geocoder: Document behavior when no backend service is available.
 2009-04-21 17:31:01 -07:00
Jeff Hamilton
38c11d2261 Merge branch 'readonly-p4-master' 2009-04-21 15:17:40 -07:00
Jeff Hamilton
6b225a92cc Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:14:41 -07:00
Android (Google) Code Review
5b0689a8b1 Merge change 372 into donut 
* changes:
  WifiService: Cleanup parsing of wifi scan results.
 2009-04-21 15:12:25 -07:00
Dirk Dougherty
63674de250 Merge branch 'readonly-p4-master' 2009-04-21 15:04:33 -07:00
Dirk Dougherty
2dc2e7197d Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:01:57 -07:00
Dirk Dougherty
fba25a82e3 Merge branch 'readonly-p4-master' 2009-04-21 14:57:48 -07:00
Dirk Dougherty
915df02d41 Merge branch 'readonly-p4-donut' into donut 2009-04-21 14:55:49 -07:00
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