275 Commits

Author SHA1 Message Date
Dave Sparks
4b5a8f84b1 am da57856d: Add logging to help track down intermittent bug
Merge commit 'da57856d749457e495bd860c4ff45aaaf87c9dab'

* commit 'da57856d749457e495bd860c4ff45aaaf87c9dab':
  Add logging to help track down intermittent bug
2009-07-21 09:22:54 -07:00
Dave Sparks
da57856d74 Add logging to help track down intermittent bug 2009-07-21 08:43:29 -07:00
Android (Google) Code Review
569f0b5070 Merge change 7900
* changes:
  Initial support of 2.1 pairing.
2009-07-20 10:36:25 -07:00
Android (Google) Code Review
b965d09294 Merge change 7775
* changes:
  Add an option to enable JIT trace profiling for app_process.
2009-07-20 09:43:25 -07:00
Jaikumar Ganesh
b0eca41de0 Initial support of 2.1 pairing.
Note: Some cases have not been tested yet, as we would need to
get proper UI support.
2009-07-17 17:52:26 -07:00
Android (Google) Code Review
ddd12804d1 am 261a784c: Merge change 7720 into donut
Merge commit '261a784c44d6ac4377651e4842c7a96326462857'

* commit '261a784c44d6ac4377651e4842c7a96326462857':
  Fix global ref leak in android.media.AudioRecord. Delete global refs
2009-07-17 17:13:28 -07:00
Ben Cheng
0e01fbf722 Add an option to enable JIT trace profiling for app_process. 2009-07-17 16:04:00 -07:00
Android (Google) Code Review
c634fdd803 am 09a903ab: Merge change 7696 into donut
Merge commit '09a903ab5b8d940605783ae4ee591c0f090a31d1'

* commit '09a903ab5b8d940605783ae4ee591c0f090a31d1':
  add hidden Options field for native allocations
2009-07-17 15:43:14 -07:00
Jaikumar Ganesh
12cae39747 Revert "Initial support of 2.1 pairing."
This reverts commit 228b2f3a813e93413a0f9e2f29dfbfc54590a356.
2009-07-17 14:45:22 -07:00
Android (Google) Code Review
261a784c44 Merge change 7720 into donut
* changes:
  Fix global ref leak in android.media.AudioRecord. Delete global refs to the native AudioRecord pointer and the callback cookie (for native to Java calls) in the finalize() function and when an error occurs during the allocation of the native resources.
2009-07-17 14:39:52 -07:00
Jaikumar Ganesh
228b2f3a81 Initial support of 2.1 pairing.
Note: Some cases have not been tested yet, as we would need to
get proper UI support.
2009-07-17 14:00:32 -07:00
Marco Nelissen
0bca96bcbf Make Process.getFreeMemory() return a long instead of an int, to better
work on the simulator now, and phones 2 years from now.
2009-07-17 12:59:25 -07:00
Jean-Michel Trivi
4bac5a3928 Fix global ref leak in android.media.AudioRecord. Delete global refs
to the native AudioRecord pointer and the callback cookie (for native
to Java calls) in the finalize() function and when an error occurs
during the allocation of the native resources.
2009-07-17 12:05:31 -07:00
Android (Google) Code Review
09a903ab5b Merge change 7696 into donut
* changes:
  add hidden Options field for native allocations
2009-07-17 11:04:06 -07:00
Mike Reed
1b22b97925 add hidden Options field for native allocations 2009-07-17 11:21:47 -04:00
Android (Google) Code Review
dbee03136f am 733cbb00: Merge change 7492 into donut
Merge commit '733cbb0009d3e16eac2383a694833bdbc0c7269e'

* commit '733cbb0009d3e16eac2383a694833bdbc0c7269e':
  Delete leaked global ref in AudioTrack constructor.
2009-07-17 02:09:14 -07:00
Jean-Michel Trivi
8a1496855c Delete leaked global ref in AudioTrack constructor. 2009-07-16 15:59:44 -07:00
Jaikumar Ganesh
1c42769339 Rename registerPhoneStateChange to registerPreciseCallStateChange
As registerPhoneStateChange was actually notifying CallStateChange,
rename appropriately.
2009-07-14 21:29:41 -07:00
Android (Google) Code Review
0d4586d326 am 9181bc9a: Merge change 7079 into donut
Merge commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5'

* commit '9181bc9ab75f97f11f2188237ba4a0f31569dfb5':
  Cleanup of unused enums
2009-07-14 10:50:49 -07:00
Dave Sparks
8978bd0174 Cleanup of unused enums 2009-07-14 08:02:37 -07:00
Dave Sparks
02035132ff am c4ca4206: Fix build
Merge commit 'c4ca420625183a8efa619e06287b47f3d2e72283'

* commit 'c4ca420625183a8efa619e06287b47f3d2e72283':
  Fix build
2009-07-13 09:45:19 -07:00
Dave Sparks
c4ca420625 Fix build 2009-07-13 09:42:43 -07:00
Android (Google) Code Review
e3ea663686 am 8ceba810: Merge change 6871 into donut
Merge commit '8ceba810d5a5831544790e18ed05eeed7e2fa994'

* commit '8ceba810d5a5831544790e18ed05eeed7e2fa994':
  Use SetByteArrayRegion to minimize copy overhead and JNI calls.
2009-07-13 09:06:12 -07:00
Android (Google) Code Review
b4424782f9 am 086bd7fe: Merge change 6846 into donut
Merge commit '086bd7fed122f636e210b03eb114051a489f347b'

* commit '086bd7fed122f636e210b03eb114051a489f347b':
  Avoid memcpy's by using GetPrimitiveArrayCritical.
2009-07-12 06:06:54 -07:00
Dave Sparks
a95f495f75 Use SetByteArrayRegion to minimize copy overhead and JNI calls. 2009-07-10 18:13:36 -07:00
Android (Google) Code Review
9cf012a9fc Merge change 6823
* changes:
  wifi: Keep the WLAN network interface up whenever wifi is enabled.
2009-07-10 16:29:20 -07:00
Dave Sparks
75acd89648 Avoid memcpy's by using GetPrimitiveArrayCritical. 2009-07-10 16:10:49 -07:00
Mike Lockwood
0900f36576 wifi: Keep the WLAN network interface up whenever wifi is enabled.
We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-10 17:24:07 -04:00
Mike Reed
b5af325fb1 rename libsgl/libcorecg to libskia 2009-07-10 15:33:21 -04:00
Android (Google) Code Review
6811355d96 am 463aacfb: Merge change 6661 into donut
Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'

* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
  wifi: WifiManager.startScan() will now do passive scans by default.
2009-07-09 14:27:38 -07:00
Android (Google) Code Review
463aacfbd2 Merge change 6661 into donut
* changes:
  wifi: WifiManager.startScan() will now do passive scans by default.
2009-07-09 14:22:25 -07:00
Android (Google) Code Review
191c12d33f am 16f676f4: Merge change 6660 into donut
Merge commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf'

* commit '16f676f4f8ae3807b5cb40086048e48cae4be3cf':
  Fix a small bug in array length bounds checking.
2009-07-09 14:12:48 -07:00
Android (Google) Code Review
16f676f4f8 Merge change 6660 into donut
* changes:
  Fix a small bug in array length bounds checking.
2009-07-09 14:10:38 -07:00
Mike Lockwood
a5ec95cdb1 wifi: WifiManager.startScan() will now do passive scans by default.
Active scans will only happen if a hidden AP is in use, or if the new method
WifiManager.startScanActive() is called.
This fixes some audio playback problems with bluetooth A2DP.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-09 16:54:39 -04:00
Dan Egnor
6d877383bc Fix a small bug in array length bounds checking. 2009-07-09 13:48:36 -07:00
Grace Kloba
bd51116a53 Fix couple of bugs in the meminfo report.
. added the new "/data/dalvik-cache/" to dalvik heap
 . shortened the starting line's length from 40 to 30 to handle the case where there is no name
 . fixed the pri/shared for others. It was swapped.
2009-07-08 23:32:25 -07:00
Dave Sparks
6698d16b95 resolved conflicts for merge of 04c7d0f8 to master 2009-07-08 17:26:05 -07:00
Dave Sparks
59c1a93529 Add timestamps to video frames to improve A/V sync.
Bug 1927069.
2009-07-08 15:59:25 -07:00
Android (Google) Code Review
ddd8c26c06 Merge change 6320
* changes:
  Add method to read events from a file.  Remove unused method.  Fixed after review.
2009-07-07 12:37:27 -07:00
Eric Laurent
fcc5be99e0 am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c'

* commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
  Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
2009-07-07 09:36:14 -07:00
Eric Laurent
88e209dcf8 Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t.
Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate().
AudioTrack::setSampleRate() no returns a status.
2009-07-07 07:10:45 -07:00
Jim Miller
95ff2401a9 Add method to read events from a file. Remove unused method. Fixed after review. 2009-07-06 18:31:07 -07:00
Mathias Agopian
03a9a3449a Merge commit 'goog/master' into merge_master 2009-07-06 14:16:55 -07:00
Android (Google) Code Review
fee47b699f am c7396025: Merge change 6084 into donut
Merge commit 'c7396025e59524e7ef639fd86fc23123939ee91c'

* commit 'c7396025e59524e7ef639fd86fc23123939ee91c':
  Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726)
2009-07-06 11:02:33 -07:00
James Dong
a1b653d41d Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug 1956726) 2009-07-02 10:04:20 -07:00
Mathias Agopian
dfe983bd79 Merge commit 'goog/master' into merge_master 2009-07-01 18:33:18 -07:00
Android (Google) Code Review
1b43089964 am b1a97523: Merge change 5739 into donut
Merge commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e'

* commit 'b1a975234112cb98ddd5a3ff5f991007eecaff2e':
  Check to make sure the Java camera object is still valid on the
2009-07-01 16:02:03 -07:00
Wu-cheng Li
0795684839 am b8a10fe4: Allow setPreviewDisplay after startPreview.
Merge commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e'

* commit 'b8a10fe45657f2dcc50cae8a06805f8438a6937e':
  Allow setPreviewDisplay after startPreview.
2009-07-01 11:20:08 -07:00
Dave Sparks
d0cbb1a52d Check to make sure the Java camera object is still valid on the
callback from native. Omitted from previous fix. Bug 1936850.
2009-06-30 13:20:30 -07:00
Wu-cheng Li
b8a10fe456 Allow setPreviewDisplay after startPreview. 2009-07-01 01:41:25 +08:00