25876 Commits

Author SHA1 Message Date
Mathias Agopian
51a6aef53c Fix a bug in sp<> and wp<> which could cause memory corruptions
when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.

This bug would cause linked-list of smart-pointers to fail
miserably.

Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
2010-06-24 21:49:02 -07:00
Mathias Agopian
256fc04394 am 081bc5c4: fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '081bc5c47d8a980e6eafa70ddafcd89981586391' into gingerbread-plus-aosp

* commit '081bc5c47d8a980e6eafa70ddafcd89981586391':
  fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
2010-06-24 21:36:37 -07:00
Mathias Agopian
081bc5c47d fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.

Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
2010-06-24 21:28:59 -07:00
Irfan Sheriff
17b232b5b5 Add setWifiApConfiguration interface
Bug: 2538623
Change-Id: I779044173a2fa0e9b851ea92aeec5ca25eb9c86f
2010-06-24 20:03:38 -07:00
Romain Guy
ca9d544e38 Merge "Add colored rectangles implementation in OpenGLRenderer." 2010-06-24 19:32:44 -07:00
Romain Guy
9d5316e3f5 Add colored rectangles implementation in OpenGLRenderer.
Drawing two rectangles one after the other discards the second one because of
Z buffering issues. This will be fixed in another changelist.

Change-Id: Ida1b3cde8a78e60cacc07e477abc44def527ff67
2010-06-24 19:30:36 -07:00
Daniel Sandler
b9353372f6 am 8896783d: Updated StatusBar test app for new notifications API.
Merge commit '8896783dc1d31c5274b277c364da0ffe7cc27cca' into gingerbread-plus-aosp

* commit '8896783dc1d31c5274b277c364da0ffe7cc27cca':
  Updated StatusBar test app for new notifications API.
2010-06-24 19:13:25 -07:00
Daniel Sandler
bc4bc709a8 am 87160757: Basic handling of Notifications with fullScreenIntent.
Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp

* commit '87160757e827e8e158d233de09d70e7128184729':
  Basic handling of Notifications with fullScreenIntent.
2010-06-24 19:13:22 -07:00
Daniel Sandler
8896783dc1 Updated StatusBar test app for new notifications API.
New actions:
 - Toggle activity's immersive mode
 - Post a priority notification with fullScreenIntent
   that launches an alert-like activity

Change-Id: Ie38372209985577b6db856924c19914c000e1cec
2010-06-24 22:09:35 -04:00
Daniel Sandler
87160757e8 Basic handling of Notifications with fullScreenIntent.
If a Notification has a non-null fullScreenIntent AND the
topmost Activity is not immersive, that PendingIntent will
fire (presumably causing a nice dialog or full-screen
activity to appear).

Immersive mode handling for FLAG_HIGH_PRIORITY Notifications
is still unimplemented (although the fullScreenIntent will
be suppressed in immersive mode).

Note that currently your fullScreenIntent notification will
also get posted to the status bar, so you're responsible for
clearing it out (e.g. in onPause in your alert intent). See
forthcoming changes to StatusBarTest for an example.

Change-Id: Ie750d1b7bcc788bd29ee1d8626f971dd47fd2817
2010-06-24 22:09:35 -04:00
Scott Main
06f36212d6 am 8ab65289: am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '8ab652896394526d8793973067b228eca34201a7'

* commit '8ab652896394526d8793973067b228eca34201a7':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:18:28 -07:00
Scott Main
8ab6528963 am 7dacda11: am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp

* commit '7dacda1142379df1f1f9854c24e452acdea98436':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:16:31 -07:00
Scott Main
da3b02c6bc am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into froyo-plus-aosp

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:14:06 -07:00
Scott Main
7dacda1142 am 56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread

* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
  docs: Remove the TOS from download flow and remove TOS entirely because
2010-06-24 18:12:49 -07:00
Scott Main
56c778e6cf Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Jason Sams
ad02a9b64f Merge "Fix return values for rsClamp." 2010-06-24 17:57:18 -07:00
Jason Sams
6495128049 Fix return values for rsClamp.
Change-Id: Ic9980a2304797a74392c729d6b8ec9f477a906d6
2010-06-24 17:56:34 -07:00
Joe Onorato
ab3c7d2a8c am 0bf5cce9: am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c'

* commit '0bf5cce9ee5f7db9932a8ba27e86836a9d96677c':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:55:59 -07:00
Joe Onorato
0bf5cce9ee am 0a0edcca: Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp

* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
  Fix the notification vibration setting and add a test app that lets you recover from the busted
2010-06-24 17:53:28 -07:00
Joe Onorato
0a0edccafb Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread 2010-06-24 17:51:22 -07:00
Joe Onorato
8932020f54 Fix the notification vibration setting and add a test app that lets you recover from the busted
state.

Bug: 2767349
Change-Id: Id0c41734e82a1256a49175a2dc6b40f0abaf4f8b
2010-06-24 17:49:44 -07:00
Dianne Hackborn
8bb998d52c am ea8eafad: am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit 'ea8eafad4f5438ec1291d45376959a996d36e15e'

* commit 'ea8eafad4f5438ec1291d45376959a996d36e15e':
  Make bad notifications crash their application.
2010-06-24 17:33:14 -07:00
Dianne Hackborn
ea8eafad4f am 2529a453: Merge "Make bad notifications crash their application." into gingerbread
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp

* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
  Make bad notifications crash their application.
2010-06-24 17:30:42 -07:00
Scott Main
654d9414de docs: Remove the TOS from download flow and remove TOS entirely because
it's no longer relevant to the SDK download package

Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
2010-06-24 17:29:13 -07:00
Dianne Hackborn
2529a45339 Merge "Make bad notifications crash their application." into gingerbread 2010-06-24 17:28:13 -07:00
Dianne Hackborn
9d39d0cb36 Make bad notifications crash their application.
Implement notification manager handling of bad notifications, to
call a new activity manager to have the owner's process crashed
(if there is one).

Change-Id: Ib15e8d0c598756f3b39c99cc2045c18e054daf6b
2010-06-24 17:27:28 -07:00
Dianne Hackborn
7acbc1f1e7 am cac3126c: am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f'

* commit 'cac3126c6109854640266c4807e5aa8e6a87142f':
  Properly note the current active restore set's token
2010-06-24 17:16:37 -07:00
Alex Sakhartchouk
9b949fce39 Adding freetype font rendering to renderscript.
Change-Id: I3a10ffe27092a41df156341c9cb3f7aa19c49f19
2010-06-24 17:15:34 -07:00
Dianne Hackborn
36e5f667bc resolved conflicts for merge of 2eb12a47 to master
Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
2010-06-24 16:29:54 -07:00
Dianne Hackborn
cac3126c61 am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token
2010-06-24 16:04:07 -07:00
Dianne Hackborn
14694eb9ae am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
2010-06-24 16:02:03 -07:00
Dianne Hackborn
5340bffd8b am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread

* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
  Properly note the current active restore set's token
2010-06-24 16:01:39 -07:00
Dianne Hackborn
5827d3eaf3 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Christopher Tate
2950555aac Properly note the current active restore set's token
Bug: 2796780
Change-Id: Iad601ed96ae73cf34910a276350712e6af19bb4e
2010-06-24 15:58:01 -07:00
Dianne Hackborn
2eb12a4722 am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.
Merge commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301' into gingerbread-plus-aosp

* commit '01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301':
  Some ActivityThread/ActivityManager cleanup.
2010-06-24 15:23:59 -07:00
Dianne Hackborn
01e4cfc47d Some ActivityThread/ActivityManager cleanup.
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
  represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
  package scoped.

Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
2010-06-24 15:20:48 -07:00
Jason Sams
8f31bd6b68 Merge "Add matrix ops to RSH headers." 2010-06-24 14:51:28 -07:00
Jason Sams
fae3f6b415 Add matrix ops to RSH headers.
Change-Id: I7e2843983a12e0155114b4a18813799e4341d26f
2010-06-24 13:54:11 -07:00
Gilles Debunne
b6ca723142 Fixed bug 2795971 IME doesn't appear on touching a text field
Refactoring in CL 55138 added an extra condition to display the IME.

Change-Id: I2a4cc83bb39bd2c87ad3bd75ef234cdbdfdad74f
2010-06-24 13:42:34 -07:00
Derek Sollenberger
f39d26605d fix NullPointerException caused by inflating XML Webview that is
defined to be non-visible.

Change-Id: I3233428d1cc74e90c6431cc1796592af6a7a62d8
http://b/2794841
2010-06-24 16:41:04 -04:00
Andreas Huber
3fef4f5a0a am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
Merge commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493'

* commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493':
  Properly identify malformed (too short) chunks in mpeg4 files.
2010-06-24 13:18:12 -07:00
Andreas Huber
95d26de9e0 am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
Merge commit '7b5b27ada12d3680dec20274fa655fd7f73f839e' into gingerbread-plus-aosp

* commit '7b5b27ada12d3680dec20274fa655fd7f73f839e':
  Properly identify malformed (too short) chunks in mpeg4 files.
2010-06-24 13:16:47 -07:00
Andreas Huber
7b5b27ada1 Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread 2010-06-24 13:14:38 -07:00
Dianne Hackborn
5eceb79a19 am 82677b95: am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread
Merge commit '82677b9585968806800abff65c5b1529f509a313'

* commit '82677b9585968806800abff65c5b1529f509a313':
  Add APIs for finding heavy-weight apps.
2010-06-24 12:46:31 -07:00
Dianne Hackborn
82677b9585 am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbread
Merge commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385' into gingerbread-plus-aosp

* commit 'e57c3a88b99856d1e69fdf115e7c7954594b7385':
  Add APIs for finding heavy-weight apps.
2010-06-24 12:42:55 -07:00
Dianne Hackborn
e57c3a88b9 Merge "Add APIs for finding heavy-weight apps." into gingerbread 2010-06-24 12:41:01 -07:00
Nick Pelly
d8a86f0724 am db1bae9a: am 9bf39efb: Do not log AT command traffic by default.
Merge commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978'

* commit 'db1bae9a966150d7f6cc7d3e325cc8a4bf64b978':
  Do not log AT command traffic by default.
2010-06-24 12:29:06 -07:00
Nick Pelly
db1bae9a96 am 9bf39efb: Do not log AT command traffic by default.
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp

* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
  Do not log AT command traffic by default.
2010-06-24 12:27:46 -07:00
Nick Pelly
9bf39efb1b Do not log AT command traffic by default.
Bug: 2792732
Change-Id: I24cb14c14f49e606f0aef1d05a533b90b3dfff53
2010-06-24 12:25:42 -07:00
Nick Pelly
b207c687e5 am 3013fe87: am ab04f978: am d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo
Merge commit '3013fe87fc524cdd788d52cd95dfbe27b2c5d60a'

* commit '3013fe87fc524cdd788d52cd95dfbe27b2c5d60a':
  Do not log AT command traffic by default.
2010-06-24 12:20:00 -07:00