246 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
bacc51026e am d09f86ce: Merge changes 5548,5549 into donut
Merge commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2'

* commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2':
  Better (and less) logging from backup.
  Add an extra null terminator.  String8::unlockBuffer is
2009-06-29 16:37:39 -07:00
Android (Google) Code Review
6034cb565c am 17a80081: Merge change 5544 into donut
Merge commit '17a80081a42410f541a220ab7e6afc64fc6cc399'

* commit '17a80081a42410f541a220ab7e6afc64fc6cc399':
  Pipe all the camera callbacks to Java to facilitate the addition
2009-06-29 16:37:31 -07:00
Android (Google) Code Review
f6ff591dec am 72eb0aca: Merge change 5483 into donut
Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'

* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
  Expand support for different screen sizes.
2009-06-29 16:37:17 -07:00
Android (Google) Code Review
c2188ff586 Merge change 5600
* changes:
  Rework the property parsing code.
2009-06-29 11:42:38 -07:00
Jaikumar Ganesh
8bc8ce44f7 Rework the property parsing code.
1. Fix and remove CodeDuplication TODO
2. Fix crash while unpairing.
3. For array properties, make it a bit more efficient by passing,
   lesser String objects from JNI.
4. Remove void pointer usage and use union to make code more readble.
2009-06-29 11:41:19 -07:00
Android (Google) Code Review
d09f86ce17 Merge changes 5548,5549 into donut
* changes:
  Better (and less) logging from backup.
  Add an extra null terminator.  String8::unlockBuffer is supposed to be doing this, but it's not and I can't figure out why.  This makes BackupHelperDispatcher able to read the keys correctly.
2009-06-26 14:19:59 -07:00
Joe Onorato
12a4da328a Add an extra null terminator. String8::unlockBuffer is
supposed to be doing this, but it's not and I can't
figure out why.  This makes BackupHelperDispatcher able
to read the keys correctly.

Also, we weren't writing the data size.
2009-06-26 17:18:01 -04:00
Android (Google) Code Review
17a80081a4 Merge change 5544 into donut
* changes:
  Pipe all the camera callbacks to Java to facilitate the addition of new features. This will make it easy to add things like zoom callbacks without modifying the entire camera stack. Bug 1837832.
2009-06-26 14:02:10 -07:00
Dianne Hackborn
723738cfae Expand support for different screen sizes.
Applications can now declare that they support small, normal, or
large screens.  Resource selection can also be done based on these
sizes.  By default, pre-Donut apps are false for small and large,
and Donut or later apps are assumed to support all sizes.  In either
case they can use <supports-screens> in their manifest to declare
what they actually support.
2009-06-26 13:37:05 -07:00
Dave Sparks
c62f9bd133 Pipe all the camera callbacks to Java to facilitate the addition
of new features. This will make it easy to add things like zoom
callbacks without modifying the entire camera stack.
Bug 1837832.
2009-06-26 13:33:32 -07:00
San Mehat
485f971e9d am 7d619f18: framework: process: Set the control group of a thread to the background group if the priority is logically-lower than ANDROID_PRIORITY_BACKGROUND
Merge commit '7d619f18a277ee3114624df7301db94db83936b9'

* commit '7d619f18a277ee3114624df7301db94db83936b9':
  framework: process: Set the control group of a thread to the background group
2009-06-26 09:19:48 -07:00
San Mehat
7d619f18a2 framework: process: Set the control group of a thread to the background group
if the priority is logically-lower than ANDROID_PRIORITY_BACKGROUND

Signed-off-by: San Mehat <san@google.com>
2009-06-26 08:38:13 -07:00
Android (Google) Code Review
2df7c15aa0 am b505ae41: Merge change 5459 into donut
Merge commit 'b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08'

* commit 'b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08':
  Make the BackupHelperDispatcher properly handle multiple helpers.
2009-06-25 18:06:01 -07:00
Joe Onorato
4ababd922e Make the BackupHelperDispatcher properly handle multiple helpers. 2009-06-25 20:36:09 -04:00
Android (Google) Code Review
1f7300818f am c44989d6: Merge change 5350 into donut
Merge commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e'

* commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e':
  move ui/Time.cpp to core/jni, since this is the only place it is used
2009-06-25 15:11:09 -07:00
Mathias Agopian
864c0d50cd move ui/Time.cpp to core/jni, since this is the only place it is used 2009-06-25 14:39:56 -07:00
Android (Google) Code Review
cf946df3f7 am 35a47a6e: Merge change 5389 into donut
Merge commit '35a47a6eebae21738bcf9b481e0bb606328cbd1a'

* commit '35a47a6eebae21738bcf9b481e0bb606328cbd1a':
  Skip spaces and tabs in readProcLines()
2009-06-25 13:13:43 -07:00
Amith Yamasani
add868ceba Skip spaces and tabs in readProcLines()
This is to fix a problem in the parsing of /proc/pid/status file.
2009-06-25 12:24:56 -07:00
Mathias Agopian
f31868e59f merge master in master_gl 2009-06-24 18:31:21 -07:00
Android (Google) Code Review
2387208c9e am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'

* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
  Use a ref-counted callback interface for Camera.
2009-06-24 13:54:09 -07:00
Dave Sparks
5e27115995 Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
2009-06-24 07:58:27 -07:00
Mike Reed
47c0d4eaa9 remove deprecated use of porterduff 2009-06-22 22:53:52 -04:00
Android (Google) Code Review
4527acb0c3 am 856dd8a6: Merge change 4952 into donut
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'

* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
  Helper API cleanup.  Allows multiple helpers to function,
2009-06-22 13:20:31 -07:00
Joe Onorato
06290a4bb9 Helper API cleanup. Allows multiple helpers to function,
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
2009-06-22 13:02:24 -07:00
Android (Google) Code Review
ce1311a3a0 am 766d7236: Merge change 4737 into donut
Merge commit '766d7236c84f636b816d71189e309e67db1f593a'

* commit '766d7236c84f636b816d71189e309e67db1f593a':
  Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995.
2009-06-22 03:50:23 -07:00
Wei-Ta Chen
8cdcb12752 Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995.
The function is used to rebuild any caches associated with the bitmap.
In the case of purgeable bitmaps, this call ensures that the pixels
are decoded for drawing, and therefore prefetching techniques
implemented by callers can be leveraged.
2009-06-22 18:01:47 +08:00
Mathias Agopian
f73bbd0423 Merge commit 'goog/master' into merge_master 2009-06-19 17:41:14 -07:00
Ben Cheng
e090f3bc9e Shorten the property name as there appears to be a length limit for it. 2009-06-19 17:16:28 -07:00
Android (Google) Code Review
885f75187c am 066e6bfd: Merge change 4792 into donut
Merge commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929'

* commit '066e6bfd01a5ddd4748eacdc82fee5374e2af929':
  when we reset a paint, it should return to the state it was in when it was first created.
2009-06-19 14:49:44 -07:00