OSDN Git Service
Brad Fitzpatrick [Wed, 23 Mar 2011 19:33:39 +0000 (12:33 -0700)]
Merge "Making it possible to call SIP calls with special allowed chars."
Brad Fitzpatrick [Wed, 23 Mar 2011 19:30:28 +0000 (12:30 -0700)]
Merge "Fixing the wrong link in YuvImage JavaDoc."
Magnus Strandberg [Tue, 22 Mar 2011 07:03:58 +0000 (08:03 +0100)]
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
Brad Fitzpatrick [Thu, 17 Mar 2011 16:51:47 +0000 (09:51 -0700)]
Merge "Removing dead store; it was likely a relict of debuging code."
Jozef BABJAK [Tue, 22 Feb 2011 08:48:18 +0000 (09:48 +0100)]
Removing dead store; it was likely a relict of debuging code.
Change-Id: I4daab1359d7c4b300ef61e3de1578d9fecb6f8da
Brad Fitzpatrick [Tue, 15 Mar 2011 18:23:44 +0000 (11:23 -0700)]
Merge "Releasing lock even if exception is thrown."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:22:43 +0000 (11:22 -0700)]
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:19:23 +0000 (11:19 -0700)]
Merge "Removing self-assignment statement."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:18:18 +0000 (11:18 -0700)]
Merge "Fixing self-assignment in copying code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:15:19 +0000 (11:15 -0700)]
Merge "Fixing self-assignment in cloning code."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:13:01 +0000 (11:13 -0700)]
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:12:15 +0000 (11:12 -0700)]
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:03:29 +0000 (11:03 -0700)]
Merge "Fixing improper boxing to Integer instead of Long."
Brad Fitzpatrick [Tue, 15 Mar 2011 18:00:51 +0000 (11:00 -0700)]
Merge "Using proper key for removing object from the map."
Brad Fitzpatrick [Tue, 15 Mar 2011 17:56:16 +0000 (10:56 -0700)]
Merge changes I81fc2f90,I5e7fd759
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
Kenny Root [Fri, 11 Mar 2011 22:22:22 +0000 (14:22 -0800)]
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
Chih-Wei Huang [Thu, 10 Mar 2011 09:49:03 +0000 (17:49 +0800)]
Remove unnecessary SkImageDecoder_libjpeg.cpp
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's
out/target/external/skia/src/images/SkImageDecoder_libjpeg.o
It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.
Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.
Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
Jozef BABJAK [Tue, 22 Feb 2011 07:22:45 +0000 (08:22 +0100)]
Lazy initialization must be synchronized to avoid parallel instances cretation.
Change-Id: I9c6887c714f42534a465c266689dc03ee7298900
Jozef BABJAK [Mon, 21 Feb 2011 14:55:01 +0000 (15:55 +0100)]
Fixing improper boxing to Integer instead of Long.
This is tricky: entry.getMessageBox() returns int, so it is
by default boxed to Integer. Map.get() however accepts Objects,
so it ignores the difference, but nothing is find during lookup,
just because Long and Integer objects are compared using equals(),
which has to lead to 'false' result. So, explicit boxning to Long
is unnecessary here.
Change-Id: I967a7829a8926410a00274c6b5e312e1af567299
Dianne Hackborn [Tue, 1 Mar 2011 02:03:12 +0000 (18:03 -0800)]
am
62619392: Merge "Fix leak when keylock is recreated."
* commit '
626193926df0b3c7236e5c244f30d797d9192e0d':
Fix leak when keylock is recreated.
Dianne Hackborn [Tue, 1 Mar 2011 01:54:54 +0000 (17:54 -0800)]
Merge "Fix leak when keylock is recreated."
Jaikumar Ganesh [Tue, 1 Mar 2011 00:00:01 +0000 (16:00 -0800)]
am
1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
* commit '
1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
Phone crash when old callback func is woken up when enabling BT.
Jaikumar Ganesh [Mon, 28 Feb 2011 23:33:34 +0000 (15:33 -0800)]
Merge "Phone crash when old callback func is woken up when enabling BT."
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:15:46 +0000 (10:15 -0800)]
am
e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
* commit '
e0537f1859664ba9c9cf87eb9d6dc3c16986dbb8':
Fix of tearDown() in SingleLaunchActivityTestCase.
Jean-Baptiste Queru [Mon, 28 Feb 2011 18:12:08 +0000 (10:12 -0800)]
Merge "Fix of tearDown() in SingleLaunchActivityTestCase."
Xavier Ducrohet [Mon, 28 Feb 2011 17:16:38 +0000 (09:16 -0800)]
am
dff6b8e7: Merge "Add --non-constant-id to aapt."
* commit '
dff6b8e71dda9f5d841fa26408714aec2aef1505':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
Kenneth Andersson [Thu, 10 Feb 2011 12:47:29 +0000 (13:47 +0100)]
Fix leak when keylock is recreated.
DigitalClock could sometimes leak when the keylock was recreated.
This happened because onDetachedFromWindow() was called BEFORE
onAttachedFromWindow().
This is the flow that causes the memory leak:
1) The LockPatternKeyGuardView is created and added. This will start
a loop dispatching onAttachedToWindow() to all views involved.
2) PatternUnlockScreen.onAttachedToWindow() is called
3) If the configuration has changed since creation, recreateMe() in
LockPatternKeyguardView.java is called.
4) recreateScreens() is called
5) PatternUnlockScreen is removed (to be re-added later) in
LockPatternKeyguardView.recreateUnlockScreen()
6) Since DigitalClock is a part of PatternUnlockScreen, its
onDetachedFromWindow() will be called.
7) The loop started in 1) will continue to dispatch
onAttachedToWindow() - and will eventually call
DigitalClock.onAttachedToWindow()
8) DigitalClock.onAttachedToWindow() registers a receiver that is
normally unregistered in onDetachedFromWindow(). But since
onDetachedFromWindow was already called in 6), it will not be called
again.
9) The receiver has leaked, and it has a reference to DigitalClock,
so that will leak as well, together with its parents e.g.
PatternUnlockScreen and LockPatternKeyguardView
The fix is to wait with the recreation of the screens (in 4) until
the loop (in 1) is finished. This is done by posting this as an event
instead of calling recreateScreens() immediately.
It is possible that this a fix for the root cause mentioned in
"Fix
3106227: use WeakReferences for receivers in DigitalClock class"
8b886fab5496b0b1f5193f21855220176deddc37 by Jim Miller
<jaggies@google.com>.
Change-Id: I6a5f6f49a565d459bf4e285f34f053cc1022286f
Xavier Ducrohet [Thu, 24 Feb 2011 23:59:26 +0000 (15:59 -0800)]
Merge "Add --non-constant-id to aapt."
Wink Saville [Thu, 24 Feb 2011 01:40:43 +0000 (17:40 -0800)]
Merge "WAPPushManager, WAP Push over SMS message handler"
Mike Lockwood [Thu, 24 Feb 2011 00:27:27 +0000 (16:27 -0800)]
Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence"
Mike Lockwood [Wed, 23 Feb 2011 16:21:00 +0000 (08:21 -0800)]
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Change-Id: Id5467000f3f3da5cbe1f112dad97a032688d2eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
Brad Fitzpatrick [Wed, 23 Feb 2011 16:17:31 +0000 (08:17 -0800)]
Merge "Fixed GSM encoded network initiated position request"
Elliott Hughes [Tue, 22 Feb 2011 19:16:04 +0000 (11:16 -0800)]
Merge "Ensuring thread-safe usage of DateFormat."
Brad Fitzpatrick [Tue, 22 Feb 2011 18:55:44 +0000 (10:55 -0800)]
Merge "Fix for an infinite loop while scrolling lists."
Brad Fitzpatrick [Tue, 22 Feb 2011 16:23:23 +0000 (08:23 -0800)]
Merge "Fixing infinite loop for zero duration."
Hakan Gustavsson [Thu, 18 Nov 2010 14:00:35 +0000 (15:00 +0100)]
Fixed GSM encoded network initiated position request
GSM encoded network initiated position requests were previously
not correctly decoded. The GSM encoded string was decoded as
ASCII but not all characters are encoded in the same way for
GSM and ASCII. These characters was not displayed.
Besides that, when the number of characters was evenly divided
by 8 the last character was lost. This is also corrected.
Change-Id: Ic70b7c28bbba1f2936a9cc99e78f8002cc5c8761
Jozef BABJAK [Tue, 22 Feb 2011 08:33:19 +0000 (09:33 +0100)]
Releasing lock even if exception is thrown.
However, the whole method needs to be reviewed. It still has several
locking/unlocking places not tied together by try-finally construct,
but they cannot be fixed without deeper understanding.
Change-Id: Iaaf87568d585327654be409377b6d57a1da135eb
Jozef BABJAK [Tue, 22 Feb 2011 08:17:51 +0000 (09:17 +0100)]
Ensuring thread-safe usage of DateFormat.
DateFormat is inherently unsafe for multithreaded use. This patch adds
proper synchronization. The 'sLock' is re-used. To avoid two consecutive
lockings, locked version of initFormatStrings() method is created and
used where appropriate, i.e. in original method AND in added synchronized
block.
Change-Id: Id3c34613623e743e703aadb2342aa788679dda8a
Jozef BABJAK [Tue, 22 Feb 2011 07:09:01 +0000 (08:09 +0100)]
Removing self-assignment statement.
Change-Id: I429235093de4539bde3950075fbdaa4ef5bdeedd
Jozef BABJAK [Tue, 22 Feb 2011 07:06:44 +0000 (08:06 +0100)]
Fixing self-assignment in copying code.
Change-Id: I0799f83dc9d02b9bc31c76e747e6ba1ff58000b0
Jozef BABJAK [Tue, 22 Feb 2011 07:05:08 +0000 (08:05 +0100)]
Fixing self-assignment in cloning code.
Change-Id: I6c918c0c7345678cbb171905eccfca50e59ae41a
Jozef BABJAK [Tue, 22 Feb 2011 06:57:51 +0000 (07:57 +0100)]
Removing repetitive conditional; it simply does nothing except slowing down things.
Change-Id: I53a176cebae0051a33647317e2f269ebf149f7d2
Jozef BABJAK [Tue, 22 Feb 2011 06:55:23 +0000 (07:55 +0100)]
Removing repetitive conditional; it simply does nothing except slowing down things.
Change-Id: Ibe76c1ed49bdf66eb57702e5f89363a5132d9617
Jozef BABJAK [Tue, 22 Feb 2011 06:20:30 +0000 (07:20 +0100)]
Fixing infinite loop for zero duration.
Change-Id: I837478c1598f1d2f99bf773597f0d66d0fc3cf1a
Jozef BABJAK [Mon, 21 Feb 2011 14:44:06 +0000 (15:44 +0100)]
Using proper key for removing object from the map.
Stored value was used for map removal instead of key. The error was
silently ignore, because remove() method accepts Object type argument
and siletly does nothing when no value identified by such key is
found. Now proper key is used for removal. i.e. the same as for lookup.
Change-Id: I3a61fc219385cd0e7bcd4a33cd6ca23be220efe3
Jozef BABJAK [Mon, 21 Feb 2011 14:33:59 +0000 (15:33 +0100)]
Using proper key for removing from map.
Window object was improperly used as a key for removing record from
map. This was silenly ignored, because remove() method accepts Object.
However, the ID should be used there which is type of String, i.e.
the same ID which was used for lookup.
Change-Id: I81fc2f90926a34414bf9042ddf4a2edff4c1fda1
Jozef BABJAK [Mon, 21 Feb 2011 14:19:00 +0000 (15:19 +0100)]
Removing wrong equals method in comparator.
This implementation of equals method has been likely created by
template in an IDE. It is useless, possibly leading to poor performance
and completely violating the contract of equals method as defined in
Object base class.
Change-Id: I5e7fd759b7bd9370b44d9374b57390c4e9feba02
Daniel Mladenovic [Mon, 21 Feb 2011 08:17:40 +0000 (09:17 +0100)]
Fix for an infinite loop while scrolling lists.
When scrolling in a list it's possible to get stuck in a
loop where the screen is continuously redrawn. This happens
when you are at the end of a list and try to scroll further.
The problem is that you enter a switch statement with the
mState variable set to STATE_PULL_DECAY. This will trigger
code in the switch statement that does some adjustments and
calculations, but it does not change the value of mState to
STATE_IDLE or STATE_RECEDE after it's done. Hence it will
continue to return to the same place and not stop updating
since the update() method signals for completion only when
the mState variable is set to STATE_IDLE.
The fix is changing the value of mState after the
adjustments and calculations have been made.
Change-Id: I57bc84ec12d43ca87a1163d94cb5b206a376a24e
Romain Guy [Fri, 18 Feb 2011 15:53:50 +0000 (07:53 -0800)]
am
7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit '
7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945: ProgressBar.setMax() will always redraw.
Romain Guy [Fri, 18 Feb 2011 06:40:33 +0000 (22:40 -0800)]
Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
Michael Krehan [Fri, 18 Feb 2011 04:04:27 +0000 (20:04 -0800)]
Fix for #12945: ProgressBar.setMax() will always redraw.
Fix for issue #12945: Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.
Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91
noda [Thu, 19 Aug 2010 23:10:00 +0000 (08:10 +0900)]
WAPPushManager, WAP Push over SMS message handler
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages. This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.
- This patch contains the WAPPushManager itself, the associated test
code, and the modifications to telephony to use the WAPPushManager.
Change-Id: I4f7fb5b68fc666da9bdeeea525e8797ae317e4b5
Xavier Ducrohet [Tue, 15 Feb 2011 00:58:00 +0000 (16:58 -0800)]
Add --non-constant-id to aapt.
This option enbables creating resource constant in the R class
that are not actual constant, but simply static fields.
The goal is to build library projects with these types of
IDs so that the constant does not get inlined in the library
code, since the ID for the library resources only are not
the final values.
The final resource IDs, generated from the main project and
its library(ies), will have proper constant with the final
values.
This allows us to generate binary library bundle (a jar file
and associated resources) that can be distributed. Additionally,
this will let us make the library project support in Eclipse
much more robust and a better user experience overall.
Change-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2
Robert Ly [Fri, 11 Feb 2011 21:18:31 +0000 (13:18 -0800)]
am
322891c6: Doc change: nfc dev guide
* commit '
322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:04:53 +0000 (10:04 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:54:59 +0000 (09:54 -0800)]
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:39:46 +0000 (09:39 -0800)]
Merge "stubs"
Steve Block [Fri, 11 Feb 2011 00:04:48 +0000 (16:04 -0800)]
stubs
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
Robert Ly [Thu, 10 Feb 2011 21:42:13 +0000 (13:42 -0800)]
Doc change: nfc dev guide
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
Gilles Debunne [Thu, 10 Feb 2011 00:49:42 +0000 (16:49 -0800)]
am
2050de5b: Text selection is broken.
* commit '
2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
Gilles Debunne [Wed, 9 Feb 2011 22:17:22 +0000 (14:17 -0800)]
Text selection is broken.
Bug
3439569
Lazy initialization code was not back-ported.
Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
Wink Saville [Wed, 9 Feb 2011 21:45:37 +0000 (13:45 -0800)]
am
01a5eba8: am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
Wink Saville [Wed, 9 Feb 2011 21:42:45 +0000 (13:42 -0800)]
am
6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '
6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
Wink Saville [Wed, 9 Feb 2011 21:09:24 +0000 (13:09 -0800)]
Merge "Telephony: Fix cb sms implementation"
Mathias Agopian [Wed, 9 Feb 2011 21:09:12 +0000 (13:09 -0800)]
am
ada1b6f2: Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit '
ada1b6f297596cac4451edbc83df060a31cdda68':
fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep
Mathias Agopian [Wed, 9 Feb 2011 21:06:00 +0000 (13:06 -0800)]
Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
Scott Main [Wed, 9 Feb 2011 21:03:11 +0000 (13:03 -0800)]
am
07cefd3c: add 2.3.3 announcement to site home page
* commit '
07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
Scott Main [Wed, 9 Feb 2011 18:17:08 +0000 (10:17 -0800)]
add 2.3.3 announcement to site home page
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
Jeff Hamilton [Wed, 9 Feb 2011 08:36:53 +0000 (00:36 -0800)]
am
58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit '
58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
Jeff Hamilton [Wed, 9 Feb 2011 08:34:22 +0000 (00:34 -0800)]
Merge "More documentation updates for NFC." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 08:26:47 +0000 (17:26 +0900)]
More documentation updates for NFC.
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
Dirk Dougherty [Wed, 9 Feb 2011 07:27:53 +0000 (23:27 -0800)]
am
a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit '
a3f53afd13bc1722464e169cb82a01d3898852b5':
Doc change: Add version notes for Android 2.3.3.
Nick Pelly [Wed, 9 Feb 2011 07:25:29 +0000 (23:25 -0800)]
am
39cf3a44: Document NFC permissions.
* commit '
39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
Dirk Dougherty [Wed, 9 Feb 2011 07:24:22 +0000 (23:24 -0800)]
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
Nick Pelly [Mon, 7 Feb 2011 08:04:21 +0000 (17:04 +0900)]
Document NFC permissions.
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
Dirk Dougherty [Tue, 8 Feb 2011 01:32:11 +0000 (17:32 -0800)]
Doc change: Add version notes for Android 2.3.3.
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
Jeff Hamilton [Wed, 9 Feb 2011 03:33:53 +0000 (19:33 -0800)]
am
584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '
584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
Jeff Hamilton [Wed, 9 Feb 2011 03:30:47 +0000 (19:30 -0800)]
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 03:27:01 +0000 (12:27 +0900)]
Improve the docs a bit for foreground dispatch.
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
Eric Fischer [Wed, 9 Feb 2011 01:32:18 +0000 (17:32 -0800)]
am
be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
Scott Main [Wed, 9 Feb 2011 01:32:14 +0000 (17:32 -0800)]
am
3c01a139: rename SIP doc title
* commit '
3c01a139f0d8ece0e300be26ac41280f1e934747':
rename SIP doc title
Scott Main [Wed, 9 Feb 2011 01:32:06 +0000 (17:32 -0800)]
am
c442bc60: docs: move the SIP guide into guide/network/
* commit '
c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
Katie McCormick [Wed, 9 Feb 2011 01:31:59 +0000 (17:31 -0800)]
am
7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '
7134520b2635474c5e7f4902c26e12d0ffcc9c64':
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
Dirk Dougherty [Wed, 9 Feb 2011 01:31:54 +0000 (17:31 -0800)]
am
01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '
01967c0ee104e985167374e41f2c416c1100f767':
Doc change: Add diff report for api 10.
Gilles Debunne [Wed, 9 Feb 2011 01:31:33 +0000 (17:31 -0800)]
am
cdfe8999: Fix for multiple merge problem.
* commit '
cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
Alex Yakavenka [Wed, 9 Feb 2011 01:18:46 +0000 (17:18 -0800)]
Telephony: Fix cb sms implementation
Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
Gilles Debunne [Wed, 9 Feb 2011 00:33:58 +0000 (16:33 -0800)]
resolved conflicts for merge of
c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
Eric Fischer [Tue, 8 Feb 2011 18:00:24 +0000 (10:00 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Scott Main [Tue, 8 Feb 2011 17:37:47 +0000 (09:37 -0800)]
rename SIP doc title
Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
Scott Main [Tue, 8 Feb 2011 02:35:49 +0000 (18:35 -0800)]
docs: move the SIP guide into guide/network/
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
Katie McCormick [Sat, 5 Feb 2011 01:41:07 +0000 (17:41 -0800)]
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
Doc change: Adding new docs for SIP API
Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
Dirk Dougherty [Tue, 8 Feb 2011 01:21:56 +0000 (17:21 -0800)]
Merge "Doc change: Add diff report for api 10." into gingerbread
Eric Fischer [Mon, 7 Feb 2011 21:17:26 +0000 (13:17 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
Brad Fitzpatrick [Mon, 7 Feb 2011 18:07:46 +0000 (10:07 -0800)]
am
b901c9ab: am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 18:04:54 +0000 (10:04 -0800)]
am
9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '
9204644d9e8fc2a3d05ff386b14b349f7a117694':
Fix a race condition in NativeDaemonConnector
Brad Fitzpatrick [Mon, 7 Feb 2011 17:55:34 +0000 (09:55 -0800)]
Merge "Fix a race condition in NativeDaemonConnector"
anga [Tue, 1 Feb 2011 13:10:25 +0000 (14:10 +0100)]
Fix a race condition in NativeDaemonConnector
Fixes a race between the onDaemonConnected callback and setting the
mOutputStream in NativeDaemonConnector.
MountService connects to vold using the NativeDaemonConnector.
Throws a “NativeDaemonConnectorException: No output stream!”
when the onDaemonConnected callback in MountService calls the doListCommand.
Change-Id: Ib895bab37f7df680e4362df6366198c0a673c5e9
Dianne Hackborn [Mon, 7 Feb 2011 15:51:34 +0000 (07:51 -0800)]
am
4b7c1cac: am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
4b7c1cacca252f735d23f7e01885214630d83f32':
Fixing possible race condition.
Dianne Hackborn [Mon, 7 Feb 2011 15:33:38 +0000 (07:33 -0800)]
am
bb2e1ef8: Merge "Fixing possible race condition."
* commit '
bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
Dianne Hackborn [Sun, 6 Feb 2011 17:06:35 +0000 (09:06 -0800)]
Merge "Fixing possible race condition."