Commit Graph

27308 Commits

Author SHA1 Message Date
Mike Lockwood
2f493f0ff1 Merge "MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor" 2010-07-26 17:50:13 -07:00
Mike Lockwood
f7785521bf Merge "MTP: Don't request thumbnails for folder objects in MtpCursor" 2010-07-26 17:49:28 -07:00
Mike Lockwood
bc55034ef9 Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes." 2010-07-26 17:49:04 -07:00
Mike Lockwood
bc4cb0bc79 MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor
Also added some support for sending files to the device that hasn't been debugged yet.
Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously.

Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:40:45 -04:00
Mike Lockwood
f78b26a572 MTP: Don't request thumbnails for folder objects in MtpCursor
Change-Id: I75a0a834ab746bed0a35883539c8dbc104789157
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:36:32 -04:00
Mike Lockwood
86187098ce MTP: Add hard coded support to recognize a couple MTP music players for testing purposes.
Change-Id: I2d09d78e83d13cfb3edff02372a6fc34b1e4d8b1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-26 20:33:02 -04:00
Jason Sams
4687373078 Merge "Query the CPU count and use the result to determine if and how many worker threads we use." 2010-07-26 17:15:00 -07:00
Jason Sams
7f4d0c9705 Query the CPU count and use the result to determine
if and how many worker threads we use.

Change-Id: I8fc1fb17aff835cfe8ed7c474287bccd532cbb29
2010-07-26 17:12:55 -07:00
Wink Saville
fed1722ec8 Merge "Initial MockRilUnitTest." 2010-07-26 17:09:59 -07:00
Wink Saville
50dd565568 Initial MockRilUnitTest.
Change-Id: I87d992b789f6fc28777f609b93497eed3053f560
2010-07-26 17:01:10 -07:00
John Wang
78339f5f62 Merge "Add register methods in CallManager." 2010-07-26 14:02:03 -07:00
John Wang
cd35cb98a5 Add register methods in CallManager.
Add register methods used by PhoneApp into CallManager class.

For most register methods, CallManager acts as an pass-through

register to handle register and unregister phone case.

Change-Id: I74ce4e6d8e66f49c12b43bae1b0def0c7597a449
2010-07-26 13:49:48 -07:00
Alex Sakhartchouk
a51c2445a9 Merge "When font cache still has empty space, precache some commonly used characters to reduce studder." 2010-07-26 13:48:32 -07:00
Vasu Nori
fb16cbd9b2 add new API in SQLiteStatement to deprecate another.
1. SQLIteStatement.executeUpdateDelete() replaces execute() - and returns the
number of rows changed.
2. let SQLiteDatabase.execSQL() call the above new API - which
means all CRUD statements by execSQL() are stored in prepared statement cache.
3. remove the following from SQLiteDatabase
     lastrowId
     lastchangecount()
     native_execSQL()

Change-Id: I4e93a09dc381f425c3ae6ccc331a7bf227491e22
2010-07-26 13:00:07 -07:00
Eric Laurent
037644fbe4 am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338'

* commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338':
  Fixed bug in vlm effect bunde wrapper effect init function.
2010-07-26 12:30:49 -07:00
Mike Lockwood
9765211b90 am 64f04a64: am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416'

* commit '64f04a645ea4fd81cfb41fba23d9ba9e1279d416':
  Avoid starting multiple threads in ShutdownThread
2010-07-26 12:30:28 -07:00
Eric Laurent
f4d9a21a4c am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365'

* commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365':
  LVM release 1.04.
2010-07-26 12:30:23 -07:00
Dianne Hackborn
9fb0bb8292 am b6022e3d: am 14bfa398: Infrastructure to report running services to developer.
Merge commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736'

* commit 'b6022e3d500f248cf1abe94e8f1509e27ab25736':
  Infrastructure to report running services to developer.
2010-07-26 12:30:19 -07:00
Dianne Hackborn
fd1fbcad58 am ef1b9c6a: am 3ac8eb72: Update app label.
Merge commit 'ef1b9c6aa7a9a4dd79823e47829a9ca894c06a0f'

* commit 'ef1b9c6aa7a9a4dd79823e47829a9ca894c06a0f':
  Update app label.
2010-07-26 12:30:15 -07:00
Dianne Hackborn
4cca89c042 am 3a2ff74f: am 46730fc7: Fix handling of application disabled state.
Merge commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111'

* commit '3a2ff74fa4c3f014555ec64fccc16e1b9f6d0111':
  Fix handling of application disabled state.
2010-07-26 12:30:10 -07:00
Dianne Hackborn
48b9cbb046 am 443d884e: am 3bee5af8: Battery stats: start removing last stats, keep total discharge.
Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048'

* commit '443d884e16fad2e01a97aa788d4b30de53c94048':
  Battery stats: start removing last stats, keep total discharge.
2010-07-26 12:30:06 -07:00
Mathias Agopian
bf23832acc am fed3c364: am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread
Merge commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248'

* commit 'fed3c364e6fc6acc5e5836bd1370c3c278f8a248':
  Report sensor events to BatteryStats service
2010-07-26 12:30:01 -07:00
Mathias Agopian
be199f3e11 am 02c06410: am f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread
Merge commit '02c06410461e3880c6ad2c0d15637438113adb4e'

* commit '02c06410461e3880c6ad2c0d15637438113adb4e':
  SensorService handles last known state properly
2010-07-26 12:29:56 -07:00
Steve Howard
a272756431 am a08a0a7b: am a13a02cd: New permission for non-purgeable cache downloads.
Merge commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a'

* commit 'a08a0a7bee7ba09917b94e41c705a643c8e06a1a':
  New permission for non-purgeable cache downloads.
2010-07-26 12:29:49 -07:00
Eric Laurent
e80c30c6b5 am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp

* commit '00de721859ca291d0e212a6970f0bd8b3a2f8428':
  Fixed bug in vlm effect bunde wrapper effect init function.
2010-07-26 12:25:37 -07:00
Mike Lockwood
64f04a645e am 70736a6d: Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread
Merge commit '70736a6d92767258543bb03ac22a705535d86341' into gingerbread-plus-aosp

* commit '70736a6d92767258543bb03ac22a705535d86341':
  Avoid starting multiple threads in ShutdownThread
2010-07-26 12:25:31 -07:00
Eric Laurent
df5c3b5024 am 739bf285: Merge "LVM release 1.04." into gingerbread
Merge commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3' into gingerbread-plus-aosp

* commit '739bf285be7a154b92e74b069dff7dc8f7ffc2f3':
  LVM release 1.04.
2010-07-26 12:25:24 -07:00
Dianne Hackborn
b6022e3d50 am 14bfa398: Infrastructure to report running services to developer.
Merge commit '14bfa398a4e8697ce5822861a684b7d1245e4a85' into gingerbread-plus-aosp

* commit '14bfa398a4e8697ce5822861a684b7d1245e4a85':
  Infrastructure to report running services to developer.
2010-07-26 12:24:57 -07:00
Dianne Hackborn
ef1b9c6aa7 am 3ac8eb72: Update app label.
Merge commit '3ac8eb7278e3603d1a35fdbd2fff540a235da2ab' into gingerbread-plus-aosp

* commit '3ac8eb7278e3603d1a35fdbd2fff540a235da2ab':
  Update app label.
2010-07-26 12:24:39 -07:00
Dianne Hackborn
3a2ff74fa4 am 46730fc7: Fix handling of application disabled state.
Merge commit '46730fc78388607fd562044cbaaa26ffc9f65337' into gingerbread-plus-aosp

* commit '46730fc78388607fd562044cbaaa26ffc9f65337':
  Fix handling of application disabled state.
2010-07-26 12:24:21 -07:00
Dianne Hackborn
443d884e16 am 3bee5af8: Battery stats: start removing last stats, keep total discharge.
Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp

* commit '3bee5af8162c177f8c8f4199489a401058ab26a9':
  Battery stats: start removing last stats, keep total discharge.
2010-07-26 12:24:16 -07:00
Mathias Agopian
fed3c364e6 am eab07e5c: Merge "Report sensor events to BatteryStats service" into gingerbread
Merge commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d' into gingerbread-plus-aosp

* commit 'eab07e5c1d48d45f76ac2dd4a45c8a3457aa290d':
  Report sensor events to BatteryStats service
2010-07-26 12:24:00 -07:00
Mathias Agopian
02c0641046 am f88ed6c2: Merge "SensorService handles last known state properly" into gingerbread
Merge commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9' into gingerbread-plus-aosp

* commit 'f88ed6c2ce750fcf7fb23778286e15557de758f9':
  SensorService handles last known state properly
2010-07-26 12:23:55 -07:00
Steve Howard
a08a0a7bee am a13a02cd: New permission for non-purgeable cache downloads.
Merge commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964' into gingerbread-plus-aosp

* commit 'a13a02cd0ec6c0584fc2423feb974d77d0945964':
  New permission for non-purgeable cache downloads.
2010-07-26 12:23:48 -07:00
Alex Sakhartchouk
65ef909776 When font cache still has empty space,
precache some commonly used characters to reduce studder.

Change-Id: I1f66f57482c4a025672dfd1d8ecaf2b9736cd9a0
2010-07-26 12:11:18 -07:00
Xavier Ducrohet
b46507f6b8 am f8c335e8: am f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4'

* commit 'f8c335e85a46887de6ca771ad76ff35c713ce0c4':
  Fix hosttests to use the new ddmlib API.
2010-07-26 12:01:13 -07:00
Gilles Debunne
5b04668cea am d24ac171: am 8cd48574: Fixed bug in BitmapFactory.decodeStream
Merge commit 'd24ac17121b23efb17219f355e5dd38f933352ff'

* commit 'd24ac17121b23efb17219f355e5dd38f933352ff':
  Fixed bug in BitmapFactory.decodeStream
2010-07-26 12:01:06 -07:00
Xavier Ducrohet
f8c335e85a am f72181c6: Fix hosttests to use the new ddmlib API.
Merge commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e' into gingerbread-plus-aosp

* commit 'f72181c60943dcfb642aac1dc5fa5416c1bb566e':
  Fix hosttests to use the new ddmlib API.
2010-07-26 11:43:07 -07:00
Gilles Debunne
d24ac17121 am 8cd48574: Fixed bug in BitmapFactory.decodeStream
Merge commit '8cd48574a755bea86243e9f9eabaee341ecf9c60' into gingerbread-plus-aosp

* commit '8cd48574a755bea86243e9f9eabaee341ecf9c60':
  Fixed bug in BitmapFactory.decodeStream
2010-07-26 11:41:46 -07:00
Romain Guy
0ada3f41cf Merge "Fix text corruption when rendering RTL enabled text." 2010-07-26 11:39:27 -07:00
Romain Guy
9226298891 Fix text corruption when rendering RTL enabled text.
Change-Id: I5450fd9cad1c5a66875affdbcd34308aea4c36ac
2010-07-26 11:17:54 -07:00
Xavier Ducrohet
f72181c609 Fix hosttests to use the new ddmlib API.
Change-Id: I629876c5baabc1cd8700604c4ebed13cc9e2168d
2010-07-26 10:53:00 -07:00
Jean-Baptiste Queru
7b5b20ef67 am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4'

* commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4':
  move native services under services/
2010-07-26 10:26:46 -07:00
Jean-Baptiste Queru
bd01583d6e resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76
2010-07-26 10:22:58 -07:00
Ben Komalo
92fba4bc01 Merge "Ensure that creating a Loader/LoaderManager after the Activity has started will kick off startLoading() as expected." 2010-07-26 10:18:29 -07:00
Jean-Baptiste Queru
3436eb3480 am 14d9c34c: am c7ab09ed: Merge "Fix build."
Merge commit '14d9c34ccb75795d0b219b3dcc42c2269eb0e756'

* commit '14d9c34ccb75795d0b219b3dcc42c2269eb0e756':
  Fix build.
2010-07-26 10:13:02 -07:00
Eric Laurent
00de721859 Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread 2010-07-26 10:09:54 -07:00
Jean-Baptiste Queru
14d9c34ccb am c7ab09ed: Merge "Fix build."
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
2010-07-26 10:05:23 -07:00
Ben Komalo
7cd83428f1 Ensure that creating a Loader/LoaderManager after the Activity has
started will kick off startLoading() as expected.

Change-Id: I8ec76d39665aab0dc72fb083b6b3751a45b51fce
2010-07-26 10:03:14 -07:00
Jean-Baptiste Queru
b237bdb647 Merge "move native services under services/" 2010-07-26 10:01:19 -07:00