31515 Commits

Author SHA1 Message Date
Mike Lockwood
1779789b42 CameraBrowser: show format in object info and show info for non-JPEG objects
Change-Id: I22b1906fecbf8609bc688a148180edc95fa1badf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-20 18:30:02 -04:00
Mike Lockwood
88fc2b85cb MTP: Fix typo that resulted in the MTP provider returning thumb format for object format
BUG: 2994234

Change-Id: I99574043d3e0b310b9b7246f89b5b4a1e14fb5a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-20 18:29:59 -04:00
Kristian Monsen
4200dcaa7b Merge "HTTP auth for Chromium HTTP stack (Java side)" 2010-09-20 05:52:53 -07:00
Hung-ying Tyan
5491c7a076 am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'

* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
  SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:58:08 -07:00
Hung-ying Tyan
852e5354f6 am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:51:07 -07:00
Hung-ying Tyan
8544560ccc SipPhone: fix missing-call DisconnectCause feedback
also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:

http://b/issue?id=3009262

Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
2010-09-20 13:06:30 +08:00
Hung-ying Tyan
23fd61b188 am 97bc368b: am b17eae9e: SipService: move event handling out of system server\'s main thread
Merge commit '97bc368bc445c0015de6dd6557feff0dd5527d9d'

* commit '97bc368bc445c0015de6dd6557feff0dd5527d9d':
  SipService: move event handling out of system server's main thread
2010-09-19 19:17:18 -07:00
Hung-ying Tyan
97bc368bc4 am b17eae9e: SipService: move event handling out of system server\'s main thread
Merge commit 'b17eae9e227475a323f61519abc8a7d35ddf8828' into gingerbread-plus-aosp

* commit 'b17eae9e227475a323f61519abc8a7d35ddf8828':
  SipService: move event handling out of system server's main thread
2010-09-19 19:14:30 -07:00
Hung-ying Tyan
b17eae9e22 SipService: move event handling out of system server's main thread
http://b/issue?id=2998047

Change-Id: Ibe0b6a19bb8b453fa852a94b3daf3cb80d7377b0
2010-09-20 10:10:34 +08:00
Hung-ying Tyan
2417132611 am 37d1b249: am 97963794: SIP: convert enum to static final int.
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'

* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
  SIP: convert enum to static final int.
2010-09-19 18:59:43 -07:00
Hung-ying Tyan
37d1b2496e am 97963794: SIP: convert enum to static final int.
Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
  SIP: convert enum to static final int.
2010-09-19 18:56:27 -07:00
Hung-ying Tyan
97963794af SIP: convert enum to static final int.
Converts SipErrorCode and SipSessionState.

Change-Id: Iee3a465649ea89d395b2336bbd673c25113e5f93
2010-09-20 09:51:31 +08:00
Hung-ying Tyan
03d8a8f1f7 resolved conflicts for merge of cf1620d6 to master
Change-Id: I7a1436ec4c6a96801c096f61e9dc3571c1927cae
2010-09-20 09:31:12 +08:00
Hung-ying Tyan
cf1620d6dd am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp

* commit '5b930c49b12bdb1461a18491db768c642c38d498':
  SIP: add config flag for wifi-only configuration.
2010-09-19 18:11:44 -07:00
Hung-ying Tyan
5b930c49b1 Merge "SIP: add config flag for wifi-only configuration." into gingerbread 2010-09-19 18:02:13 -07:00
Hung-ying Tyan
c4b87477c0 SIP: add config flag for wifi-only configuration.
http://b/issue?id=2994029

Change-Id: I328da9b0f8b70d660dbcefffdac8250341792101
2010-09-20 08:03:20 +08:00
Mike Lockwood
f9e505c66f am b5994789: (-s ours) am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'b5994789af9c676f8e067a4a8706d2177b7cc142'

* commit 'b5994789af9c676f8e067a4a8706d2177b7cc142':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:15:08 -07:00
Mike Lockwood
b5994789af am ba56dfce: DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
Merge commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b' into gingerbread-plus-aosp

* commit 'ba56dfce7c751081f2289aa33533dcf4822dc12b':
  DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
2010-09-19 11:10:57 -07:00
Mike Lockwood
ba56dfce7c DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events
This change is already in master

On some devices, switching the USB configuration to enable RNDIS can
result in multiple USB disconnect/reconnect events being generated.

Change-Id: I14b02aaca11bb708f6b3334e41a2f4d4fa7b7296
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-19 14:04:38 -04:00
Adam Powell
5d8f9dd357 am 99f0f367: am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Merge commit '99f0f3676f50640dbb22bd12960f771fc414862e'

* commit '99f0f3676f50640dbb22bd12960f771fc414862e':
  Fix some drawing artifacts/bugs around overlays/text anchors
2010-09-18 00:16:35 -07:00
Jeff Brown
a2135836d1 am a8d95248: am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
Merge commit 'a8d95248bdbb8ea0933ecf86d2859964324978a7'

* commit 'a8d95248bdbb8ea0933ecf86d2859964324978a7':
  Reduce lock thrashing in native Looper.
2010-09-18 00:16:29 -07:00
Adam Powell
c6cb8d6dfb am 4a4a53ae: am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4'

* commit '4a4a53ae07bb8f760d1e3c588262f56b3a72a7f4':
  Fix silly touch bug in TextView. Oops.
2010-09-17 23:26:05 -07:00
Marco Nelissen
ca216a03f5 am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'

* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 23:25:37 -07:00
Dianne Hackborn
03f3cb083d resolved conflicts for merge of 1f377298 to master
Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
2010-09-17 23:12:26 -07:00
Adam Powell
99f0f3676f am 4258bfb7: Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread
Merge commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1' into gingerbread-plus-aosp

* commit '4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1':
  Fix some drawing artifacts/bugs around overlays/text anchors
2010-09-17 19:30:03 -07:00
Jeff Brown
a8d95248bd am 7d4739be: Merge "Reduce lock thrashing in native Looper." into gingerbread
Merge commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b' into gingerbread-plus-aosp

* commit '7d4739bed5cd5f41ddfa431446b51f61b94d7b0b':
  Reduce lock thrashing in native Looper.
2010-09-17 19:29:50 -07:00
Adam Powell
4258bfb7a9 Merge "Fix some drawing artifacts/bugs around overlays/text anchors" into gingerbread 2010-09-17 19:15:38 -07:00
Adam Powell
23bd5f5075 Fix some drawing artifacts/bugs around overlays/text anchors
Change-Id: I28170d4e120506c09a1cfea721244fbcd3c2576a
2010-09-17 18:57:25 -07:00
John Wang
511f66d3b6 am afb777cb: am 0741a5ed: Merge "Add debug function." into gingerbread
Merge commit 'afb777cbd459f45eb833e12fbab03aed93f90409'

* commit 'afb777cbd459f45eb833e12fbab03aed93f90409':
  Add debug function.
2010-09-17 18:13:50 -07:00
Adam Powell
61241ad42a Merge "resolved conflicts for merge of b39470b5 to master" 2010-09-17 18:00:23 -07:00
Adam Powell
f37df070ea resolved conflicts for merge of b39470b5 to master
Change-Id: If441c8684c576b6cbc485a37088d6869ad3fb23f
2010-09-17 17:59:06 -07:00
Jeff Brown
7d4739bed5 Merge "Reduce lock thrashing in native Looper." into gingerbread 2010-09-17 17:26:02 -07:00
Jeff Brown
9604987289 Reduce lock thrashing in native Looper.
In the common case, there is nothing interesting happening on the native
Looper besides occasional wake ups.  There is no point grabbing the
semaphore then.

Change-Id: Ib5c426d0e158dfa37891b7ff5537b6f833592fad
2010-09-17 17:01:23 -07:00
Gil Dobjanschi
11dd325466 Merge "I splitted the start and end transtions into separate classes." 2010-09-17 16:43:25 -07:00
Gil Dobjanschi
7c1df82880 I splitted the start and end transtions into separate classes.
Change-Id: Ia8fbf5b34ee4b96fa4339d6dda78ec03c8a08615
2010-09-17 16:35:31 -07:00
Robert Greenwalt
1e58e4021c Merge "Enhance http proxy support" 2010-09-17 16:22:34 -07:00
Robert Greenwalt
d192dad69e Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.

bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
2010-09-17 16:14:10 -07:00
Jeff Brown
f1ec1ddd50 am bc9599d4: am 838e93ed: Merge "Looper: Drop default parameters in favor of a safer overload." into gingerbread
Merge commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca'

* commit 'bc9599d48c79c18d306a13f51af9ef2aac92cdca':
  Looper: Drop default parameters in favor of a safer overload.
2010-09-17 16:10:01 -07:00
Chet Haase
aca11c0cf4 am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686'

* commit '6dcffb434fff42b956b604e24a5b5728e721b686':
  new assets
2010-09-17 15:55:11 -07:00
Romain Guy
5e87e0d07d Merge "Fix positioning of 1 pixel wide lines (esp. non AA lines.)" 2010-09-17 15:49:56 -07:00
Romain Guy
be3512735c Merge changes Id5200e94,I08fcbfa7
* changes:
  Add support for non AA lines.
  Correctly free memory.
2010-09-17 15:49:30 -07:00
Andreas Huber
0a5dd105f7 am 7bc600cb: am f98197a7: Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec\'s destructor.
Merge commit '7bc600cb08394e60eef984843976d4f79e5d94e8'

* commit '7bc600cb08394e60eef984843976d4f79e5d94e8':
  Make sure the message dispatcher stays around until after OMX_FreeHandle is finished in case it posts some more messages during shutdown. Clear the source as soon as possible in OMXCodec's destructor.
2010-09-17 15:46:15 -07:00
Adam Powell
4a4a53ae07 am 25945ca2: Merge "Fix silly touch bug in TextView. Oops." into gingerbread
Merge commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266' into gingerbread-plus-aosp

* commit '25945ca2e67c0e46ff2ad46590cd71ca5b4b4266':
  Fix silly touch bug in TextView. Oops.
2010-09-17 15:46:07 -07:00
Marco Nelissen
5c9f357994 am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp

* commit 'f30fae63389a2216faf55636b95a08f35b5c3620':
  Add a check to track a problem the monkey script has been triggering.
2010-09-17 15:42:21 -07:00
Adam Powell
25945ca2e6 Merge "Fix silly touch bug in TextView. Oops." into gingerbread 2010-09-17 15:41:11 -07:00
Marco Nelissen
f30fae6338 Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread 2010-09-17 15:39:00 -07:00
Adam Powell
4d4d62b23a Fix silly touch bug in TextView. Oops.
Change-Id: Ib256154124c05944c7f2125edfd38ee6799412be
2010-09-17 15:38:43 -07:00
Romain Guy
b5ab4173e0 Fix positioning of 1 pixel wide lines (esp. non AA lines.)
Change-Id: Ic155cac72f351edae35dffdfbb236954f57ba7de
2010-09-17 15:36:56 -07:00
Andreas Huber
f6bd4369fd resolved conflicts for merge of 1fc97385 to master
Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
2010-09-17 15:35:59 -07:00
Romain Guy
c95c8d6bf8 Add support for non AA lines.
Change-Id: Id5200e94815404d62760437d0d2dbb0a9276c700
2010-09-17 15:31:32 -07:00