31765 Commits

Author SHA1 Message Date
Irfan Sheriff
6963291ab5 am d404a9be: (-s ours) am 0859b764: Make wifi scan async. (don\'t auto-merge)
Merge commit 'd404a9be14715efdea447ec4ed3e7677ab72e641'

* commit 'd404a9be14715efdea447ec4ed3e7677ab72e641':
  Make wifi scan async. (don't auto-merge)
2010-09-21 13:10:30 -07:00
Chet Haase
39d1ee558d do not merge
updated assets: pull-my-thumb/unlock (partially complete), 3g status, expander_ic_min/max changes

Change-Id: I1cb4601ec7eb2da7689fa58cb56c294f786ea4e6
2010-09-21 13:10:29 -07:00
Gil Dobjanschi
c2087e3c7a Merge "Added the behavior paramter to transition constructors" 2010-09-21 13:09:49 -07:00
Gil Dobjanschi
590f87fe9a Added the behavior paramter to transition constructors
Change-Id: Ic8758fb81e9b9c30982f3ced2d9fffc3439b7c7e
2010-09-21 13:08:03 -07:00
Steve Howard
f1166513f5 am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp

* commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f':
  Support for download manager "queue for wifi" dialogs
2010-09-21 13:02:06 -07:00
Irfan Sheriff
d404a9be14 am 0859b764: Make wifi scan async. (don\'t auto-merge)
Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp

* commit '0859b764719735e4b9aea5df6051ece13e212841':
  Make wifi scan async. (don't auto-merge)
2010-09-21 12:59:34 -07:00
Steve Howard
ff0ea5eaf1 Merge "Support for download manager "queue for wifi" dialogs" into gingerbread 2010-09-21 12:49:36 -07:00
Steve Howard
f176681ecc Support for download manager "queue for wifi" dialogs
New DB column and new secure setting for recommended max download size
over mobile.

Change-Id: If87acda62140ad6d8f923a000a5ff9232021e1a3
2010-09-21 12:48:09 -07:00
Irfan Sheriff
0859b76471 Make wifi scan async. (don't auto-merge)
When an entity (NLP for example) acquires
a WifiLock and initiates a scan, scan can
get blocked until driver starts.

scan returns no useful info, scan results
are broadcast when obtained.

Bug: 2964633
Change-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77
2010-09-21 12:38:09 -07:00
Doug Zongker
c2f8a45876 recovery just takes a filename as an argument now
(Cherrypicked from gingerbread.)

Change-Id: I0deb8494465e1036280ac92730e537fd3f38a9fb
2010-09-21 12:33:25 -07:00
Vasu Nori
bd867f681d am b745ec95: (-s ours) am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit 'b745ec954272a3c09cca354ad84e2e08b54c8544'

* commit 'b745ec954272a3c09cca354ad84e2e08b54c8544':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
2010-09-21 12:30:12 -07:00
Vasu Nori
b745ec9542 am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread
Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp

* commit '173ea0912af296c6e80d14b764046534b316d21f':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
2010-09-21 12:25:39 -07:00
Vasu Nori
173ea0912a Merge "DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'" into gingerbread 2010-09-21 12:22:10 -07:00
Vasu Nori
9540a8d320 DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
output now looks like the following
  SQL
                  heap:      551          MEMORY_USED:      551
    PAGECACHE_OVERFLOW:      113          MALLOC_SIZE:       50

 DATABASES
    pgsz   dbsz   Lookaside(b)  Dbname
       1    148           500  contacts2.db
       1      8             0    (attached) presence_db
       1     18            31  :memory:SQL

Change-Id: I8bb65a522fd9478ff2f6a8c27e69f9e6c10aef8a
2010-09-21 12:07:24 -07:00
Stephen Hines
065149f162 Updated RSTest to test primitive type assignments.
Change-Id: I6c377cfdc647806d9362effc4c1715638dcf5bfb
2010-09-21 11:59:15 -07:00
Cary Clark
6f1e9618e4 am 100cc263: (-s ours) am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
Merge commit '100cc263b465242c01dc9eb280d77ffaadbddd39'

* commit '100cc263b465242c01dc9eb280d77ffaadbddd39':
  Do not merge : cancel text select mode when pressing back, etc.
2010-09-21 11:54:51 -07:00
Cary Clark
100cc263b4 am b5631f59: Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread
Merge commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d' into gingerbread-plus-aosp

* commit 'b5631f59d3b0411ed493dc382bb96ab15ca3304d':
  Do not merge : cancel text select mode when pressing back, etc.
2010-09-21 11:51:23 -07:00
Cary Clark
b5631f59d3 Merge "Do not merge : cancel text select mode when pressing back, etc." into gingerbread 2010-09-21 11:47:38 -07:00
James Dong
5e64700bf7 am 7e8a16e8: am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread
Merge commit '7e8a16e884632c85a54dc351c0b4f79aea116237'

* commit '7e8a16e884632c85a54dc351c0b4f79aea116237':
  Allow record to set input color format as a command line option
2010-09-21 11:41:16 -07:00
Doug Zongker
0470949554 am bd1578fb: (-s ours) am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Merge commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063'

* commit 'bd1578fb682ea9dbbab10f88165a9edf72e8b063':
  recovery just takes a filename as an argument now (do not merge)
2010-09-21 11:41:11 -07:00
James Dong
7e8a16e884 am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread
Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp

* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
  Allow record to set input color format as a command line option
2010-09-21 11:37:20 -07:00
Doug Zongker
bd1578fb68 am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Merge commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae' into gingerbread-plus-aosp

* commit 'eb4d5b253733a699c16f0a50a8e8642ec49ed9ae':
  recovery just takes a filename as an argument now (do not merge)
2010-09-21 11:37:15 -07:00
James Dong
d3c9fce36c Merge "Allow record to set input color format as a command line option" into gingerbread 2010-09-21 11:34:26 -07:00
Cary Clark
2fddc21a46 Do not merge : cancel text select mode when pressing back, etc.
This was taken from scroggo's excellent change
https://android-git.corp.google.com/g/#change,68114

Change-Id: Idd18e08f1aaeb2fee47bfeed9e7d57e38cb1c62f
http://b/3000317
2010-09-21 14:33:11 -04:00
Doug Zongker
eb4d5b2537 Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread 2010-09-21 11:32:01 -07:00
Vasu Nori
4d76d0b832 STOPSHIP follow up to Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
adding back an object that originally existed (when the bug appeared randomly)

Change-Id: Ie6fef529e7b366aaecaace5d3409f2cdc551c8ae
2010-09-21 11:28:49 -07:00
Neal Nguyen
c64c6a99fb am abb45e67: am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread
Merge commit 'abb45e6720a035e909644941b8ef7f92faeb6f34'

* commit 'abb45e6720a035e909644941b8ef7f92faeb6f34':
  Adding more DL Manager tests.
2010-09-21 11:09:52 -07:00
Vasu Nori
e0c1acbcad Merge "add new param to device config properties: db connection pool size" 2010-09-21 11:06:45 -07:00
Vasu Nori
627b331b32 add new param to device config properties: db connection pool size
connection pool = number of database connections opened when the app opens
a database. These pooled connections are used by readers only and they
use the sqlite write-ahead-logging option to increase reader
concurrency.
The size of this connection pool depends on the number of CPUs, RAM etc.
On most single-core devices, this can be set to 1.
But on some multi-core devices with more RAM, pool size can be
more than 1.
On a device with more resources, here are the results of a test (in
coretests/src/android/database/sqlite/SQLiteDatabaseTest.java)
which measures the reader-parallelism achieved for different connection
pool sizes.
connpool-size = 1
  num xacts by writer = 467
  num-reads-in-xact/NOT-in-xact by reader1 = 1358/14542, by reader2 = 1431/14269
connpool-size = 2
  num xacts by writer = 473
  num-reads-in-xact/NOT-in-xact by reader1 = 5703/35227, by reader2 = 6222/35898
connpool-size = 3
  num xacts by writer = 542
  num-reads-in-xact/NOT-in-xact by reader1 = 6531/32329, by reader2 = 6252/32728
connpool-size = 4
  num xacts by writer = 578
  num-reads-in-xact/NOT-in-xact by reader1 = 6009/32701, by reader2 = 5977/32953
connpool-size = 5
  num xacts by writer = 547
  num-reads-in-xact/NOT-in-xact by reader1 = 6554/31186, by reader2 = 5318/31022
connpool-size = 6
  num xacts by writer = 534
  num-reads-in-xact/NOT-in-xact by reader1 = 5317/31463, by reader2 = 5413/31537
connpool-size = 7
  num xacts by writer = 549
  num-reads-in-xact/NOT-in-xact by reader1 = 5396/28004, by reader2 = 5214/28496

seems like connection pool size of 3 is optimal on this device.

Change-Id: I348ff5a31783c31b5e3e5ac78b7c2cea54ef114a
2010-09-21 11:05:39 -07:00
Neal Nguyen
abb45e6720 am b9881e6b: Merge "Adding more DL Manager tests." into gingerbread
Merge commit 'b9881e6b94607334673566493c904f6741087938' into gingerbread-plus-aosp

* commit 'b9881e6b94607334673566493c904f6741087938':
  Adding more DL Manager tests.
2010-09-21 11:05:32 -07:00
Neal Nguyen
b9881e6b94 Merge "Adding more DL Manager tests." into gingerbread 2010-09-21 11:02:29 -07:00
Eric Laurent
8dc81c1014 am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f'

* commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f':
  Made audio effect control panel intents public.
2010-09-21 10:56:30 -07:00
Mathias Agopian
8dba8cff4c Merge "fix [3018216] UI shrinks / stretches while using apps with IME" 2010-09-21 10:54:55 -07:00
Mathias Agopian
3dfe120e90 fix [3018216] UI shrinks / stretches while using apps with IME
Change-Id: Ie4c5d8a434b4489355ed8c52af96eb931b4d7167
2010-09-21 10:52:42 -07:00
Eric Laurent
96d5c17e78 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
2010-09-21 10:52:27 -07:00
Jesse Wilson
0acddc582b am 2121ec9b: am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
Merge commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b'

* commit '2121ec9bca3507c7c3df6fb4fb1d553990adc05b':
  Fix double-checked locking bug in LocalSocket.
2010-09-21 10:49:23 -07:00
Eric Laurent
8d1513e13c Merge "Made audio effect control panel intents public." into gingerbread 2010-09-21 10:47:17 -07:00
Eric Laurent
92cf2d6085 Made audio effect control panel intents public.
Change-Id: If927606a24966605eb3e02788b2477937349d518
2010-09-21 10:45:41 -07:00
James Dong
1d2f450680 am e436ef09: am e5206694: Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
Merge commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193'

* commit 'e436ef09d205eee473d5a4a4d0a1721b8dfbe193':
  Another attempt for fixing AAC+/eAAC+ related issue
2010-09-21 10:45:13 -07:00
Jean-Baptiste Queru
2a55db742e am 925f94b7: am 7869f08c: Merge "MOTOYA Japanese fonts"
Merge commit '925f94b788f5856025aa8218ee2e705c14f58281'

* commit '925f94b788f5856025aa8218ee2e705c14f58281':
  MOTOYA Japanese fonts
2010-09-21 10:45:09 -07:00
Wu-cheng Li
d276720edb am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'

* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
2010-09-21 10:44:38 -07:00
Mike Lockwood
92b328b67a am e65735af: am 92630c78: Merge "SystemUI: Use new USB notifications to detect USB disconnect." into gingerbread
Merge commit 'e65735aff0f09a1c19b79c6d2b98ef39123da1d4'

* commit 'e65735aff0f09a1c19b79c6d2b98ef39123da1d4':
  SystemUI: Use new USB notifications to detect USB disconnect.
2010-09-21 10:44:33 -07:00
Robert Greenwalt
19531dacfe am f532e958: am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf'

* commit 'f532e9583ec0111b1c198e895ed1b2fd83c3d5cf':
  Inet status bug fix
2010-09-21 10:44:26 -07:00
Dianne Hackborn
5e6ec0aeea am e665698f: am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread
Merge commit 'e665698ffe539bdb99122dcf83e19844ebea92b8'

* commit 'e665698ffe539bdb99122dcf83e19844ebea92b8':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
2010-09-21 10:44:13 -07:00
Chung-yih Wang
cef2590bda am 83af4fbb: am 4c571a62: Fix the build.
Merge commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb'

* commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb':
  Fix the build.
2010-09-21 10:43:47 -07:00
Dianne Hackborn
1bbef40e40 am 2d19a676: am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '2d19a676860bf773c984315fe03d9568913f9314'

* commit '2d19a676860bf773c984315fe03d9568913f9314':
  Fix #2999258: ANR in Settings after every reboot
2010-09-21 10:43:36 -07:00
Chung-yih Wang
6b15ecf278 am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread
Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
  Revert the ANSWERING state.
2010-09-21 10:43:24 -07:00
Jesse Wilson
2121ec9bca am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
2010-09-21 10:33:53 -07:00
Jesse Wilson
8217eac0a0 Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
Robert Greenwalt
fa213d82a9 Merge "resolved conflicts for merge of 749e6bc5 to master" 2010-09-21 10:30:13 -07:00