13692 Commits

Author SHA1 Message Date
Brad Fitzpatrick
b835d9abd6 am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'

* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
  Unify some duplicate StrictMode-enabling code.
2010-09-15 11:37:54 -07:00
Romain Guy
9ec0c471c1 am 282315e1: am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '282315e154b63a2eec84609600c81ad9e1c72994'

* commit '282315e154b63a2eec84609600c81ad9e1c72994':
  Change the keep alive time for excess idle threads.
2010-09-15 11:37:37 -07:00
Brian Carlstrom
b3f23da320 am e68f8b7e: am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0'

* commit 'e68f8b7ebe898ec06d7a156964d498e3d0a2e6c0':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-15 11:37:22 -07:00
Brian Carlstrom
7352c8bb42 am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773'

* commit '0535d8577fb2a3687428f462c591ae3220e1f773':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-15 11:36:58 -07:00
David Brown
0237cf2eac am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp

* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem
2010-09-15 11:15:14 -07:00
David Brown
8626d1a336 Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread 2010-09-15 11:11:18 -07:00
Dianne Hackborn
d0fa371f27 Add a new "activated" state to View.
Use this in ListView and GridView if the top view is not checkable.

This allows PreferenceActivity to now highlight the current heading
that is being shown.

Change-Id: I0d28aded9a61a42962b4aece420ae4058712d963
2010-09-15 11:00:44 -07:00
Daisuke Miyakawa
53b34a096b Merge "Take apart LocalePicker#onListItemClick() into two" 2010-09-15 10:54:42 -07:00
Daisuke Miyakawa
88b7349125 Take apart LocalePicker#onListItemClick() into two
It takes some time when Locale is actually switched by the system,
which looks "system halt". Previous implementation doesn't allow
developers to cope with the situation and they just had to let
users wait for a moment.

This change allows the LocalePicker users (developers) to hook
the item change and delay the actual halt. If they don't want it,
calling updateLocale() immediately works fine.

Related
- I29685118467bd2a68b80abcf234f91098839be0b
- Iba7378e51e6d5318e901045ebeda63ea954a0647

Change-Id: I4062a70e11600d87e889b40d30796387c7069e21
2010-09-15 09:21:25 -07:00
Leon Scroggins
366622b165 Merge "Exit action mode when destroying the WebView or loading." 2010-09-15 08:47:57 -07:00
Leon Scroggins
05919f2133 Exit action mode when destroying the WebView or loading.
Bug: 3000317

Change-Id: I7f131d5c159058c33c3249ee4e0fee3a667ec6d8
2010-09-15 11:43:49 -04:00
Irfan Sheriff
3a79c53a25 Merge "Add per network static IP settings" 2010-09-15 08:31:03 -07:00
Leon Scroggins III
ad533cd555 am 720d5985: am 901b7b9b: am ca8f3d04: Merge "Add an option to hide the Voice Search icon." into froyo
Merge commit '720d5985f5d31912c97b7e549230d241e58c1298'

* commit '720d5985f5d31912c97b7e549230d241e58c1298':
  Add an option to hide the Voice Search icon.
2010-09-15 07:08:49 -07:00
Jaikumar Ganesh
ea8e8d7342 am b390728b: am a224f70b: Fix interaction between BluetoothEventLoop and BluetoothService.
Merge commit 'b390728b54805ecba3e0690edf2b83b60933e6a7'

* commit 'b390728b54805ecba3e0690edf2b83b60933e6a7':
  Fix interaction between BluetoothEventLoop and BluetoothService.
2010-09-15 07:07:38 -07:00
Jeff Brown
dc1ab4b5cc Input API review.
Drop currently unsupported input features.
Add documentation comments.

Change-Id: I407d2e1dd90c5ee82983a3ccf177430d35ee7592
2010-09-14 20:46:14 -07:00
Chris Palmer
c5e2e26b9d am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5' into gingerbread-plus-aosp

* commit '5bade703fd8434ba4cd5c9d1e8e1dc0f383b32b5':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-14 17:45:59 -07:00
Chris Palmer
5bade703fd Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread 2010-09-14 17:43:31 -07:00
Vasu Nori
c62c8ae192 Merge "fix bugs in exception throwing code in native_fillwindow" 2010-09-14 16:40:24 -07:00
Vasu Nori
77267fc68f fix bugs in exception throwing code in native_fillwindow
when exceptions are thrown, they are not being handled correctly
and the end result is some random errors/exceptions.
also change LOGD to LOGD_IF(cond,...) in keeping with Android
standards

Change-Id: Ie7f5e5e4b071ca6b2a6aa899c678c81f9ccd8e71
2010-09-14 16:38:01 -07:00
David Brown
f4ece2086f Mark MODIFY_PHONE_STATE permission as signatureOrSystem
This permission isn't needed right now, since there aren't actually any
public APIs that require it.  (There are a few calls in the ITelephony
interface that do, but they're all hidden.)

Since there's no good reason for 3rd party apps to declare it, let's
mark it signatureOrSystem for now.  We can bring it back -- and probably
split it apart into multiple finer-grained permissions -- once we
finally expose full telephony APIs to 3rd party apps (see bug 1043005).

Bug: 2989096
Change-Id: Idf898d5e12d648a959f622cd815e75597195aa82
2010-09-14 16:19:31 -07:00
Erik
0b46070d88 am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487' into gingerbread-plus-aosp

* commit '426ee7f22eeaa016cdbf0addbb7b2cc6b6cc3487':
  Fixes some bugs in TimeZoneUtils
2010-09-14 16:19:03 -07:00
Irfan Sheriff
31b62322bf Add per network static IP settings
Remove the existing global static IP settings and add support
for per network configuration

Change-Id: I5a6d8b877471b8c8ad07951c96d273893754607f
2010-09-14 16:15:22 -07:00
Erik
426ee7f22e Fixes some bugs in TimeZoneUtils
TimeZoneUtils was updating the db and modifying the selection. This
creates a static selection for each update type and creates new
values for each update. Also adds a method for apps to force the
local tz cache to refresh if they think another app has modified
the db.

Change-Id: Iaaade635ac8ff11bb116005a0f6b44efcd4c4056
2010-09-14 16:08:55 -07:00
Vasu Nori
071df261ed change TAG value from "Cursor" to "SQLiteCursor"
it is confusing to figure out where the debug messages are coming from.
this TAG value change helps

Change-Id: I3a6f445fbced4a962cc13dbb8dd1d7968f9aec9d
2010-09-14 16:02:02 -07:00
Jeff Brown
14bc6b5d06 am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73' into gingerbread-plus-aosp

* commit '09340a4bb99507d9b6bfbfc68a450d4d4f354d73':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-14 15:32:03 -07:00
Jaikumar Ganesh
4c9a5be4a3 Merge "Rework Bluetooth tethering networking configuration." 2010-09-14 15:27:47 -07:00
Jeff Brown
09340a4bb9 Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread 2010-09-14 15:27:33 -07:00
Jaikumar Ganesh
707952ecd4 Rework Bluetooth tethering networking configuration.
Limit it to 5 for now, and store the iface.

Change-Id: Ia6044b8e8f886dcd587ab0bb57273e0c11b6cd74
2010-09-14 15:25:14 -07:00
Adam Powell
6fe4e3fd36 Merge "Improve ListView smooth scrolling timing" 2010-09-14 15:14:56 -07:00
Adam Powell
234a571530 Improve ListView smooth scrolling timing
Change-Id: Icbd727efd5bafa1a80d65003aead1697f6103fda
2010-09-14 15:12:11 -07:00
Vasu Nori
a4ab724b48 Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5" 2010-09-14 13:37:57 -07:00
Shimeng (Simon) Wang
cbce2e7da4 Merge "Fix comment." 2010-09-14 13:37:37 -07:00
Vasu Nori
b83cb7cda3 revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5
can't change return type from void to int.

Change-Id: Iec3d95c731f117aca20b29c719cef7bcc6356ac0
2010-09-14 13:36:01 -07:00
Shimeng (Simon) Wang
7924a4a3a0 Fix comment.
Change-Id: I927565aadc7f4a5aac6c0a11c28210440600e8a4
2010-09-14 13:20:46 -07:00
Erik
86e1991428 am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp

* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
  Adds time zone functionality into fw as a hidden api
2010-09-14 12:25:31 -07:00
Erik
b92788aa04 Merge "Adds time zone functionality into fw as a hidden api" into gingerbread 2010-09-14 12:21:53 -07:00
Vasu Nori
5402590f1c change return type from void to int on execSQL() methods
1. let execSQL() methods return the number of rows affected by the SQL
staement executed.
2. remove synchronized on 2 public methods. since public API is not
supposed to have synchronized, this was a mistake in previously submitted
CL

Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5
2010-09-14 12:14:26 -07:00
Vasu Nori
b729dcc8a9 Revert "caching code retooled to reduce locking + handle SMP"
This reverts commit 992f7d52fad590d90edc166cd74380e96d627605.

Change-Id: Ia5b789d1b2195d6ce43baffe24296c857f9b30f6
2010-09-14 11:55:24 -07:00
Dianne Hackborn
264e727775 am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread
Merge commit '934516e10150874fd1db5ab9e0be3ae793441fd8' into gingerbread-plus-aosp

* commit '934516e10150874fd1db5ab9e0be3ae793441fd8':
  Fix issue #2999795: Runtime restart on Crespo
2010-09-14 11:54:28 -07:00
Dianne Hackborn
934516e101 Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread 2010-09-14 11:50:51 -07:00
Dianne Hackborn
83770289f8 Fix issue #2999795: Runtime restart on Crespo
Change-Id: I7138b031298a234f3f35aec4a003d25cf86a57ff
2010-09-14 11:45:44 -07:00
Brad Fitzpatrick
f26ac1f8ed am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf' into gingerbread-plus-aosp

* commit '96d6c3454c3550486a2efa25ca0c83732b5e2eaf':
  Unify some duplicate StrictMode-enabling code.
2010-09-14 11:39:54 -07:00
Brad Fitzpatrick
96d6c3454c Merge "Unify some duplicate StrictMode-enabling code." into gingerbread 2010-09-14 11:37:13 -07:00
Romain Guy
282315e154 am 52e19d59: Merge "Change the keep alive time for excess idle threads." into gingerbread
Merge commit '52e19d5917b8f057131c1dc8b3eb772febd791d9' into gingerbread-plus-aosp

* commit '52e19d5917b8f057131c1dc8b3eb772febd791d9':
  Change the keep alive time for excess idle threads.
2010-09-14 11:36:55 -07:00
Romain Guy
52e19d5917 Merge "Change the keep alive time for excess idle threads." into gingerbread 2010-09-14 11:34:01 -07:00
Romain Guy
6b424f4770 Change the keep alive time for excess idle threads.
Change-Id: Ie076544df5ee8df185f0824333fdc62203a565c2
2010-09-14 11:30:27 -07:00
Brian Carlstrom
e68f8b7ebe am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
405d4db50b Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
2010-09-14 11:24:13 -07:00
Brian Carlstrom
0535d8577f am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Erik
71ad58c751 Adds time zone functionality into fw as a hidden api
This is the start of work towards pushing api that is needed for
Calendar to become unbundled into frameworks. This adds functions
for getting and setting time zones for the Calendar app. The new
methods are currently hidden.

Change-Id: I1b4265b23630c46d9730a179ec02da8d6c0e03ea
2010-09-14 11:16:08 -07:00