OSDN Git Service
Kenny Root [Wed, 13 Feb 2013 23:39:04 +0000 (23:39 +0000)]
Merge "KeyChain: return null instead of throw"
Kenny Root [Wed, 13 Feb 2013 23:22:50 +0000 (15:22 -0800)]
KeyChain: return null instead of throw
The API documentation says it will return null if the key isn't found.
We get null back from the keystore daemon when it can't retrieve the
data, so just return null back to the API caller.
Change-Id: I42248bd50cbc5f76864bd762aae3faab1c50529d
Jean-Baptiste Queru [Tue, 12 Feb 2013 22:32:30 +0000 (22:32 +0000)]
Merge "Revert "makefile changes for gcm javadocs""
Robert Ly [Tue, 12 Feb 2013 21:39:28 +0000 (21:39 +0000)]
Revert "makefile changes for gcm javadocs"
This reverts commit
5f9922d7c3bce158e4c7a58929d4075e7c91e32e
Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
Marco Nelissen [Tue, 12 Feb 2013 18:46:21 +0000 (18:46 +0000)]
Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
Marco Nelissen [Tue, 12 Feb 2013 18:33:41 +0000 (18:33 +0000)]
Revert "use utf8_length() instead of local function, isValidUtf8()"
This reverts commit
1a8b6c29aaa5a1591097daca0876808cc029cbda
Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni check.
Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
Jeff Brown [Sat, 9 Feb 2013 01:16:31 +0000 (17:16 -0800)]
Fix build break due to merge.
Change-Id: I08c39690ee9de825ff51afc7d102ee622af6ba13
Jeff Brown [Sat, 9 Feb 2013 00:58:14 +0000 (16:58 -0800)]
am
5262a108: Merge "Complete documentation of whereArgs (Issue #43061)"
# By Tim Roes
# Via Gerrit Code Review (1) and Tim Roes (1)
* commit '
5262a1082663610a888d1145fd9676f7db41d397':
Complete documentation of whereArgs (Issue #43061)
Jeff Brown [Sat, 9 Feb 2013 00:58:09 +0000 (16:58 -0800)]
am
fa49a6b1: Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
# By HeyRatFans
# Via Gerrit Code Review (1) and Matt Beale (1)
* commit '
fa49a6b13ebf496ea01d5981f69084596d06d464':
frameworks/base: Added English UK keyboard layout for physical keyboards
Jeff Brown [Fri, 8 Feb 2013 23:49:51 +0000 (23:49 +0000)]
Merge "Complete documentation of whereArgs (Issue #43061)"
Jeff Brown [Fri, 8 Feb 2013 23:49:46 +0000 (15:49 -0800)]
am
fe1f3a1b: Merge "Fix ViewRootImpl to find missing focus using D-pad."
# By Ki-Hwan Lee
# Via Gerrit Code Review (1) and Ki-Hwan Lee (1)
* commit '
fe1f3a1beff9f73f6a04bcc35239038a21bc38ff':
Fix ViewRootImpl to find missing focus using D-pad.
Jeff Brown [Fri, 8 Feb 2013 23:49:10 +0000 (23:49 +0000)]
Merge "frameworks/base: Added English UK keyboard layout for physical keyboards"
The Android Open Source Project [Fri, 8 Feb 2013 23:40:41 +0000 (15:40 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769
Jeff Brown [Fri, 8 Feb 2013 23:29:11 +0000 (23:29 +0000)]
Merge "Fix ViewRootImpl to find missing focus using D-pad."
The Android Automerger [Fri, 8 Feb 2013 21:51:07 +0000 (13:51 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Dirk Dougherty [Fri, 8 Feb 2013 19:21:03 +0000 (11:21 -0800)]
am
2e65e20c: am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2e65e20c761f0fdee98eeefe9a8ee13c95a8b1ff':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:17:50 +0000 (11:17 -0800)]
am
9b8b4ae5: am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:16:11 +0000 (11:16 -0800)]
am
f2d89ef9: am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
f2d89ef9d57b096962b802608a88d3483a51d08a':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:14:23 +0000 (11:14 -0800)]
am
64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '
64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Dirk Dougherty [Fri, 8 Feb 2013 19:09:53 +0000 (19:09 +0000)]
Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
Marco Nelissen [Fri, 8 Feb 2013 16:44:36 +0000 (08:44 -0800)]
am
b683f354: am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
b683f3542a123a07823b51643b1973507bfb57e2':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Marco Nelissen [Fri, 8 Feb 2013 16:41:20 +0000 (08:41 -0800)]
am
69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
# By Jan Bjernler
# Via Gerrit Code Review
* commit '
69abccc3cdacee354dec8867865a0577a4e14e63':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
Marco Nelissen [Fri, 8 Feb 2013 16:22:09 +0000 (16:22 +0000)]
Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
Jan Bjernler [Mon, 30 Apr 2012 07:16:52 +0000 (09:16 +0200)]
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
MediaStore.Audio.getContentUriForPath() returns an uri to
internal storage if anything but /mnt/sdcard/ is sent in.
This fix checks if there is an additional sdcard
(normally called ext_card) or usb mass storage attached to
the device and then returns an uri to the external db.
The extra sdcard name and the usb mass storage name info is read from
the system environment variable SECONDARY_STORAGE so if a customer
chooses to change the name this will work as expected.
Change-Id: Ib78bca929fe382d4770df895149a0132f0e56994
Jesse Hall [Fri, 8 Feb 2013 04:26:27 +0000 (20:26 -0800)]
am
c2edfa2b: am
7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
c2edfa2b9649f67c142b181c54580c015badfca3':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 04:26:23 +0000 (20:26 -0800)]
am
bc18fe85: am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
bc18fe851c98dbe6be4eb2655efb1ef95902d961':
Handle hotplug events as described instead of rescanning
Robert Ly [Fri, 8 Feb 2013 02:01:17 +0000 (18:01 -0800)]
am
ddc0a7bd: am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
ddc0a7bdf94f4ba84dd4b89b693eb148ff32b5d3':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:57:57 +0000 (17:57 -0800)]
am
11fa4460: am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
11fa446033a8600b681efeb857507388e8113d72':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:55:20 +0000 (17:55 -0800)]
am
9da9a7cd: am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
9da9a7cda27a9b9a3a08e64e81d0ca10ac4c4ec1':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:53:29 +0000 (17:53 -0800)]
am
e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '
e60b6023ae4fdea932d0effc553dddc38117d235':
makefile changes for gcm javadocs
Robert Ly [Fri, 8 Feb 2013 01:48:14 +0000 (01:48 +0000)]
Merge "makefile changes for gcm javadocs" into jb-mr1-dev
Jesse Hall [Fri, 8 Feb 2013 01:41:50 +0000 (17:41 -0800)]
am
7c292062: Merge "Process all display events in order"
# Via Gerrit Code Review
* commit '
7c2920625eb72216025aeb8ea8dce544df0eca36':
Process all display events in order
Jesse Hall [Fri, 8 Feb 2013 01:41:44 +0000 (17:41 -0800)]
am
fd1c028e: Merge "Handle hotplug events as described instead of rescanning"
# Via Gerrit Code Review
* commit '
fd1c028e34fc559ccccebd18979ee85ec7821dea':
Handle hotplug events as described instead of rescanning
Dirk Dougherty [Fri, 8 Feb 2013 01:32:35 +0000 (17:32 -0800)]
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
Jesse Hall [Fri, 8 Feb 2013 01:29:32 +0000 (01:29 +0000)]
Merge "Process all display events in order"
Jesse Hall [Fri, 8 Feb 2013 01:29:03 +0000 (01:29 +0000)]
Merge "Handle hotplug events as described instead of rescanning"
Katie McCormick [Fri, 8 Feb 2013 01:26:13 +0000 (17:26 -0800)]
am
2306f0ee: am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
2306f0ee3396cd8a85d04dfbc08fb8c5ffa6699f':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:23:00 +0000 (17:23 -0800)]
am
ee27bcda: am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
ee27bcda8644f8c3f2328acc248b8c5c9d152f59':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:21:29 +0000 (17:21 -0800)]
am
b68702eb: am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b68702eb0526633e51d9dbfe6fc971c168e1274a':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:18:48 +0000 (17:18 -0800)]
am
0e66f16a: Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '
0e66f16abd651bdf5833f4aede4899e627d7b333':
Doc change: Scroller Javadoc Bug #
7966653
Katie McCormick [Fri, 8 Feb 2013 01:14:47 +0000 (01:14 +0000)]
Merge "Doc change: Scroller Javadoc Bug #
7966653" into jb-mr1-dev
Katie McCormick [Thu, 7 Feb 2013 02:15:13 +0000 (18:15 -0800)]
Doc change: Scroller Javadoc Bug #
7966653
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
Katie McCormick [Thu, 7 Feb 2013 23:57:21 +0000 (15:57 -0800)]
am
93ebe284: am
80a01a7f: am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (3) and Katie McCormick (1)
* commit '
93ebe2845c7f2d7afea1b679020446adcd0047ee':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:54:33 +0000 (15:54 -0800)]
am
80a01a7f: am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (2) and Katie McCormick (1)
* commit '
80a01a7f1d30ea5540eb8827dd221623f46e5a80':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:52:32 +0000 (15:52 -0800)]
am
ef4196d0: am
89fafaea: Doc update: clean up
# Via Android Git Automerger (1) and Katie McCormick (1)
* commit '
ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98':
Doc update: clean up
Katie McCormick [Thu, 7 Feb 2013 23:49:36 +0000 (15:49 -0800)]
am
89fafaea: Doc update: clean up
# Via Katie McCormick
* commit '
89fafaeae73cc265f13775944ccb2841bbc6766c':
Doc update: clean up
The Android Automerger [Thu, 7 Feb 2013 22:23:30 +0000 (14:23 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Katie McCormick [Thu, 7 Feb 2013 22:23:14 +0000 (14:23 -0800)]
Doc update: clean up
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
Jesse Hall [Mon, 19 Nov 2012 18:53:26 +0000 (10:53 -0800)]
Process all display events in order
Display events in each batch received from IPC were being processed in
reverse order, and stopped after the first vsync event (latest
chronologically) was handled. This makes perfect sense for vsync
events, but is broken for hotplug events.
Now we process them all in order, handling all except vsync as we see
them. For vsync events, only the last is reported.
Bug:
7491120
Change-Id: I448d139d21dc27128d75ca1d661de666fff51bcb
Jesse Hall [Thu, 8 Nov 2012 19:55:14 +0000 (11:55 -0800)]
Handle hotplug events as described instead of rescanning
Hotplug events say which display they're for and whether the display
was connected or disconnected. Before, this info was ignored, and the
event just triggered a rescan of all displays. If a display was
disconnected and then reconnected quickly, the rescan would treat this
as a no-op or a device property change and wouldn't turn the display
on.
Now the display manager attempts to update its state with the change
the event describes. So a quick disconnect/connect cycle will cause
the display to be turned on since the display manager will have
updated its internal state to reflect the disconnect event, and will
treat the connect event as a new display rather than a device property
change.
Bug:
7491120
Change-Id: Ia83f7c96b7f16f4c1bed2a73e9b56b0bf7ee3984
Robert Ly [Wed, 5 Dec 2012 01:01:46 +0000 (17:01 -0800)]
makefile changes for gcm javadocs
Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2
Jaikumar Ganesh [Thu, 7 Feb 2013 18:57:40 +0000 (10:57 -0800)]
am
b9620a89: am
9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Android Git Automerger (1) and others
* commit '
b9620a89bd734d749cd162cbcda4699474bbf57a':
Services: Adding HSPAP info in Android
Jaikumar Ganesh [Thu, 7 Feb 2013 18:46:10 +0000 (10:46 -0800)]
am
9434c112: Merge "Services: Adding HSPAP info in Android"
# By Arun Ravindran
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '
9434c112d1fef52ade78d7ef818daf981bf63bef':
Services: Adding HSPAP info in Android
Jaikumar Ganesh [Thu, 7 Feb 2013 17:54:41 +0000 (17:54 +0000)]
Merge "Services: Adding HSPAP info in Android"
Daniel Sandler [Thu, 7 Feb 2013 06:03:55 +0000 (22:03 -0800)]
am
1fd77470: am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (1) and others
* commit '
1fd774709790b220bb780e95db7275d60a1eae57':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:03:51 +0000 (22:03 -0800)]
am
3c6ee5b5: am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (1) and others
* commit '
3c6ee5b509d6360a431290fff4b366848c293899':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 06:01:39 +0000 (22:01 -0800)]
am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Gerrit Code Review (1) and Jorge Ruesga (1)
* commit '
1a1e9b317ac2d737ad92a35c4d806f0fda1ede70':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:01:34 +0000 (22:01 -0800)]
am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit '
d2bec0960d04578182905b34795c6895760944dd':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 05:09:33 +0000 (05:09 +0000)]
Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
Jeffrey Brown [Thu, 7 Feb 2013 04:53:25 +0000 (20:53 -0800)]
am
7eb4db35: am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
7eb4db35935237a6bd029d5bafda97fa5d4d905c':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:53:21 +0000 (20:53 -0800)]
am
a0d547b4: am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (1) and others
* commit '
a0d547b43b3508c7253da234f529acf60d00fd13':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:53:17 +0000 (20:53 -0800)]
am
8934c575: am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (1) and others
* commit '
8934c57564a864e046c5172ba7d56ab68056ab26':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:53:14 +0000 (20:53 -0800)]
am
1e48b386: am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (1) and others
* commit '
1e48b386eac8cb1ca9e6e50d73422661691512dc':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:53:10 +0000 (20:53 -0800)]
am
ca7b1210: am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (1) and others
* commit '
ca7b1210292c2fc80fd40f1f4c8662a1faf0b7a5':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:53:06 +0000 (20:53 -0800)]
am
352d84b8: am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (1) and others
* commit '
352d84b841e7c81c259f5de576ea127d177b39f8':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:53:03 +0000 (20:53 -0800)]
am
1950d2e6: am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Android Git Automerger (1) and others
* commit '
1950d2e6575e04fc623d1d0bcc32393ce4dfef93':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:52:59 +0000 (20:52 -0800)]
am
e4ce2517: am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
e4ce25177bdf7720c6b3dd5ea7b48f6b03b06469':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:50:17 +0000 (20:50 -0800)]
am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review
* commit '
b9185fd1ffd85239e3ab10ab34cb9d8508970fb4':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:50:13 +0000 (20:50 -0800)]
am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Gerrit Code Review (1) and Masanori Ogino (1)
* commit '
dac4a90d656dca86bd14cd91d685c07d8a6b29a4':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:50:09 +0000 (20:50 -0800)]
am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
88ba2f48a2d1193f3877575b2589897a7804aa75':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:50:04 +0000 (20:50 -0800)]
am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
04ce0d253de9ec16f921824409a7b2c13195c19e':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:50:00 +0000 (20:50 -0800)]
am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Gerrit Code Review (1) and You Kim (1)
* commit '
ea56499dc36d863f92857ab7f93e5c4436f9654f':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:49:54 +0000 (20:49 -0800)]
am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Gerrit Code Review (1) and Roman Mazur (1)
* commit '
0d47af1131c4d4f9f29dad790d919d8599e3a3cc':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:47 +0000 (20:49 -0800)]
am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Gerrit Code Review (1) and git-lg-database.lge.com (1)
* commit '
af595a0f37643f12f32860fdea43fb67b74654b4':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:41 +0000 (20:49 -0800)]
am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
b314f433905ea2cbc62bd5af658f05261a752e5a':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:43:00 +0000 (04:43 +0000)]
Merge "NullPointerException in SQLiteSession"
Jeffrey Brown [Thu, 7 Feb 2013 04:42:31 +0000 (04:42 +0000)]
Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
Jeffrey Brown [Thu, 7 Feb 2013 04:40:30 +0000 (04:40 +0000)]
Merge "fix hover events consume issue"
Jeffrey Brown [Thu, 7 Feb 2013 04:39:35 +0000 (04:39 +0000)]
Merge "Disable usage of WAL in DatabaseHelper"
Ki-Hwan Lee [Tue, 8 Jan 2013 04:19:32 +0000 (13:19 +0900)]
Fix ViewRootImpl to find missing focus using D-pad.
By using D-pad, no-focus in non touch mode is rare but legal in a case like below.
1. The first request to get focus for a new activity is handled in the first
performTraversals() call when activity is not ready for a complete view hierarchy.
So there might be no focusable yet.
2. If the activity has some menus, ActionMenuView can be attached to the view hierarchy
in the PhoneWindow.preparePanel() soon.
So there can be focusables but still not focused.
Fixed ViewRootImpl.deliverKeyEventPostIme() to handle this case to resurrect a focus
if there are focusables.
How to reproduce:
(1) Open "API Demos" application -> Views -> Search View
(2) Select "Action Bar" item using the D-pad
(3) Try to focus the Search View, using the D-pad.
Change-Id: Ic379774f0307f168f0ed775d0f6a9078ac5c9713
Jeffrey Brown [Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)]
Merge "Keep native callbacks when primary SQLiteConnection is recreated"
Jeffrey Brown [Thu, 7 Feb 2013 04:04:57 +0000 (04:04 +0000)]
Merge "Potential NPE in SQLiteConnection"
Jeffrey Brown [Thu, 7 Feb 2013 03:59:20 +0000 (03:59 +0000)]
Merge "Clear loaders array after they are destroyed."
Jeffrey Brown [Thu, 7 Feb 2013 03:48:22 +0000 (03:48 +0000)]
Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
Jeffrey Brown [Thu, 7 Feb 2013 03:46:47 +0000 (03:46 +0000)]
Merge "add reply.writeNoException() for quick response"
Dake Gu [Wed, 6 Feb 2013 23:01:17 +0000 (15:01 -0800)]
am
96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Dake Gu (1)
* commit '
96111ddff7af61ce37fa8d9020d8e1eeba9095e8':
SimulatdDpad: fix NPE for event without device
Adam Powell [Wed, 6 Feb 2013 23:00:44 +0000 (15:00 -0800)]
am
351f7817: am
21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
351f7817e555f52571e72751bb452a715495f010':
avoid multiple-"0" to exceed the length of upper bound
Adam Powell [Wed, 6 Feb 2013 22:58:41 +0000 (14:58 -0800)]
am
21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
21af9a08465c4927aab9db30efdfcf5ee8f52410':
avoid multiple-"0" to exceed the length of upper bound
Dake Gu [Wed, 6 Feb 2013 22:56:58 +0000 (22:56 +0000)]
Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
Adam Powell [Wed, 6 Feb 2013 22:11:19 +0000 (22:11 +0000)]
Merge "avoid multiple-"0" to exceed the length of upper bound"
Scott Main [Wed, 6 Feb 2013 20:26:46 +0000 (12:26 -0800)]
am
b3a57191: am
0a00de11: am
805d2e2d: am
00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit '
b3a57191e62e0c394ba4a3448770853a1fb7ac3b':
docs: fix renderscript links that currently require redirect
Scott Main [Wed, 6 Feb 2013 20:23:36 +0000 (12:23 -0800)]
am
0a00de11: am
805d2e2d: am
00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '
0a00de118eedf9d050404f944bd563c27b86763e':
docs: fix renderscript links that currently require redirect
Scott Main [Wed, 6 Feb 2013 20:20:59 +0000 (12:20 -0800)]
am
805d2e2d: am
00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '
805d2e2d98fa8749d6ae38650c77c79611174944':
docs: fix renderscript links that currently require redirect
Scott Main [Wed, 6 Feb 2013 20:19:30 +0000 (12:19 -0800)]
am
00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '
00f490844d89b146e5490204a5a483834950c489':
docs: fix renderscript links that currently require redirect
Scott Main [Wed, 6 Feb 2013 20:14:48 +0000 (20:14 +0000)]
Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
The Android Open Source Project [Wed, 6 Feb 2013 17:11:21 +0000 (09:11 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668
Adam Powell [Wed, 6 Feb 2013 00:54:45 +0000 (16:54 -0800)]
am
a7e028a9: am
cef582ab: am
07cf971e: Fix re-enabled state of up after action view collapse
# Via Android Git Automerger (2) and Adam Powell (1)
* commit '
a7e028a976c3f3692fa3c72f0ae11c01354e4c9a':
Fix re-enabled state of up after action view collapse
Adam Powell [Wed, 6 Feb 2013 00:13:57 +0000 (16:13 -0800)]
Fix re-enabled state of up after action view collapse
A certain call ordering to the action bar could cause the record of
the pre-action view expanded home button enabled state to be
incorrect. Store this in all cases, not just when the action view is
initially expanded. (Except for when we actually disable it for the
expanded view.)
If an action view is already expanded when we get a call to change the
enabled state of the home/up button, don't modify the state of the up
container or other accessibility info, but record the new state if
requested.
Bug
8142097
Change-Id: I070c151aa9f2046d2114ee541d964bf68c6f0def
Adam Powell [Wed, 6 Feb 2013 00:53:04 +0000 (16:53 -0800)]
am
cef582ab: am
07cf971e: Fix re-enabled state of up after action view collapse
# Via Adam Powell (1) and Android Git Automerger (1)
* commit '
cef582ab0346afdaff9190565d432a9468ecdd7d':
Fix re-enabled state of up after action view collapse
Adam Powell [Wed, 6 Feb 2013 00:51:01 +0000 (16:51 -0800)]
am
07cf971e: Fix re-enabled state of up after action view collapse
# Via Adam Powell
* commit '
07cf971e58aecab76f2b5b575cfe62120005c6e4':
Fix re-enabled state of up after action view collapse