Mathias Agopian
18fa1de510
am cfa6de70: am 593c05ce: clean-up client management.
2010-06-04 19:17:08 -07:00
Mathias Agopian
cfa6de7017
am 593c05ce: clean-up client management.
2010-06-04 19:15:38 -07:00
Mathias Agopian
593c05ce7b
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
Vasu Nori
81b65ebc52
Merge "when database is opened, set journal_mode to TRAUNCATE"
2010-06-04 17:09:00 -07:00
Vasu Nori
f9e2bd085f
when database is opened, set journal_mode to TRAUNCATE
...
this journal_mode is more efficnent than the default journal_mode (DELETE)
Change-Id: I8879d3fe8dda410f4674ead9270aa7ecdaf91b5e
2010-06-04 17:08:31 -07:00
Alex Sakhartchouk
89ec91b64d
Merge "Removing debug output."
2010-06-04 16:13:27 -07:00
Alex Sakhartchouk
422ce6b4db
Removing debug output.
...
Change-Id: I05bd821607e3312180ed910313c88722a7c13f22
2010-06-04 16:10:12 -07:00
Dianne Hackborn
e399f9d33f
Merge "Fix issue #2733766 : Crash in Gallery onDestroy: java.lang.RuntimeException"
2010-06-04 15:26:35 -07:00
Konstantin Lopyrev
93f588ce3a
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
ddcafcbd62
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
Dianne Hackborn
c39a5dcbe1
Fix issue #2733766 : Crash in Gallery onDestroy: java.lang.RuntimeException
...
Change-Id: I1c67a6603c23d15fef9a6912c86ffdf77aaa8654
2010-06-04 14:34:29 -07:00
Adam Powell
e25d3d1ef8
Merge "Fix doc build"
2010-06-04 14:25:21 -07:00
Adam Powell
a984b38df5
Fix doc build
...
Change-Id: Ia0425bc956540bbd5f16138ad182ae365bf1c85a
2010-06-04 14:20:10 -07:00
Jeff Hamilton
a896308c0e
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
1578e1acbc
am 420e7ec7: am fef42db9: Add sample code.
2010-06-04 14:11:14 -07:00
Dianne Hackborn
d0b15cecc6
resolved conflicts for merge of f3307ae8 to master
...
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
2010-06-04 14:09:02 -07:00
Jeff Hamilton
a724feb277
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
66236db38d
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
1e2e2aea8c
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
420e7ec77a
am fef42db9: Add sample code.
2010-06-04 13:41:58 -07:00
Dianne Hackborn
fef42db925
Add sample code.
...
Change-Id: I8f598dcbccbb0c43cedc1e1d02f6e3a46d6ebc67
2010-06-04 13:38:43 -07:00
Adam Powell
1bba846ed1
Merge "Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles."
2010-06-04 13:33:40 -07:00
Dianne Hackborn
f3307ae892
am faed5fbf: Merge "Add support for heavy-weight applications." into kraken
2010-06-04 13:31:54 -07:00
Dianne Hackborn
faed5fbf15
Merge "Add support for heavy-weight applications." into kraken
2010-06-04 13:30:32 -07:00
Jeff Hamilton
4b3309211e
Don't crash when low storage is encountered pre-boot completion.
...
Bug: 2741633
Change-Id: Ic073ead64ff43b2e2c32b439756cd71c2b6550b8
2010-06-04 15:16:06 -05:00
The Android Open Source Project
eefd63e357
am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master
2010-06-04 13:02:38 -07:00
The Android Open Source Project
0a0c57f929
am 7c035d8a: am 2d743fe2: merge from open-source master
2010-06-04 13:00:37 -07:00
The Android Open Source Project
7c035d8a65
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
Adam Powell
c3fa6304c9
Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner
...
(optionally) to use it. Added associated styles.
ListPopupWindow allows apps to present a popup window of options to
the user that will correctly dodge the IME if needed.
Change-Id: I509c6c45036856daab686a6edeb7a9de1e72eb0a
2010-06-04 12:18:16 -07:00
Vasu Nori
d2cecfd375
fix broken-test
...
Change-Id: I3d33cda2e4f1ba68843d6a81b8c624ce4af8519f
2010-06-04 12:05:58 -07:00
The Android Open Source Project
2d743fe2f3
merge from open-source master
...
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
2010-06-04 11:08:36 -07:00
Alex Sakhartchouk
0829f0d51f
Merge "Creating the jni and java layer to integrate a3d"
2010-06-04 10:10:24 -07:00
Dianne Hackborn
860755faa6
Add support for heavy-weight applications.
...
Only one can be running at a time, their process can not be killed,
and a notification is posted while it is running.
Change-Id: I843015723947e0c934ae63a1aeee139327c0bc01
2010-06-04 10:09:13 -07:00
Alex Sakhartchouk
aae74ad614
Creating the jni and java layer to integrate a3d
...
Change-Id: I438359633bae59bf9188cd2c4664a92ca16c5f37
2010-06-04 10:06:50 -07:00
Jaikumar Ganesh
4a575c682b
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
bcc112b16a
am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken
2010-06-04 09:47:47 -07:00
Jaikumar Ganesh
f8acea6ccb
Merge "Delete local references to avoid reference table overflow." into kraken
2010-06-04 09:46:03 -07:00
Mike Lockwood
b0ccc7ca75
Merge "MTP: Add support for host cancellation of file transfers."
2010-06-04 07:20:16 -07:00
Mike Lockwood
a82d3c550b
MTP: Add support for host cancellation of file transfers.
...
Change-Id: I72df423f8017286e41adae525e6fbcb6b8440687
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-06-04 09:49:21 -04:00
Wu-cheng Li
baff93de27
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
ab5e67c60d
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
cefb01abbf
Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
2010-06-04 03:38:25 -07:00
Wu-cheng Li
8aba232dbc
Add KEY_SUPPORTED_METERING_MODES and fix some typos.
...
bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
2010-06-04 17:18:17 +08:00
Eric Laurent
4b18200b9c
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
030a15531c
am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
2010-06-04 00:16:05 -07:00
Eric Laurent
2ea200c5a7
Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
2010-06-04 00:14:46 -07:00
Doug Kwan
77205ace4e
Merge "Add missing library to linker command line."
2010-06-03 22:53:25 -07:00
Doug Kwan
bebfb6aa0c
Add missing library to linker command line.
...
Change-Id: Ia9ddf6e6bb5e72c32372a2f460806b6cbb7ec660
2010-06-03 22:49:34 -07:00
Wu-cheng Li
3c358eb7bd
am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken
2010-06-03 22:35:40 -07:00
Wu-cheng Li
2f98f99cd1
am 5f5df382: Merge "Add camera metering mode API." into kraken
2010-06-03 22:33:15 -07:00
