Brad Fitzpatrick
7d6362de06
am 266b74e8: Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken
2010-06-03 16:09:35 -07:00
Brad Fitzpatrick
266b74e875
Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken
2010-06-03 16:07:51 -07:00
Andreas Huber
17dabbdf86
am b8c7548d: am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
2010-06-03 15:33:35 -07:00
Andreas Huber
b8c7548df6
am e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
...
Merge commit 'e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken
* commit 'e896d41699ffe7be932102d7ccc9566f41ddb447':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:31:56 -07:00
Andreas Huber
e896d41699
am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
...
Merge commit '2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp
* commit '2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
2010-06-03 15:30:03 -07:00
Andreas Huber
2e3761ba43
Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
2010-06-03 15:28:13 -07:00
Andreas Huber
3c460f3da0
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
...
Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2
related-to-bug: 2736779
2010-06-03 14:43:57 -07:00
Dirk Dougherty
b7371455e8
am c458d0e3: am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
2010-06-03 13:02:28 -07:00
Dirk Dougherty
c458d0e307
am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
...
Merge commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken
* commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c':
Doc change: Adjust security sandbox description.
2010-06-03 13:00:31 -07:00
Dirk Dougherty
b85a1679a4
am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
...
Merge commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
2010-06-03 12:58:35 -07:00
Dirk Dougherty
85a1c57830
Merge "Doc change: Adjust security sandbox description." into froyo
2010-06-03 12:57:06 -07:00
Brad Fitzpatrick
cfda9f3a47
Sprinkle new BlockGuard around SQLiteDatabase.
...
SQLite is JNI to native code and doesn't go via IFileSystem, so it
needs custom sprinkling, at least for now.
Change-Id: Ic7fded1b64a4f483dfc17b3a7b136c803df1e111
2010-06-03 12:52:54 -07:00
James Dong
a3d1c3cd96
am 57ad0703: am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:32:29 -07:00
James Dong
57ad07039a
am c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken
* commit 'c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:30:03 -07:00
James Dong
c40209ac60
am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
...
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
2010-06-03 11:27:19 -07:00
James Dong
28a92b2e76
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
2010-06-03 11:26:09 -07:00
James Dong
9d96354d70
Fix a Javadoc to clarify when setAudioStreamType() should be called.
...
bug - 2737926
Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
2010-06-03 10:37:28 -07:00
Kenny Root
5095232d25
am 15fe2cb7: Add error checking for translatable strings
2010-06-03 09:36:00 -07:00
Kenny Root
15fe2cb73b
Add error checking for translatable strings
...
Translatable strings that have multiple substitutions should use
positional String.format() substitutions. This change makes it an error
not to use that format on translatable strings that have more than one
substitution in its text.
Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
2010-06-03 09:33:43 -07:00
The Android Open Source Project
913dbc5061
am a9f06fef: am ee7e6a78: merge from open-source master
2010-06-03 09:10:54 -07:00
The Android Open Source Project
a9f06fef8e
am ee7e6a78: merge from open-source master
...
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken
* commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401':
Improved error-handling in Rfc822Tokenizer
2010-06-03 09:09:07 -07:00
The Android Open Source Project
ee7e6a78e2
merge from open-source master
...
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
2010-06-03 09:03:58 -07:00
Dirk Dougherty
5bacbfd39b
Doc change: Adjust security sandbox description.
...
Change-Id: I7b2f530afe65fe0abe6c66e69c9abddcfbc5ae9c
2010-06-02 16:53:00 -07:00
Jeff Brown
1bcc845ff6
am ca583f09: Merge "Fixed some minor bugs in MotionEvent recycling." into kraken
2010-06-02 16:29:37 -07:00
Joe Onorato
5e76d148f2
am 169af47b: remove logging
2010-06-02 16:27:50 -07:00
Joe Onorato
bffd90a564
am c91460d2: Pull the carrier name display in the windowshade out into its own view.
2010-06-02 16:27:45 -07:00
Joe Onorato
e3a6e01c89
am 1a86dd10: Use the built-in handler instead of allocating another one.
2010-06-02 16:27:41 -07:00
Joe Onorato
ed9ce2e03a
am f5510540: Get the ticker working again.
2010-06-02 16:27:36 -07:00
Joe Onorato
283bbf3628
am 9834d534: better debugging "slot" for the notification icons.
2010-06-02 16:27:31 -07:00
Joe Onorato
50515e444c
am 75199e3d: Populate the notifications at startup of SystemUI.apk.
2010-06-02 16:27:26 -07:00
Joe Onorato
cdadef3678
am b77f53b2: Get the IconMerger working again.
2010-06-02 16:27:21 -07:00
Daniel Sandler
f79bceaf62
am 87937dbc: New shadowy status bar, direct from Z\'ha\'dum.
2010-06-02 16:27:15 -07:00
Joe Onorato
9310277c67
am 798ac4c7: Start moving resources to SystemUI.apk.
2010-06-02 16:27:09 -07:00
Joe Onorato
f00734fe34
am 79de0c55: Move the StatusBarPhone package into a new catch-all SystemUI.apk.
2010-06-02 16:27:03 -07:00
Joe Onorato
aa6c3f7717
am 7dd8c6e4: Remove unused files from the service package.
2010-06-02 16:26:56 -07:00
Joe Onorato
f419c63161
am 175f79c5: In fact, switching an item between ongoing and notifications works.
2010-06-02 16:26:48 -07:00
Joe Onorato
04e022ff31
am 5ee67ebf: Get the text appearance compiling
2010-06-02 16:26:41 -07:00
Joe Onorato
b649e90272
am 9c1d8234: Deal with broken notifications.
2010-06-02 16:26:34 -07:00
Joe Onorato
087cc1fa2d
am 871bdb98: Handle bad icon resources.
2010-06-02 16:26:26 -07:00
Joe Onorato
f922ef4561
am 20da8f8a: Implement setAreThereNotifications.
2010-06-02 16:26:17 -07:00
Joe Onorato
85676633cc
am 0e26dffd: updateNotifications works.
2010-06-02 16:26:09 -07:00
Joe Onorato
f6c288aaa9
am 66b4c5bb: Implement removeNotification.
2010-06-02 16:26:01 -07:00
Joe Onorato
bdcc172d6e
am aaba60b2: Notifications don\'t crash when you click them, and pass through events to NotificationManagerService
2010-06-02 16:25:53 -07:00
Joe Onorato
c3c2f605c0
am e345fff2: notifications show
2010-06-02 16:25:44 -07:00
Joe Onorato
34504ffcef
am a0c56fe9: Checkpoint. Doesn\'t build.
2010-06-02 16:25:34 -07:00
Joe Onorato
ef5ce59a47
am 18e69dfc: Checkpoint. Data structures for Notifications in place.
2010-06-02 16:25:25 -07:00
Joe Onorato
599584e7e8
am 6528b355: Remove unused stuff.
2010-06-02 16:25:14 -07:00
Joe Onorato
ff97998a73
am 4762c2d7: Add expand and collapse.
2010-06-02 16:25:04 -07:00
Joe Onorato
ee5d0cafc9
am f3f0e053: Make disable() work.
2010-06-02 16:24:55 -07:00
Joe Onorato
47639ea94e
am 53680172: Remove unused cruft.
2010-06-02 16:24:45 -07:00
