Dianne Hackborn
834910f51f
am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-11 10:28:20 -07:00
Jim Miller
f5eaee96b0
am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-11 10:28:06 -07:00
Dianne Hackborn
7d5cea988b
am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken
* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Jim Miller
99dcfe7cda
am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken
* commit '4d89954dc4572a05339dc7a95ec683892558162b':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:23:42 -07:00
Dianne Hackborn
7e76b6d191
am 6d00151c: Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
...
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp
* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
Hopefully fix issue #2662536 : Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Jim Miller
4d89954dc4
am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
...
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp
* commit 'a27579016caf1438400a3637e3896bec653e3756':
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:18:38 -07:00
Steve Block
52ab0b39fc
Merge webkit.org at r58033 : Update the WebKit UA string and LayoutTest ignore list
...
Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
2010-05-11 14:28:10 +01:00
Mike Lockwood
31ac8e9d56
Add new permission android.permission.ACCESS_USB to allow access to USB devices
...
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-11 08:29:19 -04:00
Wu-cheng Li
f0b8679b5d
am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:07:54 -07:00
Wu-cheng Li
e1b2b3b0d2
Merge "Add continuous focus mode constant." into kraken
2010-05-10 20:04:14 -07:00
Konstantin Lopyrev
6707341b28
Fixing bug 2660263, changed text for PIN unlock
...
Change-Id: I904c7c4753b68195fbd547e97207aa3cceef3c6d
2010-05-10 18:02:31 -07:00
Dianne Hackborn
6d00151c51
Merge "Hopefully fix issue #2662536 : Why is launcher being killed?" into froyo
2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574
Hopefully fix issue #2662536 : Why is launcher being killed?
...
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all. This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at. I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.
In addition, this change cleans up and reduces some of the logging
around killing processes.
Finally, try to improve process LRU management a bit by taking
into account process dependencies. Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving. Also, we bring a process up if someone accesses its content
provider.
Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
2010-05-10 17:19:58 -07:00
Nicolas Roard
46318cf9bf
Fix the 'wobbling fixed elements' bug.
...
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149 )
Bug:2665696
Change-Id: I28516005d03afa866efed2677197120ac6e2d579
2010-05-10 16:35:52 -07:00
Jim Miller
a27579016c
Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6
Fix 2660488: Add LockScreen/InCallScreen resources to preloads
...
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.
Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
2010-05-10 15:24:47 -07:00
Robert Greenwalt
858510ca40
am 8ada6786: am da7bf206: am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:18:37 -07:00
Robert Greenwalt
da7bf20608
am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
...
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken
* commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
String change to refer to wifi tether as hotspot
2010-05-10 10:14:51 -07:00
Robert Greenwalt
c8d1556fb8
am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
...
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp
* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
String change to refer to wifi tether as hotspot
2010-05-10 10:12:58 -07:00
Robert Greenwalt
b74a239fd2
Merge "String change to refer to wifi tether as hotspot" into froyo
2010-05-10 10:11:12 -07:00
Dan Egnor
07704f1f66
am 6bff8df8: am 1a373db0: am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
2010-05-10 09:56:41 -07:00
Dan Egnor
1a373db021
am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
...
Merge commit '5610c2871b5a8abab081c9e209925e2f0f2e3966' into kraken
* commit '5610c2871b5a8abab081c9e209925e2f0f2e3966':
Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:49:41 -07:00
Dan Egnor
5610c2871b
am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
...
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp
* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:43:53 -07:00
Seth Pensack-Rinehart
b7332c714c
Fix Javadoc typo for Spanned.SPAN_EXCLUSIVE_INCLUSIVE
...
Change-Id: I82d15bde9444beca83eb78349212125cae525a6e
2010-05-10 17:44:12 +09:00
Wu-cheng Li
ca09961484
Add continuous focus mode constant.
...
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
2010-05-10 15:14:56 +08:00
Chih-Chung Chang
fdaa7790e8
am c2ed1817: am e25cc656: Support multiple cameras in framework.
2010-05-09 20:43:47 -07:00
Chih-Chung Chang
e25cc65639
Support multiple cameras in framework.
...
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
2010-05-10 11:21:14 +08:00
Dan Egnor
7d16737668
Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
2010-05-09 07:03:46 -07:00
Robert Greenwalt
ebdbc7ec11
String change to refer to wifi tether as hotspot
...
bug:2664412
Change-Id: I9ab110f88551d03a9215b81887675c50aa575d9a
2010-05-08 15:07:53 -07:00
Shimeng (Simon) Wang
db990751ef
Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt
...
Note: this change doesn't solve the Arabic country code top level domains, which
was turned on today. For that, more changes need to be done; probably we need a way
to convert the BiDi url to punycode first; then apply this URL pattern.
issue: 2663885
Change-Id: I0597fe620c4d44259bff88ecfcbcca1565928c6f
2010-05-07 14:59:04 -07:00
Nicolas Roard
e1acf11199
Merge "Add the HTML5Audio class, to support the audio tag. The corresponding webkit C++ CL is https://android-git.corp.google.com/g/#change,41405 "
2010-05-07 12:45:05 -07:00
Nicolas Roard
4b71913ea7
Add the HTML5Audio class, to support the audio tag.
...
The corresponding webkit C++ CL is https://android-git.corp.google.com/g/#change,41405
Change-Id: Ia4169c353cde8cd8ee5786b874ff466897e3553e
2010-05-07 12:01:43 -07:00
Dianne Hackborn
f121be737c
Improvements to fragment API:
...
- Remove names associated with fragments (we'll use ids). They may
come back for other uses.
- Add method to replace a fragment, to help in doing back stacks.
- Add names to back stack states, to allow for jumping back to
known states.
- Add ability to set animations associated with fragments being
added or removed.
Change-Id: Ic2799f06947b1511fb1df5965ca32568b860b3c3
2010-05-07 11:31:03 -07:00
Dan Egnor
43fe81bc2c
Add unit test for passing thread priority & cgroup through Binder.
...
This test actually exposes some bugs -- the test passes as written, but
certain parts are commented out with references to the bugs in question.
Bug: 2665914
Bug: 2665954
Change-Id: I61220e0efadc4edbb6ad419d26fa1f0f50bbc24c
2010-05-07 09:32:54 -07:00
Leon Scroggins
7550a9580a
Merge "Fix selection off-by-one bug."
2010-05-07 06:14:19 -07:00
Leon Scroggins
6a367f5cb0
Provide a getter to tell the index of the current found match.
...
Part of fix for bug 2663680
Requires a change to external/webkit.
Change-Id: I1279963cf219eb365dd72262710f87c83acd8c4d
2010-05-07 09:11:09 -04:00
Bjorn Bringert
78531d1b34
am c688d336: am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
2010-05-07 03:47:35 -07:00
Bjorn Bringert
74612539d2
am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
...
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken
* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:43:48 -07:00
Bjorn Bringert
c8170ee205
am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
...
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp
* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00
Bjorn Bringert
75370e7462
Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
2010-05-07 03:37:48 -07:00
Shimeng (Simon) Wang
d3b562ad87
Merge "Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt ""
2010-05-06 20:49:12 -07:00
Shimeng (Simon) Wang
cbeaf2d0ae
Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt "
...
This reverts commit 63b849ef8d6a47422b0f2779f1d9320f6a65d16b.
2010-05-06 20:45:55 -07:00
Daniel Sandler
ad2f9ff786
am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
...
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp
* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:24:22 -07:00
Daniel Sandler
08e1b94c5c
Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
2010-05-06 17:23:03 -07:00
Doug Felt
0b9d2ca6b6
Fix selection off-by-one bug.
...
The wrong value was used to measure the width of unidirectional text.
Change-Id: I57752c111641ca1cc951e0647b60c79f5a9493ad
2010-05-06 17:16:31 -07:00
Kenny Root
18b3cad7cf
am 33ff6cdb: am b658cc42: Merge "Prevent local reference table overflows" into kraken
2010-05-06 17:15:48 -07:00
Kenny Root
b658cc42aa
Merge "Prevent local reference table overflows" into kraken
2010-05-06 17:12:13 -07:00
Christopher Tate
10c40078d0
am 5cfec530: am fa9e7c05: Sketch of Native input for MessageQueue / Looper / ViewRoot
2010-05-06 17:10:40 -07:00
Xia Wang
ac18a05811
am 4b86be10: am 0bfc3973: am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
2010-05-06 17:10:31 -07:00
Neal Nguyen
1acadbc69c
am 529ad92e: am bda001aa: am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
2010-05-06 17:10:22 -07:00