Robert Ly
810c1c0c35
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
6d104f118a
am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
stubs
2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
6901f963c2
am 93552de8: Merge "stubs"
...
* commit '93552de8e305027fb003401e347b9493c64c981f':
stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
93552de8e3
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
1da970625c
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Jamie Gennis
c86d904b71
Prevent SurfaceFlinger from using layer token 31.
...
Bug: 2964479
Change-Id: I81e948924bff35b8b300d409f2c09f3779bcdeec
2011-02-10 16:18:36 -08:00
Robert Ly
322891c689
Doc change: nfc dev guide
...
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
2011-02-10 13:42:13 -08:00
Gilles Debunne
8e28ab22de
am 2050de5b: Text selection is broken.
...
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
2011-02-09 16:49:42 -08:00
Dianne Hackborn
e5dea7537c
Attempt to reduce problems from issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current...
...process has android.permission.WAKE_LOCK.
It looks like, somehow, the calling uid/pid of the SyncHandler
thread is getting corrupted. This change has Looper check for
these values changing from their original defaults and, if there
is a problem, resetting them and logging a WTF. Hopefully this
will avoid crashing the process, while also giving us more
helpful error reports about what is going on.
Change-Id: Iff06d575951fb8c06e2a3c31141f2907a715eb81
2011-02-09 14:19:23 -08:00
Gilles Debunne
2050de5b9a
Text selection is broken.
...
Bug 3439569
Lazy initialization code was not back-ported.
Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
2011-02-09 14:17:22 -08:00
Wink Saville
bdce3d2c35
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
2011-02-09 13:45:37 -08:00
Wink Saville
01a5eba810
am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
2011-02-09 13:42:45 -08:00
Wink Saville
6e25789fbe
Merge "Telephony: Fix cb sms implementation"
2011-02-09 13:09:24 -08:00
Mathias Agopian
d0f27f435e
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
2011-02-09 13:09:12 -08:00
Mathias Agopian
ada1b6f297
Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
2011-02-09 13:06:00 -08:00
Scott Main
b605869cd3
am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
add 2.3.3 announcement to site home page
2011-02-09 13:03:11 -08:00
Scott Main
07cefd3cc3
add 2.3.3 announcement to site home page
...
Change-Id: I4323a1a30fad8a67cce55baba9f7a89c4bdd4494
2011-02-09 10:17:08 -08:00
Jeff Hamilton
c1cc9ba6d1
am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e
Merge "More documentation updates for NFC." into gingerbread
2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec
More documentation updates for NFC.
...
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
2011-02-09 17:26:47 +09:00
Dirk Dougherty
8d56f6decf
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.
2011-02-08 23:27:53 -08:00
Nick Pelly
47dac545da
am 39cf3a44: Document NFC permissions.
...
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
2011-02-08 23:25:29 -08:00
Dirk Dougherty
a3f53afd13
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
2011-02-08 23:24:22 -08:00
Nick Pelly
39cf3a445e
Document NFC permissions.
...
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
2011-02-09 16:10:46 +09:00
Dirk Dougherty
237a3440d3
Doc change: Add version notes for Android 2.3.3.
...
Change-Id: I32dffaee15079a3dffb30dcdff6587be03378fc5
2011-02-08 20:10:51 -08:00
Jeff Hamilton
1ac35411f1
am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
2011-02-08 19:33:53 -08:00
Jeff Hamilton
584afa8dde
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f
Improve the docs a bit for foreground dispatch.
...
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
2011-02-09 12:30:18 +09:00
Eric Fischer
c1c3143347
am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
2011-02-08 17:32:18 -08:00
Scott Main
129c73723f
am 3c01a139: rename SIP doc title
...
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
rename SIP doc title
2011-02-08 17:32:14 -08:00
Scott Main
42f1819497
am c442bc60: docs: move the SIP guide into guide/network/
...
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
docs: move the SIP guide into guide/network/
2011-02-08 17:32:06 -08:00
Katie McCormick
690d31a6a8
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
2011-02-08 17:31:59 -08:00
Dirk Dougherty
be04bfd099
am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
...
* commit '01967c0ee104e985167374e41f2c416c1100f767':
Doc change: Add diff report for api 10.
2011-02-08 17:31:54 -08:00
Gilles Debunne
63bd55c7bf
am cdfe8999: Fix for multiple merge problem.
...
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Alex Yakavenka
f7de51cc4d
Telephony: Fix cb sms implementation
...
Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
2011-02-08 17:18:46 -08:00
Gilles Debunne
e04c14962f
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
...
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Eric Fischer
be4b39d2fd
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-02-08 10:00:24 -08:00
Scott Main
3c01a139f0
rename SIP doc title
...
Change-Id: I14aa36bc617ef77c20804c868caa8bf85b0fb5f8
2011-02-08 09:37:47 -08:00
Scott Main
c442bc605c
docs: move the SIP guide into guide/network/
...
Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f
2011-02-07 18:35:49 -08:00
Katie McCormick
7134520b26
cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2
...
Doc change: Adding new docs for SIP API
Change-Id: I62bedbcaab3900edcc49d67b59279c5025977a95
2011-02-07 18:32:04 -08:00
Dirk Dougherty
01967c0ee1
Merge "Doc change: Add diff report for api 10." into gingerbread
2011-02-07 17:21:56 -08:00
Eric Fischer
dff2fea9b1
Import revised translations. DO NOT MERGE
...
Change-Id: I9fe35888f8aa02c559949ad8395e8e4f4dffb669
2011-02-07 13:17:26 -08:00
Brad Fitzpatrick
a62bf8bb6b
am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
...
* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
Fix a race condition in NativeDaemonConnector
2011-02-07 10:07:46 -08:00
Brad Fitzpatrick
b901c9abff
am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
...
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
Fix a race condition in NativeDaemonConnector
2011-02-07 10:04:54 -08:00
Brad Fitzpatrick
9204644d9e
Merge "Fix a race condition in NativeDaemonConnector"
2011-02-07 09:55:34 -08:00
anga
030bc88b4c
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
2011-02-07 09:53:59 -08:00
Dianne Hackborn
6b497a0446
am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
Fixing possible race condition.
2011-02-07 07:51:34 -08:00
Dianne Hackborn
4b7c1cacca
am bb2e1ef8: Merge "Fixing possible race condition."
...
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
Fixing possible race condition.
2011-02-07 07:33:38 -08:00
Dianne Hackborn
bb2e1ef87f
Merge "Fixing possible race condition."
2011-02-06 09:06:35 -08:00
Gilles Debunne
cdfe899991
Fix for multiple merge problem.
...
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
2011-02-04 16:50:01 -08:00