31159 Commits

Author SHA1 Message Date
Hung-ying Tyan
3e5246b2eb am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'

* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
  SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 16:47:30 -07:00
Hung-ying Tyan
bb5fb60c7c am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'

* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
  SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 16:47:22 -07:00
Kenny Root
6545fcfd96 am 79a1ee42: am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
Merge commit '79a1ee4249aadc84558dad2e275b8edde198da76'

* commit '79a1ee4249aadc84558dad2e275b8edde198da76':
  Free AssetManager weak refs before unmounting
2010-09-15 16:32:45 -07:00
Steve Howard
e28d80a80a am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'

* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
  Fix name shadowing bug with revoking URI permissions.
2010-09-15 16:32:30 -07:00
Chris Palmer
4b4f6a3661 am c5e2e26b: (-s ours) am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
Merge commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051'

* commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051':
  DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-15 16:32:18 -07:00
Vasu Nori
5e89ae29f0 fix compiled statement bugs, synchronization bugs
1. when LRU cache wants to remove the eldest entry, it may be finalizing
a statement that is still in use
2. a couple of synchronization issues.
3. a bit code refactoring in SQLiteCompiledSql
4. remove a bunch of unsed debug code from SQLiteDatabase

Change-Id: I45454dc2dbadd7d8842ba77dd2b0e9ff138ec6f4
2010-09-15 15:30:24 -07:00
Jim Miller
e216dac4d1 Merge "Add new Carousel callbacks to RecentApplicationsActivity." 2010-09-15 14:53:05 -07:00
Adam Powell
0b2d306e70 Style new popup widgets.
Change-Id: I208ed292afd9919071778baa9ea61d7ca9e7743c
2010-09-15 14:39:48 -07:00
Paul Westbrook
a29d8394f1 Merge "Enable downloads of https urls" 2010-09-15 14:23:28 -07:00
Paul Westbrook
86a6019f02 Enable downloads of https urls
Bug: 3001890
Change-Id: Ibb2bc5c8efe90744a3b6f76bd31c3199a7365827
2010-09-15 13:37:46 -07:00
Makoto Onuki
5aed4b82ae Merge "Add AbstractCursor.getNotificationUri." 2010-09-15 13:34:05 -07:00
Makoto Onuki
90bf7c7916 Add AbstractCursor.getNotificationUri.
We'll need it for some tests.

Change-Id: I5db9f570d8ff2f58c73654fbe4a6df881894f865
2010-09-15 13:21:51 -07:00
Jim Miller
2013816e53 Add new Carousel callbacks to RecentApplicationsActivity.
Change-Id: I2c9ad42688ffecbc22c971184e42fdb2a7e68295
2010-09-15 13:18:54 -07:00
Amith Yamasani
6734b9f680 Provide automatic date/time based on NTP lookup.
Do this on a periodic basis as well as when the AUTO_TIME setting changes to true.

If we recently acquired NITZ time from the telephony provider, then don't override
with NTP time.
2010-09-15 13:14:18 -07:00
Joe Onorato
b5845dfcd2 Merge "fix the build." 2010-09-15 12:36:21 -07:00
Joe Onorato
32f2f5dcc8 fix the build.
Change-Id: I3f483d861a3f6388907d3254428b46701963ee55
2010-09-15 15:35:11 -04:00
John Wang
91382a6f88 am 8028bd5b: am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread
Merge commit '8028bd5b696fd94d33c905c4279d6505e985d70b'

* commit '8028bd5b696fd94d33c905c4279d6505e985d70b':
  Complete event registration in CallManager.
2010-09-15 12:33:19 -07:00
Erik
ac212158f0 am 0b46070d: am 426ee7f2: Fixes some bugs in TimeZoneUtils
Merge commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f'

* commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f':
  Fixes some bugs in TimeZoneUtils
2010-09-15 12:32:46 -07:00
Jeff Brown
49478536b6 am 14bc6b5d: am 09340a4b: Merge "Replace epoll() with poll() and rename PollLoop to Looper." into gingerbread
Merge commit '14bc6b5d0677e5c454a67775c852f90389bb4567'

* commit '14bc6b5d0677e5c454a67775c852f90389bb4567':
  Replace epoll() with poll() and rename PollLoop to Looper.
2010-09-15 12:32:29 -07:00
Mathias Agopian
a5ab8ce602 resolved conflicts for merge of 48a86240 to master
Change-Id: I2305fef9f4dd46183337217d822df3c675b6b6e5
2010-09-15 12:29:18 -07:00
jsh
19c5df7452 am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread
Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'

* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
  Unhide GsmCellLocation.getPsc().
2010-09-15 12:19:05 -07:00
Eric Laurent
30ef985b70 am 23b8054e: am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread
Merge commit '23b8054e85eaffa515c597e7b386e3892968302d'

* commit '23b8054e85eaffa515c597e7b386e3892968302d':
  Added intents for audio effects control application
2010-09-15 11:39:09 -07:00
Dianne Hackborn
eba36ff80d am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'

* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
  Fix problem where power manager was calling battery stats with bad wl type.
2010-09-15 11:38:47 -07:00
Erik
088fbbc7b6 am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit '86e1991428c2bc78354965c51b2821ae16f32a55'

* commit '86e1991428c2bc78354965c51b2821ae16f32a55':
  Adds time zone functionality into fw as a hidden api
2010-09-15 11:38:26 -07:00
Dianne Hackborn
a6555fd4b1 am 264e7277: am 934516e1: Merge "Fix issue #2999795: Runtime restart on Crespo" into gingerbread
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f'

* commit '264e727775728d0478fcb95855e8ea3801f34c8f':
  Fix issue #2999795: Runtime restart on Crespo
2010-09-15 11:38:02 -07:00
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
Brad Fitzpatrick
562ec84987 am 79cc46d1: am fb85bc66: Merge "Add missing wallpaper service lock." into gingerbread
Merge commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672'

* commit '79cc46d1b039fe6e16aa84b5f1e460afea52e672':
  Add missing wallpaper service lock.
2010-09-15 11:37:46 -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
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
Jean-Baptiste Queru
f4fa0e024e Merge "Manage fonts like a true product definition" 2010-09-15 09:53:00 -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
Nipun Kwatra
c9e3c19942 Merge "Disable shutter sound and play recording sound for still mode time lapse." 2010-09-15 09:18:30 -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
Hung-ying Tyan
8a33e964c4 am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
  SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 07:42:48 -07:00
Hung-ying Tyan
8d9e8de2c9 am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
Merge commit '096df8197b9133703d2ed0abb69813db0c8b4129' into gingerbread-plus-aosp

* commit '096df8197b9133703d2ed0abb69813db0c8b4129':
  SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 07:42:38 -07:00
John Wang
c711149195 am e92fdd26: am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
Merge commit 'e92fdd261eed516a8821675ceca971d1c90d772b'

* commit 'e92fdd261eed516a8821675ceca971d1c90d772b':
  Return immutable copies of private callList.
2010-09-15 07:09:00 -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
Hung-ying Tyan
fbfb6f2f04 am 188a8f1b: am 89a7180a: Merge "SipService: ignore connect event for non-active networks." into gingerbread
Merge commit '188a8f1b72452bc294daa2186e93771543be0478'

* commit '188a8f1b72452bc294daa2186e93771543be0478':
  SipService: ignore connect event for non-active networks.
2010-09-15 07:08:38 -07:00
Dirk Dougherty
f6a04aeeed am f9c7a3e2: am e71396cf: am 4b4af990: Doc change: update ADT 0.9.8 checksum and size.
Merge commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207'

* commit 'f9c7a3e25e6e83292051414246cb1fc0c5f85207':
  Doc change: update ADT 0.9.8 checksum and size.
2010-09-15 07:08:23 -07:00
Kenny Root
685da21c1c am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc'

* commit '3ca2691446d333d52b1c0a39e6df74e03c2407cc':
  Dedupe timestamp in PackageSettings
2010-09-15 07:08:15 -07:00
Hung-ying Tyan
b1c4a01985 am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()
Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'

* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
  SipAudioCall: use SipErrorCode instead of string in onError()
2010-09-15 07:08:04 -07:00
Hung-ying Tyan
fcc7fb8a1a am 3692af92: am 99bf4e45: SIP: remove dependency on javax.sip
Merge commit '3692af92ab290a561a927079cbf1f778f57fe5f9'

* commit '3692af92ab290a561a927079cbf1f778f57fe5f9':
  SIP: remove dependency on javax.sip
2010-09-15 07:07:56 -07:00
Chung-yih Wang
4586063969 am 316e72cb: am 5dde95b8: Merge "Fix the bug of authentication in an outgoing call." into gingerbread
Merge commit '316e72cb05637735c67ae02911dd0dbe096c71f5'

* commit '316e72cb05637735c67ae02911dd0dbe096c71f5':
  Fix the bug of authentication in an outgoing call.
2010-09-15 07:07:47 -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
Hung-ying Tyan
074663c762 am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread
Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'

* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
  SipService: deliver connectivity change to all sessions.
2010-09-15 07:07:19 -07:00