25346 Commits

Author SHA1 Message Date
Mike Lockwood
0cd0e797da Merge "MTP: Add host support for deleting objects." 2010-06-11 15:13:38 -07:00
Mike Lockwood
147717c267 CameraBrowser: Support for deleting pictures.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-11 17:47:38 -04:00
Mike Lockwood
e0a89f611d MTP: Add host support for deleting objects.
For example, deleting pictures on a digital camera.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-11 17:47:35 -04:00
Irfan Sheriff
afadc8b4e1 Dont persist config on failure
If soft AP bring up does not go through successfully,
dont persist the config. This has the benefit of recovering
from the case where things fail on "=" and "," for SSID since
the IOCTL parsing in driver on broadcom cannot handle it
at this time.

Change-Id: Iaa60fd05972db434500753dcb59092995dab07b1
2010-06-11 14:43:14 -07:00
James Dong
188c432c70 am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'

* commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3':
  Initial checkin for pause and resume control
2010-06-11 14:34:09 -07:00
James Dong
ae2c47746b am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken
Merge commit 'f62c57d684b83df7d2817db976c0afdb500ae92a' into gingerbread-plus-aosp

* commit 'f62c57d684b83df7d2817db976c0afdb500ae92a':
  Initial checkin for pause and resume control
2010-06-11 14:31:49 -07:00
James Dong
f62c57d684 Merge "Initial checkin for pause and resume control" into kraken 2010-06-11 14:28:55 -07:00
Andreas Huber
9e937269a6 Must hold lock here...
Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
2010-06-11 14:16:12 -07:00
James Dong
08c7473ce9 Initial checkin for pause and resume control
Change-Id: Ibdcf7bea5fb66baa81878704ba4091dfcfe382ee
2010-06-11 13:48:48 -07:00
The Android Open Source Project
07d8140755 merge from open-source master
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
2010-06-11 13:08:02 -07:00
Jean-Baptiste Queru
fdedc52299 Merge "WLAN: Reset power save mode to startup value after DHCP response." 2010-06-11 11:12:15 -07:00
Dianne Hackborn
cf0a99910c am 4d4f265e: am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f'

* commit '4d4f265e6b6ccfc239150bd71aa2ce2b8de6237f':
  Adjust activity manager process OOM adj.
2010-06-11 11:00:53 -07:00
Andreas Huber
4fee974adf am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'

* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
2010-06-11 11:00:44 -07:00
Dianne Hackborn
4d4f265e6b am 9f8cc518: Merge "Adjust activity manager process OOM adj." into kraken
Merge commit '9f8cc518e14c7a34bc52da712afbf02d84585f67' into gingerbread-plus-aosp

* commit '9f8cc518e14c7a34bc52da712afbf02d84585f67':
  Adjust activity manager process OOM adj.
2010-06-11 10:58:48 -07:00
Andreas Huber
0905ba7ba6 am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9' into gingerbread-plus-aosp

* commit 'f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
2010-06-11 10:58:44 -07:00
Dianne Hackborn
9f8cc518e1 Merge "Adjust activity manager process OOM adj." into kraken 2010-06-11 10:53:16 -07:00
Andreas Huber
f5eafe40cd Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 2010-06-11 10:52:00 -07:00
Dianne Hackborn
32907cfb38 Adjust activity manager process OOM adj.
Modify OOM adj classes a bit, to take into account the new
heavy weight app type, and give "foreground services" their
own category to have a bettery chance to manager them when
things go wrong.

Also add some new code to battery stats to keep a history
of changes to the battery level.

Change-Id: I29f5ab6938777e1a7eafd7d8c38b5e564cc9f96a
2010-06-11 10:39:11 -07:00
Andreas Huber
20b35c7046 am b165719e: am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit 'b165719e93dd390b4f71f5d5e993880529cc841f'

* commit 'b165719e93dd390b4f71f5d5e993880529cc841f':
  Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
2010-06-11 10:16:39 -07:00
Andreas Huber
b165719e93 am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Merge commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf' into gingerbread-plus-aosp

* commit 'e577e87a2d80890190f14edc4a5caf70d7c566bf':
  Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
2010-06-11 10:12:59 -07:00
Andreas Huber
3a53dc5ad9 Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Change-Id: I506dc501faec60e974bf4968d8ba661df7a49aa8
2010-06-11 09:57:46 -07:00
Vasu Nori
ef1cc891ab Merge "sqlite error "unsupported file format" = corruption" 2010-06-11 09:55:41 -07:00
Andreas Huber
e577e87a2d Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Change-Id: I963ad7074b830d553b67c8925efd5369d0b7a5b9
2010-06-11 09:22:48 -07:00
Scott Main
f10e6331e3 docs: fix markup error
Change-Id: Icea017095f58068c55dd3c1c18cecbdf06afb595
2010-06-11 09:03:22 -07:00
Eric Laurent
948235c06e Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations,
OpenSL ES effect interfaces and audio effect JNI.

Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class
to implement more specific JAVA classes to control audio effects from JAVA applications.

Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
2010-06-11 06:26:31 -07:00
Derek Sollenberger
bffa851f04 Finish refactoring zoom logic from WebView to ZoomManager.
This is the final CL in a series of CL's that moved the
location of the zoom logic from WebView to ZoomManager.

Change-Id: Ie1e80b9b3108bd4cb0b0ee2822dc984da91c2d86
http://b/2671604
2010-06-11 08:51:07 -04:00
Derek Sollenberger
15c5ddb7fd Refactor the double tap zoom code into ZoomManager.
This CL is one in a series of CL's that is intended to refactor
the zoom logic from WebView to ZoomManager.

Change-Id: Icf88f7bd45068dddb31913903403acc7a8f21063
http://b/2671604
2010-06-11 07:47:52 -04:00
Chih-Chung Chang
4b983d9f30 am dac5e001: am b8bb78f5: Change camera interface to support multiple cameras.
Merge commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'

* commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
  Change camera interface to support multiple cameras.
2010-06-11 03:39:17 -07:00
Chih-Chung Chang
dac5e0013d am b8bb78f5: Change camera interface to support multiple cameras.
Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp

* commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1':
  Change camera interface to support multiple cameras.
2010-06-11 03:27:30 -07:00
Chih-Chung Chang
b8bb78f54b Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
2010-06-11 16:47:33 +08:00
Wu-cheng Li
6df7225660 am e5dd62e8: am 2fd73a45: Unhide camera metering mode API.
Merge commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7'

* commit 'e5dd62e873448fd8c1fd8e80739b58bda649a6e7':
  Unhide camera metering mode API.
2010-06-11 00:35:06 -07:00
Wu-cheng Li
e5dd62e873 am 2fd73a45: Unhide camera metering mode API.
Merge commit '2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp

* commit '2fd73a452268d2acb6e72a1d23a422085ed3c510':
  Unhide camera metering mode API.
2010-06-11 00:33:37 -07:00
Wu-cheng Li
2fd73a4522 Unhide camera metering mode API.
Change-Id: Ia3ca83e2a0b5b322e5dbf9ae3d5c1d3b89e0fd31
2010-06-11 15:29:49 +08:00
Irfan Sheriff
9e30a6e374 am 749defb0: am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 19:04:25 -07:00
Irfan Sheriff
749defb0ca am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 19:02:23 -07:00
Irfan Sheriff
a97d959448 am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
2010-06-10 19:02:13 -07:00
Irfan Sheriff
f4f614f5ed am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
2010-06-10 18:59:42 -07:00
Irfan Sheriff
9f2a011522 Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 18:56:04 -07:00
Romain Guy
ee9cdce64e Merge "Refactor HardwareRenderer to allow the use of OpenGL ES 2.0." 2010-06-10 18:52:47 -07:00
Romain Guy
e392499273 Refactor HardwareRenderer to allow the use of OpenGL ES 2.0.
The current OpenGL ES 2.0 HardwareRenderer will fail and does not
even attempt to create a Canvas. The next step will be to create
a new native-backed Canvas that relies on OpenGL ES 2.0 and bypasses
the current OpenGL ES 1.0 implementation done in Skia.

Change-Id: I7a8e9f87f316e9137ef191bb5609213e160eaa4c
2010-06-10 18:51:21 -07:00
Joe Onorato
f058057622 Use the droidcore goal with dist-for-goals.
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
2010-06-10 18:36:58 -07:00
Joe Onorato
74905e5b0a The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
2010-06-10 18:36:57 -07:00
Vasu Nori
b339509d31 sqlite error "unsupported file format" = corruption
sometimes sqlite corruption is so egregious that the sqlite
doesn't even think the file is of supported formatl; ie., the file
header is bad. treat this as corruption.
this check used to be done in sqlite3.c - move it to android code
so that we have less android-changes in sqlite3.c

depends on Change-Id: I334286a1a377b962b1a97dd2af00e194f035090e

Change-Id: Ide8cd1053b1ec00372fbc87caaaaefb408ce9104
2010-06-10 17:54:53 -07:00
Vasu Nori
707f03c5cf Merge "NPE in database corruption handler if attached database list is null" 2010-06-10 17:52:24 -07:00
Vasu Nori
49686ea3ed NPE in database corruption handler if attached database list is null
sometimes the database can be so corrupt that it cannot even be queried
for attached database list.

Change-Id: Ib8fe3bd94157acab3fbf1011c3f8a532ef5019f4
2010-06-10 17:40:01 -07:00
Mathias Agopian
9646b69388 am 5b669581: am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:17:19 -07:00
Mathias Agopian
5b669581b3 am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:15:12 -07:00
Mathias Agopian
9d8e8dcc84 Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:12:42 -07:00
Mathias Agopian
8b73ae4a1e fix [2757903] Crash in EGL when creating an EGLSurface
Change-Id: I995947ac40d1a5c86dce495550baf6864ecf5f54
2010-06-10 17:06:27 -07:00
Dmitri Plotnikov
5661311825 Merge "Reimplement the PhoneNumberFormattingTextWatcher" 2010-06-10 16:52:53 -07:00