Brett Chabot
185f1a9668
Merge "IME test fixes." into froyo
2010-04-08 16:36:02 -07:00
Robert Greenwalt
673a2f6273
am b2216375: am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:30:55 -07:00
Robert Greenwalt
b221637559
am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:28:08 -07:00
Robert Greenwalt
da0498c598
am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken
* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
Updating some notificiation UI for Throttling
2010-04-08 16:25:54 -07:00
Robert Greenwalt
6cf3d4aa76
am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp
* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
cc691f5061
Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:09:31 -07:00
Robert Greenwalt
c87dc6dc90
Updating some notificiation UI for Throttling
...
String update and make one an ongoing notification.
bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
2010-04-08 16:00:26 -07:00
Dan Egnor
a8369d875d
am 9a907e75: am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:59:49 -07:00
Dan Egnor
9a907e75bc
am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:57:02 -07:00
Brett Chabot
1d679147d5
IME test fixes.
...
Tweak OneEditTextActivitySelectedTests:testSoftKeyboardAutoPop so it always
expects IME to be shown for devices with no hard keyboard.
Bug 2267311 2318969
Change-Id: Ica31e8f1153cf3e7dbc838d263ea0ae805161610
2010-04-08 14:55:24 -07:00
Dan Egnor
a40b3a8d98
am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
...
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken
* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
2010-04-08 14:53:06 -07:00
Dan Egnor
c1420832a8
am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
...
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp
* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
Change TrafficStats to a new JNI implementation.
2010-04-08 14:48:50 -07:00
Dan Egnor
5945579e4e
Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:45:07 -07:00
Dan Egnor
7829f3d4b1
am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:28:29 -07:00
Dan Egnor
c138fd3a77
am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:24:15 -07:00
Dan Egnor
a28a05f31b
am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
2010-04-08 14:19:52 -07:00
Grace Kloba
923c53b993
am f1055bd5: am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during
2010-04-08 14:19:38 -07:00
Grace Kloba
f1055bd590
am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling,
2010-04-08 14:17:15 -07:00
Dan Egnor
f1f00f5bdd
am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp
* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
Missed these ones in the previous rename.
2010-04-08 14:15:29 -07:00
Brad Fitzpatrick
3f73e4869f
am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
2010-04-08 14:14:46 -07:00
Scott Main
54d89bdf37
Merge "docs: rewrite resources documentation"
2010-04-08 14:13:10 -07:00
Grace Kloba
edcac52a4e
am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate ca
...
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken
* commit '642d1556f13ac13f07515309288214e532029c50':
For performance reason, we choose to block the picture
2010-04-08 14:12:58 -07:00
Brad Fitzpatrick
341d0a5222
am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
2010-04-08 14:12:20 -07:00
Dan Egnor
2124808060
Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:10:50 -07:00
Andreas Huber
c944cbe28e
Support for ID3 V2.4 tags.
...
Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c
related-to-bug: 2581869
2010-04-08 14:09:54 -07:00
Brad Fitzpatrick
9c3554e997
am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken
* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Brad Fitzpatrick
a8fbedbf5e
Missed these ones in the previous rename.
...
BUG=2581935
Change-Id: I12e7fc924d7164ab4a5ff7bd6ee52a10f7551ad4
2010-04-08 14:08:54 -07:00
Grace Kloba
642d1556f1
am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%.
...
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp
* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
For performance reason, we choose to block the picture
2010-04-08 14:08:35 -07:00
Jeff Brown
e684d9582c
Workaround NPE caused by packages missing signatures.
...
Bug: b/2547993
Change-Id: Idcd4fc3ee4c2560a00a952e1910a50b30b736114
2010-04-08 14:05:11 -07:00
Grace Kloba
3f73549bc8
Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo
2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
4183b514bb
am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp
* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
c62cdef4ec
Merge "Rename logtag for clarity." into froyo
2010-04-08 14:01:23 -07:00
Jeff Brown
4879b52ea0
am 281a687c: am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:58:54 -07:00
Andreas Huber
6bd70017bd
am 3bf36221: am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 13:56:19 -07:00
Robert Greenwalt
ac6ec41b67
resolved conflicts for merge of 4e33e9c1 to master
...
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Jeff Brown
281a687ca9
am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:54:12 -07:00
Jeff Brown
a07fd3c5a6
am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Merge commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken
* commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:51:48 -07:00
Jeff Brown
a30b596d6a
am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp
* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:49:55 -07:00
Jeff Brown
e760072a98
Improve robustness of package manager certificate collection.
...
The package manager contains an optimization which reuses cached
signatures instead of reloading them on startup if the package
appears to be unchanged. This commit adds an extra check to ensure
that the PackageSettings object actually has valid signatures since
it has happened that they have gone missing. Unfortunately it does
not address the root cause of the problem but it should alleviate the
symptoms after a reboot.
Bug: b/2547993
Change-Id: I41900c6a752711eb3a901360e3bb29aec946d0be
2010-04-08 13:49:17 -07:00
Jeff Brown
ec7c78fbf5
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Bug: b/2553489
Change-Id: I681b3f9a243777b931298cc93c9d34c8d7eae0f2
2010-04-08 13:45:06 -07:00
Brad Fitzpatrick
228629e920
Rename logtag for clarity.
...
BUG=2581935
Change-Id: I85f0b704435861acd5a406ce5ec084b60696580c
2010-04-08 13:25:46 -07:00
Andreas Huber
3bf362215b
am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 12:53:23 -07:00
Robert Greenwalt
4e33e9c17e
am 6646cf7a: am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
2010-04-08 12:53:18 -07:00
Andreas Huber
3eade67b82
am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
...
Merge commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken
* commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c':
Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:49:41 -07:00
Robert Greenwalt
6646cf7af9
am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken
* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Andreas Huber
b52e9f748c
am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
...
Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp
* commit 'eb12e45f7a92fd424988451256c82605d086245d':
Refactor connection/redirection code, support redirects on reconnection.
2010-04-08 12:45:59 -07:00
Robert Greenwalt
6f72a313a0
am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
...
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp
* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Andreas Huber
eb12e45f7a
Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 12:44:33 -07:00
Robert Greenwalt
2b4b573801
Merge "Add service to monitor/control the flow of data." into froyo
2010-04-08 12:42:09 -07:00
Robert Greenwalt
9e696c29f0
Add service to monitor/control the flow of data.
...
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
