20572 Commits

Author SHA1 Message Date
Mathias Agopian
0815235ffc am a019df87: Merge "Fix Android\'s glEGLImageTargetRenderbufferOES() wrapper" into froyo
Merge commit 'a019df875d991ce61c93720f37c036655723f5f6' into froyo-plus-aosp

* commit 'a019df875d991ce61c93720f37c036655723f5f6':
  Fix Android's glEGLImageTargetRenderbufferOES() wrapper
2010-03-29 15:53:48 -07:00
Mathias Agopian
6874362a6b am 04fdd180: Merge "fix [2542425] memory leak during video recording" into froyo
Merge commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp

* commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
  fix [2542425] memory leak during video recording
2010-03-29 15:53:44 -07:00
Christopher Tate
3f264c4fba Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo 2010-03-29 15:50:57 -07:00
Christopher Tate
cc84c69726 API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Part of bug #2545514

Change-Id: Ic775e3b942c485252149c1b6c15c88517fa4e3e5
2010-03-29 15:48:14 -07:00
Mathias Agopian
a019df875d Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo 2010-03-29 15:44:48 -07:00
Mathias Agopian
04fdd180cc Merge "fix [2542425] memory leak during video recording" into froyo 2010-03-29 15:44:33 -07:00
Dirk Dougherty
6c75455908 am c46f28dc: Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp

* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
  doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
2010-03-29 15:39:56 -07:00
Andreas Huber
538c310b09 am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Merge commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp

* commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9':
  Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
2010-03-29 15:39:53 -07:00
Dirk Dougherty
c46f28dc0f Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo 2010-03-29 15:36:53 -07:00
Andreas Huber
02a1f78987 Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo 2010-03-29 15:16:20 -07:00
Andreas Huber
c2eeb2f52e Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
Change-Id: I3f9bbcdd4f563bac27c4ccae58e4179656c264b6
related-to-bug: 1903971
2010-03-29 15:13:40 -07:00
Mathias Agopian
a5d4ad3d52 Fix Android's glEGLImageTargetRenderbufferOES() wrapper
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.

Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
2010-03-29 15:12:19 -07:00
Jim Miller
d41d458696 am c6dc5070: Merge "Fix 2537999: Don\'t throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Merge commit 'c6dc5070ef663e514add038b1d2e78761156b0c0' into froyo-plus-aosp

* commit 'c6dc5070ef663e514add038b1d2e78761156b0c0':
  Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs
2010-03-29 15:11:01 -07:00
Jim Miller
c6dc5070ef Merge "Fix 2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo 2010-03-29 15:07:06 -07:00
Romain Guy
e0f9e735e4 am 89d4e2dd: Fix the buid!
Merge commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1' into froyo-plus-aosp

* commit '89d4e2dd7888913d3eb1f4f669bd756a3b85f2c1':
  Fix the buid!
2010-03-29 15:05:05 -07:00
Romain Guy
89d4e2dd78 Fix the buid!
Change-Id: Ia6e57da393f04209b180e131df74c24e62052d8c
2010-03-29 14:58:11 -07:00
Romain Guy
21ad6043cd am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595
Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp

* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
  Rename tab widget attributes, remove scroll barrier constant.
2010-03-29 14:49:09 -07:00
Dirk Dougherty
d76ef97930 doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Bug: 2554090
Change-Id: Ia13b3d156d230609e8296a3b31c2882ba13681f3
2010-03-29 14:47:39 -07:00
Steve Howard
1c310b9d2f Remove upside-down portrait orientation.
I also realized the ROTATION_NN constants were misdocumented, they
actually align the opposite direction from the "orientation" angle
computed in the code (i.e. orientation=90 is left side up, ROTATION_90
is right side up).  I just changed the comment here to keep the change
minimal; I'll update the code to be more consistent outside of this
release branch.

Bug: 2549875
Change-Id: I79c4286be582a21e730b25a8a24f2e1137c6e4cb
2010-03-29 14:43:46 -07:00
Romain Guy
6b1e696982 Rename tab widget attributes, remove scroll barrier constant.
Bug #2553515 #2553595

Change-Id: Id36280a57f00a1ee59251be6be1aae8df2189c09
2010-03-29 14:40:34 -07:00
Doug Zongker
0d531f5b59 am ab69e29c: relocate android.util.base64.* -> android.util.*
Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp

* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
  relocate android.util.base64.* -> android.util.*
2010-03-29 14:00:58 -07:00
Doug Zongker
ab69e29c19 relocate android.util.base64.* -> android.util.*
b/2553469 - API REVIEW: android.util.base64

Change-Id: I6a514032152a8b1899db52d020aca8e8b19e74e9
2010-03-29 13:46:47 -07:00
Mathias Agopian
d741452853 fix [2542425] memory leak during video recording
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.

Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
2010-03-29 13:45:18 -07:00
Romain Guy
e16741b22a am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo
Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp

* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
  Tame the monkey.
2010-03-29 13:06:20 -07:00
Dirk Dougherty
9d59c70a55 am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Merge commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp

* commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3':
  doc change: Indicate that only the first 8 characters of the key alias are used.
2010-03-29 13:06:17 -07:00
Andreas Huber
8ccfd36d3d am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
Merge commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp

* commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
  Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
2010-03-29 13:01:27 -07:00
Romain Guy
272b504ee6 Merge "Tame the monkey. Bug #2547546" into froyo 2010-03-29 13:00:42 -07:00
Dirk Dougherty
12cd8a3c27 Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo 2010-03-29 13:00:37 -07:00
Romain Guy
7eec2bcf6f Tame the monkey.
Bug #2547546

Change-Id: I2a41f53dbd71a166ddce70f3fbec24cfedaa514a
2010-03-29 13:00:07 -07:00
Andreas Huber
1e64e52c8f Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo 2010-03-29 12:58:03 -07:00
Jean-Baptiste Queru
9d0f6dfdc1 Fix build
Change-Id: I8c68731786ab648dc916b09333b67acb26f81594
2010-03-29 12:55:09 -07:00
Dirk Dougherty
670b449763 doc change: Indicate that only the first 8 characters of the key alias are used.
bug: 2553183
Change-Id: I77cf7ac22b370c14f046a5a6b58b842f59e61f70
2010-03-29 12:43:27 -07:00
Romain Guy
7e31b282dd am 0e122926: Merge "Rename private fields to break bad code examples" into froyo
Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples
2010-03-29 12:34:23 -07:00
Romain Guy
0e1229260d Merge "Rename private fields to break bad code examples" into froyo 2010-03-29 12:28:20 -07:00
Romain Guy
65fe2c08fa Rename private fields to break bad code examples
Change-Id: I4a3e8df5de159c703db244212f78824e4105ba90
2010-03-29 12:27:30 -07:00
Jack Palevich
cdb9839a56 am 5d961085: Add a test of EGL pausing and resuming.
Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp

* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
  Add a test of EGL pausing and resuming.
2010-03-29 12:22:08 -07:00
Jack Palevich
5d961085c3 Add a test of EGL pausing and resuming. 2010-03-29 12:16:55 -07:00
Irfan Sheriff
92380919cc am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp

* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
2010-03-29 12:07:37 -07:00
Irfan Sheriff
b99fe5e622 cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
Killing the WifiWatchdogService thread from
WifiService can cause messages to be handled on
a dead thread. Quit the thread on the broadcast
instead.

A couple of more fixes:
- Do an asynchronous bring up of Wifi. This will
allow WifiWatchdogServiceThread to be immediately
brought up, instead of relying on an update.

- There is no need to listen on supplicant connection
in wifiwatchdog anymore. We kill the thread when
supplicant connection is no more.

Bug: 2546756
Change-Id: I15a188e031bc79856c55aabdd271287b0df0377d
2010-03-29 12:02:44 -07:00
Andreas Huber
62141b430f Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
Change-Id: I50e8976ce8d0ecc47ee0eb497296930877ce306a
related-to-bug: 2549465
2010-03-29 12:01:25 -07:00
Romain Guy
1889f40aa1 am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.
2010-03-29 11:28:07 -07:00
Romain Guy
ab924c909a Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
Romain Guy
b5d73d0fb0 Make EditTextPreference scrollable.
Bug #2549257

Change-Id: If2f69f957681e15977a7603a1f6533e9d1fea9f7
2010-03-29 11:23:18 -07:00
The Android Open Source Project
5849606df7 merge from open-source master
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
2010-03-29 11:04:30 -07:00
The Android Open Source Project
c89704a77f merge from open-source master
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
2010-03-29 10:57:04 -07:00
Daniel Lehmann
3e9032e646 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Jean-Michel Trivi
0737d77ac3 Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:05:28 -07:00
Jean-Michel Trivi
211957f639 Implement audio focus support in the notification manager.
This change introduces the NotificationPlayer class which was
created from the code of android.media.AsyncPlayer. The only modification
was to modify the construction of the MediaPlayer so it properly issues
onCompletion notifications (which are used to abandon audio focus).

Unless the sound to be played is looped, the notification is transient
and other apps may duck (uses AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK in
audio focus request).
Change-Id: I69cbb71d0892447b934351384e4e24a2e239295b
2010-03-29 09:37:02 -07:00
Grace Kloba
51b97011b7 cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
Use the content width to calculate the zoom overview
width. We used to use the minimum preferred width
to calculate the overview width as it is what we
use to define the viewport width. But some sites,
like cbsnews, engadget, the content width will be
slightly wider than the viewport width decided by
the min preferred width. The result is we can still
scroll a little bit in the overview mode. This issue
is magnified when we introduce the overscroll feature.

By using content width as zoom overview width, we
will have content fit in the overview mode. But
some sites, like
"http://www.sfjazz.org/concerts/2010/spring/artists/towner.php"
will be layout wider in the overview mode than it
is in the zoom in state. This is a tradeoff.

Fix http://b/issue?id=2551119
2010-03-29 09:32:36 -07:00
Leon Clarke
7c3006f53a http://b/issue?id=2496591
When receiving a message to delete the root layer, delay it until the next
new picture message, so that the layers only disappear when we start displaying
the new page, and not the moment the DOM on the old page is destroyed.
2010-03-29 16:49:16 +01:00