22783 Commits

Author SHA1 Message Date
Robert Greenwalt
34335a012f am 077952f7: am d9b802bd: am 05fa2144: Merge "Trim throttle logs." into froyo 2010-04-22 13:36:41 -07:00
Grace Kloba
0b11f7ae80 am 204eca64: am b42b5a6e: am 2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo 2010-04-22 13:36:34 -07:00
Robert Greenwalt
077952f73e am d9b802bd: am 05fa2144: Merge "Trim throttle logs." into froyo
Merge commit 'd9b802bd03d0ef4792bc99289f16f6a05bd1ee95' into kraken

* commit 'd9b802bd03d0ef4792bc99289f16f6a05bd1ee95':
  Trim throttle logs.
2010-04-22 13:24:37 -07:00
Grace Kloba
204eca6439 am b42b5a6e: am 2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit 'b42b5a6edb08d198caf567acfc0a318547d8be73' into kraken

* commit 'b42b5a6edb08d198caf567acfc0a318547d8be73':
  Post a message to set SurfaceView to be visible when
2010-04-22 13:24:28 -07:00
Shimeng (Simon) Wang
24ea8a8e26 Remove xslt tests from ignored tests list.
The change to enable xslt in Android webkit is:
https://android-git.corp.google.com/g/#change,49420

Change-Id: I0a2e208ffbe493d311efa638cc0624e07226005e
2010-04-22 11:57:37 -07:00
Jeff Hamilton
69e87f9b43 Fix a bug I introduced in CursorAdapter.
It will now properly register the content
observer when used with the auto requery
constructor and auto requery set to false.

Change-Id: I0f3995a2d5f1e27aaeab8c5f2f951fefc8a072e5
2010-04-22 11:26:06 -05:00
Robert Greenwalt
d9b802bd03 am 05fa2144: Merge "Trim throttle logs." into froyo
Merge commit '05fa2144e458dc8f024235ea01b8682055d828bf' into froyo-plus-aosp

* commit '05fa2144e458dc8f024235ea01b8682055d828bf':
  Trim throttle logs.
2010-04-22 09:11:35 -07:00
Robert Greenwalt
05fa2144e4 Merge "Trim throttle logs." into froyo 2010-04-22 09:08:25 -07:00
Robert Greenwalt
bf7de39727 Trim throttle logs.
Removing unwanted sntp logging and throttle logging.

bug:2614927
Change-Id: Ic0b1c3502ebbc1f04130d09d715591af6513f439
2010-04-22 09:04:27 -07:00
Grace Kloba
b42b5a6edb am 2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp

* commit '2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
  Post a message to set SurfaceView to be visible when
2010-04-22 08:23:35 -07:00
Grace Kloba
2fba6d1c1b Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo 2010-04-22 08:20:23 -07:00
Mathias Agopian
e5ba231b55 am 9bce8737: more surfaceflinger cleanups 2010-04-21 22:40:21 -07:00
Mathias Agopian
fb3c87f2f4 am 33c8e2b8: Merge "better fix for [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-21 22:33:18 -07:00
Mathias Agopian
9bce8737f2 more surfaceflinger cleanups
get rid of the "fake rtti" code, and use polymorphism instead.
also simplify how we log SF's state (using polymorphism)

Change-Id: I2bae7c98de4dd207a3e2b00083fa3fde7c467922
2010-04-21 22:28:20 -07:00
Mathias Agopian
33c8e2b8e0 Merge "better fix for [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken 2010-04-21 22:27:22 -07:00
Mathias Agopian
a8a0aa8b92 better fix for [2420565] Surface.lockCanvas() updates the dirty region too often
Change-Id: I83438b40effd21538f1c74396dc665254b9d5ab6
2010-04-21 22:25:35 -07:00
Grace Kloba
8aedd10aca Post a message to set SurfaceView to be visible when
we switch to use the layout size. Otherwise it will
first use the old dimension which can exceed the 
limit, which in turn causes the Browser to crash.

Fix http://b/issue?id=2616263
2010-04-21 21:23:30 -07:00
Kenny Root
32c7e6a371 Merge "Add tests for SettingsProvider.parseProviderList" 2010-04-21 20:24:10 -07:00
Christopher Tate
3457957e67 am 1d6ff5a1: am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo 2010-04-21 18:28:08 -07:00
Christopher Tate
1d6ff5a1f7 am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken

* commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411':
  Fix security hole in Google backup transport registration
2010-04-21 18:19:38 -07:00
Christopher Tate
7e93aad42d am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp

* commit '36fa47139d4621dc4bf8d89caa8650495d901b00':
  Fix security hole in Google backup transport registration
2010-04-21 18:15:44 -07:00
Christopher Tate
36fa47139d Merge "Fix security hole in Google backup transport registration" into froyo 2010-04-21 18:10:20 -07:00
Christopher Tate
a32504fce8 Fix security hole in Google backup transport registration
Previously, it was conceivable that a 3rd party application on a non-GED
device could publish a service that supported the (hidden) IBackupTransport
interface and spoofed the Google backup transport's package and component
name.  This could allow it to secretly intercept all data moved through the
backup mechanism.

Fix by ensuring that the package in question exists and is part of the
OS itself (FLAG_SYSTEM in its ApplicationInfo description) before binding
to it.

Fixes bug #2457063

Change-Id: I3487572be45c2014fa209beacfe3ac6f8270f872
2010-04-21 18:02:56 -07:00
Kenny Root
c2591c14f7 Add tests for SettingsProvider.parseProviderList
Change-Id: Id5c1597cd94b80e0d20ca415b5b7ba32200c1a03
2010-04-21 17:20:32 -07:00
John Wang
701897451b am 81b7ea00: am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 15:00:21 -07:00
John Wang
81b7ea0028 am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken

* commit 'f77fff4b4e904486bf25affde713294d40764e15':
  Add ILLEGAL_SIM_OR_ME error code.
2010-04-21 14:51:43 -07:00
John Wang
f77fff4b4e am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
2010-04-21 14:46:06 -07:00
John Wang
23c0b2eb5a Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo 2010-04-21 14:43:12 -07:00
Steve Block
cef45f3368 Removes XPath layout tests from the Dump Render Tree ignore results list
XPath was enabled in https://android-git.corp.google.com/g/49109

Change-Id: I4704e63965a0bc8ac53b8cbc939242b79d71dc78
2010-04-21 21:55:51 +01:00
John Wang
7fb4b8455c Add ILLEGAL_SIM_OR_ME error code.
It is for bug 2571583 to provide better failure information of network operator selection.

Network selection returns ILLEGAL_SIM_OR_ME when the failure is
permanent and no retries needed, such as illegal SIM, ME, HRL config, etc.

Change-Id: Iaf70bef64d3cbf35e4d9915418cbb5b78607f73e
2010-04-21 11:34:15 -07:00
Joe Onorato
d07d6c6ea7 am a8624186: am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 2010-04-21 11:20:59 -07:00
Joe Onorato
a8624186a6 am 46fba3b9: am 52e70b25: Add title to recent apps dialog.
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken

* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
  Add title to recent apps dialog.
2010-04-21 11:12:29 -07:00
Joe Onorato
46fba3b9e1 am 52e70b25: Add title to recent apps dialog.
Merge commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp

* commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
  Add title to recent apps dialog.
2010-04-21 11:07:43 -07:00
Joe Onorato
52e70b25f8 Add title to recent apps dialog.
Bug: 2614279

Change-Id: I45ebcd2e45140901df246db10f756c07864cccb4
2010-04-21 14:00:44 -04:00
Leon Scroggins III
901a7c230c Remove call to rebuildWebTextView from handling selection change.
The call was originally added to fix bug 2431351, where touching
a <textarea> sent a message with the new selection, but the UI
thread had not yet updated the WebTextView, so the new selection
was ignored.  However, since then,
https://android-git.corp.google.com/g/#change,45476 was submitted
to pass the selection and open the keyboard at the same time. So
when UPDATE_TEXT_SELECTION_MSG_ID is received, we no longer need
to worry about the case where the WebTextView is not set up yet.

Bug 2600847

Change-Id: I19eb102a7188e6edafaa5ac17b19ebd4ab5764f0
2010-04-21 12:37:39 -04:00
The Android Open Source Project
3c0f1aed7c am d29eafdb: am f021d12f: merge from open-source master 2010-04-21 09:24:17 -07:00
The Android Open Source Project
d29eafdba5 am f021d12f: merge from open-source master
Merge commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14' into kraken

* commit 'f021d12f6f7116e9275cd3553a349ce5cb8aab14':
  Allow META* macros outside of the framework
  Fix printing order of phone objects creation
2010-04-21 09:15:15 -07:00
Leon Scroggins III
b24e18b1c0 Update mTextGeneration when setting the selection to the default.
Bug 2610682

Change-Id: Ib3b95cd9443ef31a6c736cdac076260b4f3bbe71
2010-04-21 12:13:49 -04:00
The Android Open Source Project
f021d12f6f merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
2010-04-21 09:10:43 -07:00
Daisuke Miyakawa
6994f31189 Merge "vCard refactoring." 2010-04-21 00:10:59 -07:00
Daisuke Miyakawa
56374c43f7 vCard refactoring.
Change-Id: Ie6c5e0edae4a13279d5118f0380d863e4ff05727
2010-04-21 16:06:09 +09:00
Mathias Agopian
ef08207bd2 am e1d851d3: (-s ours) am 172673cd: (-s ours) am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16 2010-04-20 22:35:24 -07:00
Mathias Agopian
e1d851d36d am 172673cd: (-s ours) am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '172673cd5b21dee6e175ab67235aa19bc2689868' into kraken

* commit '172673cd5b21dee6e175ab67235aa19bc2689868':
  DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
2010-04-20 22:29:05 -07:00
Mathias Agopian
172673cd5b am 83512d4d: DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp

* commit '83512d4dfc06137bc2d9db0cb62644c54f41a771':
  DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
2010-04-20 22:26:45 -07:00
Mathias Agopian
83512d4dfc DO NOT MERGE fix [2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
don't use glDrawTexi() anymore

Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
2010-04-20 21:55:40 -07:00
Jeff Brown
b633123f9b am bba573c2: am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 18:05:50 -07:00
Jeff Brown
bba573c211 am ccc96754: am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8' into kraken

* commit 'ccc96754c5c6e31d6f782c3adeb06ad1694221d8':
  Fix PM crash due to bad array bookkeeping logic.
2010-04-20 17:57:29 -07:00
Jeff Brown
ccc96754c5 am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp

* commit '22caecda8a24c971972d78a112279c48f242d529':
  Fix PM crash due to bad array bookkeeping logic.
2010-04-20 17:54:59 -07:00
Jeff Brown
22caecda8a Merge "Fix PM crash due to bad array bookkeeping logic." into froyo 2010-04-20 17:53:00 -07:00
Robert Greenwalt
76944798f5 am 54f5ecc6: am 9127d9a5: am be348964: Merge "Move Tethering off the ServerThread." into froyo 2010-04-20 17:48:54 -07:00