Commit Graph

16958 Commits

Author SHA1 Message Date
Robert Greenwalt
94792dbc32 am f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
2010-06-06 12:10:00 -07:00
Grace Kloba
7d13a28bd1 Merge "Do not call AlertDialog.show() if the context is not the focused Activity. In that case, just take the default cancel." 2010-06-04 21:36:45 -07:00
Roman Nurik
f840ebc2fb Merge "Revamp resources listing, part 1 (frameworks/base)" 2010-06-04 20:20:10 -07:00
Mathias Agopian
fcd61524e8 am f5f7d389: am fae5cb2b: optimize Surface.readFromParcel() 2010-06-04 19:17:16 -07:00
Mathias Agopian
e78d81eddd am fd89b1c8: am 7623da43: split surface management from surface\'s buffers management 2010-06-04 19:17:12 -07:00
Mathias Agopian
a0b3ad88db am cfa6de70: am 593c05ce: clean-up client management. 2010-06-04 19:17:08 -07:00
Mathias Agopian
9888e3ebfd am fae5cb2b: optimize Surface.readFromParcel() 2010-06-04 19:15:46 -07:00
Mathias Agopian
c7a4570cd7 am 7623da43: split surface management from surface\'s buffers management 2010-06-04 19:15:42 -07:00
Mathias Agopian
4e24a5671b am 593c05ce: clean-up client management. 2010-06-04 19:15:38 -07:00
Mathias Agopian
a0c30e9241 optimize Surface.readFromParcel()
this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.

we now more intelligentely read from the parcel and construct the new
object only if needed.

Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267
2010-06-04 18:57:41 -07:00
Mathias Agopian
b7e930db17 split surface management from surface's buffers management
Change-Id: If3c5655d1231f8f0c49ba68f972b1b20c93b3f87
2010-06-04 18:57:41 -07:00
Mathias Agopian
96f0819f81 clean-up client management.
simplified things a lot, the biggest change is that the concept
of "ClientID" is now gone, instead we simply use references.

Change-Id: Icbc57f80865884aa5f35ad0d0a0db26f19f9f7ce
2010-06-04 18:57:40 -07:00
Christopher Tate
076c8394fa am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires
2010-06-04 18:07:07 -07:00
Christopher Tate
7188d6887e Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-04 18:06:07 -07:00
Vasu Nori
aa5e3b769b Merge "when database is opened, set journal_mode to TRAUNCATE" 2010-06-04 17:09:00 -07:00
Dianne Hackborn
f896be96c9 am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
2010-06-04 16:33:48 -07:00
Dianne Hackborn
28b9f6e900 Merge "xhdpi" into froyo 2010-06-04 16:32:01 -07:00
Alex Sakhartchouk
685013e65a Merge "Removing debug output." 2010-06-04 16:13:27 -07:00
Robert Greenwalt
227232f703 am f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
2010-06-04 15:57:21 -07:00
Robert Greenwalt
0f3ca0faea Merge "Make the DUN apn data secure." into froyo 2010-06-04 15:55:09 -07:00
Dianne Hackborn
2071f29ab5 Merge "Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException" 2010-06-04 15:26:35 -07:00
Konstantin Lopyrev
f2c4dca462 Merge "Fix 1684100: Making sure that empty package, type and resource ids are not accepted." 2010-06-04 15:11:50 -07:00
Konstantin Lopyrev
bad51959c5 Fix 1684100: Making sure that empty package, type and resource ids are not accepted.
Change-Id: I4c94877e4312e9a5b4d22c8625069ca056c62e40
2010-06-04 14:37:37 -07:00
Adam Powell
c4da1b9c2b Merge "Fix doc build" 2010-06-04 14:25:21 -07:00
Jeff Hamilton
21560a43af am a724feb2: am 66236db3: am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 2010-06-04 14:11:19 -07:00
Dianne Hackborn
defdc0d523 am 420e7ec7: am fef42db9: Add sample code. 2010-06-04 14:11:14 -07:00
Dianne Hackborn
2595c39664 resolved conflicts for merge of f3307ae8 to master
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
2010-06-04 14:09:02 -07:00
Jeff Hamilton
9b44929e0f am 66236db3: am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion. 2010-06-04 13:55:02 -07:00
Jeff Hamilton
a81aea7eca am 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken

* commit '1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
  Don't crash when low storage is encountered pre-boot completion.
2010-06-04 13:52:45 -07:00
Jeff Hamilton
e0f5def3fd am 4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp

* commit '4b3309211ed6f3532b44481945a4725143d50b8a':
  Don't crash when low storage is encountered pre-boot completion.
2010-06-04 13:50:31 -07:00
Dianne Hackborn
d404468080 am fef42db9: Add sample code. 2010-06-04 13:41:58 -07:00
Adam Powell
265b59ab70 Merge "Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles." 2010-06-04 13:33:40 -07:00
Dianne Hackborn
0fbf3ec3a1 am faed5fbf: Merge "Add support for heavy-weight applications." into kraken 2010-06-04 13:31:54 -07:00
Dianne Hackborn
c346eca2a9 Merge "Add support for heavy-weight applications." into kraken 2010-06-04 13:30:32 -07:00
The Android Open Source Project
ac4f92a1a3 am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:02:38 -07:00
The Android Open Source Project
76be51e50e am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:00:37 -07:00
The Android Open Source Project
6cd6b7bb08 am 2d743fe2: merge from open-source master
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken

* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
  Add better error handling for savePicture and restorePicture
2010-06-04 12:58:09 -07:00
The Android Open Source Project
dc544d2168 merge from open-source master
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
2010-06-04 11:08:36 -07:00
Alex Sakhartchouk
c7538b0eaf Merge "Creating the jni and java layer to integrate a3d" 2010-06-04 10:10:24 -07:00
Jaikumar Ganesh
df0cf83c9e am bcc112b1: am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:49:10 -07:00
Jaikumar Ganesh
b06c29505c am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:47:47 -07:00
Jaikumar Ganesh
86b728906f Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:46:03 -07:00
Mike Lockwood
1f21153d59 Merge "MTP: Add support for host cancellation of file transfers." 2010-06-04 07:20:16 -07:00
Wu-cheng Li
2d02149206 am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:41:44 -07:00
Wu-cheng Li
5226711273 am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:39:44 -07:00
Wu-cheng Li
a23707b1c2 Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken 2010-06-04 03:38:25 -07:00
Eric Laurent
0d20832fbf am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:18:07 -07:00
Eric Laurent
bf0ce27523 am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:16:05 -07:00
Eric Laurent
b5ac790af2 Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken 2010-06-04 00:14:46 -07:00
Doug Kwan
526213cf9b Merge "Add missing library to linker command line." 2010-06-03 22:53:25 -07:00