30662 Commits

Author SHA1 Message Date
Simon Wilson
ec94472835 Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 2011-03-30 13:26:45 -07:00
TK MUN
8a7fc0af61 DO NOT MERGE Disable WiMAX when "Data Enabled" is off
When user uncheck "Data Enabled" check box, WiMAX goes
into "disconnected" state.

Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-30 13:18:23 -07:00
Trevor Johns
428b85e03e Fixing line in Market IAB docs that explains how to bind to the
MarketService.

We use the IMarketBillingService, which is incorrect. It should be
"com.android.vending.billing.MarketBillingService.BIND".

Change-Id: Ie361e58cea8aca6d70bd48bce062ca8d062281ee
2011-03-30 11:30:09 -07:00
Eric Fischer
8b312c6ca1 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-30 10:41:05 -07:00
Jeff Hamilton
b98967942e am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
  Make STOP_APP_SWITCHES signatureOrSystem.
2011-03-30 09:30:40 -07:00
Irfan Sheriff
11ebb6f502 am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
2011-03-30 09:30:32 -07:00
Robert Greenwalt
ce6766ea51 am 568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Jason parks
cca2f2f987 Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Mike Lockwood
8f2e3862bc DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level.  On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.

Change-Id: I2c4f6edb34aae2064f4b62ec0461d1fdd8770541
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 23:05:59 -07:00
Eric Laurent
d7a724e6d8 Issue 4157048: mic gain for VoIP/SIP calls.
Herring board exhibits a strong echo even in non speakerphone modes.
To compensate the lack of AEC or AES when not in speakerphone, the mic gain
had been reduced in the ADC. But this has an adverse effect on other VoIP applications
that have their own AEC and are penalized by the weak mic gain.

This workaround enables an acceptable mic gain for other VoIP apps while offering a
SIP call experience which is not worse than it was with the residual echo that was
present even with mic gain reduction.

Change-Id: I33fd37858758e94e42ef5b545d3f0dc233220bf1
2011-03-29 18:44:03 -07:00
The Android Open Source Project
5e1383f257 am ad663d80: Merge from gingerbread
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts
2011-03-29 15:23:08 -07:00
Justin Ho
87805ca3a4 Updated CDMA roaming icons
Change-Id: Ib455c2b7196c2c2add58422187e6d752a28364c6
2011-03-29 14:43:13 -07:00
Jean-Baptiste Queru
bef31431ca No-op - reconcile with open-source gingerbread
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
2011-03-29 14:05:53 -07:00
The Android Open Source Project
ad663d8040 Merge from gingerbread
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
2011-03-29 13:54:43 -07:00
Michael I. Gold
c3fba3be74 egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-03-29 13:43:54 -07:00
Robert Greenwalt
27725e8cd1 Only leave one default network up at a time.
If original refuses to tear down, tear down new one.  It's better
to have none (which will try to launch them all again) than two.

Really people shouldn't refuse the teardown request.

bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
2011-03-29 11:36:28 -07:00
Eric Fischer
5e110ec141 Import revised translations. DO NOT MERGE
Change-Id: I2d4afddb1ff99b9861647d479ef5ce2de49b684d
2011-03-29 10:54:11 -07:00
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
1e7fb7aed7 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header.
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
2011-03-29 08:54:09 +02:00
Brad Fitzpatrick
b618b2ef87 am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-28 08:26:02 -07:00
Brad Fitzpatrick
7a84a60d56 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
f0dbf00d37 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -07:00
Brad Fitzpatrick
1a5a2379eb Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -07:00
Christer Fletcher
375fb9bfd2 Handle OutOfMemoryError when decoding images in ThumbnailUtils
Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.

Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
2011-03-28 14:47:55 +02:00
Robert Greenwalt
7544b23e52 Merge "Fix Default route after secondary net use." into gingerbread 2011-03-26 08:58:01 -07:00
Robert Greenwalt
ecc33d43e9 Fix Default route after secondary net use.
Backport of honeycomb-mr1 change 103299 adding a host route for the
default gateway before adding the default route.
Also fixing bug where "already active" condition of APN failed to
propagate the default gateway info, result in a loss of that address.

bug:4175328
Change-Id: I4cf8605b259cf40c3631c7ce6cca4c75c1b22651
2011-03-26 08:32:25 -07:00
Jeff Hamilton
96cf34d362 Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 2011-03-25 14:53:14 -07:00
Jeff Hamilton
10de0b31df Make STOP_APP_SWITCHES signatureOrSystem.
The NFC service relies on this permission
for it's dispatching mechanism and it is
no longer signed with the platform cert.

Bug: 4173610
Change-Id: I598ad2889c4af307f04433093923255fe7daedbb
2011-03-25 16:17:53 -05:00
Irfan Sheriff
05f14e2bcf Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 2011-03-25 11:01:02 -07:00
Irfan Sheriff
c0e0dbb454 DO NOT MERGE Pick upstream intf with valid IP conf
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I3e8ab5ef30b69f1adab755d83f5b65c078f73936
2011-03-25 10:09:55 -07:00
Robert Greenwalt
568845a766 Merge "Fix some alt-network issues." into gingerbread 2011-03-25 09:35:53 -07:00
Robert Greenwalt
7cf5b419da Fix some alt-network issues.
Two issues.
1) remove default routes for non-default networks.
2) don't report mobile is the active default network just because
   it is active.

bug:4157610
Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
2011-03-25 08:59:08 -07:00
Jeff Hamilton
ad91eee277 am 9c1ef098: Update the value for the NFC shared UID.
* commit '9c1ef098837bd73044cb970545344dd03f66daa0':
  Update the value for the NFC shared UID.
2011-03-24 20:21:41 -07:00
Jeff Hamilton
9c1ef09883 Update the value for the NFC shared UID.
Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
2011-03-24 21:39:58 -05:00
Bart Sears
35137d6696 am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-24 03:36:31 -07:00
Huahui Wu
772f5bb189 am f440831d: DO NOT MERGE
* commit 'f440831d76817e837164ca18c7705e81d2391f87':
  DO NOT MERGE
2011-03-24 03:35:59 -07:00
Mathias Jeppsson
b23949b745 Unregister callback from binder when vibration is removed
When creating new vibration pattern, a callback is registered
in case binding to caller goes away, by linkToDeath().
Need to unregister this callback when we throw away the vibration.

Change-Id: Ibdf0bd415a539054ac7a66f49b33a864f729c546
2011-03-24 08:49:12 +01:00
Bart Sears
6a19759c0f Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
Update Droid Fonts

DroidSans-Bold.ttf
DroidSans.ttf
DroidSansMono.ttf
DroidSerif-Bold.ttf
DroidSerif-BoldItalic.ttf
DroidSerif-Italic.ttf
DroidSerif-Regular.ttf
 - Fix the Tcedilla glyphs

DroidSansFallback
 - Add Dingbat Symbols
 - Add Currency Symbols
 - Add International Phonetic Alphabet (IPA)
 - Add U+02BB Modifier letter turned comma
 - Add U+2011 Non-breaking hyphen

DroidSansArabic.ttf
 - Updated Arabic font
 - Added support for initial and medial forms of Persian (Farsi) yeh (glyphs U+FBFE and U+FBFF)

Bug: 4167128
Change-Id: Iec3e5b20c6dd54ff7cc5bef51dd5a05179d8d5a8
2011-03-23 18:20:45 -07:00
Brad Fitzpatrick
6f67e7bf83 am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
  Making it possible to call SIP calls with special allowed chars.
2011-03-23 12:44:23 -07:00
Brad Fitzpatrick
a4206029cb am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit '5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-23 12:44:18 -07:00
Brad Fitzpatrick
2e383bc644 Merge "Making it possible to call SIP calls with special allowed chars." 2011-03-23 12:33:39 -07:00
Brad Fitzpatrick
5d5a0ca5eb Merge "Fixing the wrong link in YuvImage JavaDoc." 2011-03-23 12:30:28 -07:00
Huahui Wu
f440831d76 DO NOT MERGE
b/4088884 Backport "Remove content:// protocol handler in web browser"
to Gingerbread

It's a manual cherrypick of
     https://android-git.corp.google.com/g/#change,87278
since a lot has been changed in bettween.

Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
2011-03-23 09:41:09 -07:00
Nick Pelly
1492386257 am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
  NfcAdapterExtras: reset singleton state if initialization fails.
2011-03-22 10:14:36 -07:00
Nick Pelly
e69f4267e1 Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 2011-03-22 09:52:55 -07:00
Magnus Strandberg
b5c72ead01 Making it possible to call SIP calls with special allowed chars.
Since String.replaceFirst uses regex and since SIP user names are
allowed to include regex charaters such as '+', the code must
fist convert the string to a literal pattern String before using
replaceFirst method.

Change-Id: I25eac852bd620724ca1c5b2befc023af9dae3c1a
2011-03-22 08:03:58 +01:00
Erik Ljungberg
e83b744d7d Unable to push files to Windows 7
Windows 7 says it can handle the maximum OBEX packet size. However
if the maximum packet size is used the transfer will fail. This
should be fixed by Microsoft but until they do the only way to solve
this is to reduce the maximum packet size for the OBEX client.

Change-Id: I51975eec972395ae3f1f21cca236b223d0812ef3
2011-03-22 07:58:43 +01:00
Simon Wilson
03aa986e6b am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
  DO NOT MERGE Change WiMAX indicator display
2011-03-21 18:02:57 -07:00
Simon Wilson
1ba4897e89 Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 2011-03-21 16:58:41 -07:00