OSDN Git Service
Brian Carlstrom [Thu, 28 Feb 2013 01:58:09 +0000 (17:58 -0800)]
Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
Change-Id: Ieba5705f4faa7cea619cf509db3ef081fda570d5
Nick Kralevich [Fri, 1 Mar 2013 16:40:13 +0000 (16:40 +0000)]
Merge "installd: use correct header file."
Nick Kralevich [Fri, 1 Mar 2013 16:39:37 +0000 (16:39 +0000)]
Merge "ZygoteInit: use correct header files."
Nick Kralevich [Fri, 1 Mar 2013 00:49:43 +0000 (16:49 -0800)]
ZygoteInit: use correct header files.
Don't define capget / capset when we already have definitions
of it in our header files.
Change-Id: Ia2d7e408879bd09019f99aef52acb63a7a243d48
Nick Kralevich [Fri, 1 Mar 2013 00:43:23 +0000 (16:43 -0800)]
installd: use correct header file.
Change-Id: I035524b857a04f8400e96468310d88abf247e582
Dianne Hackborn [Wed, 27 Feb 2013 19:57:08 +0000 (19:57 +0000)]
Merge "Fix starting window memory leak"
Ian Rogers [Wed, 27 Feb 2013 19:47:15 +0000 (19:47 +0000)]
Merge "Track stack memory in MemoryInfo."
Ian Rogers [Wed, 27 Feb 2013 18:57:13 +0000 (10:57 -0800)]
Track stack memory in MemoryInfo.
In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.
Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.
Bug:
8265251
Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
Ian Rogers [Wed, 27 Feb 2013 16:45:39 +0000 (16:45 +0000)]
Merge "Deprecate and document memory allocation counting."
Romain Guy [Wed, 27 Feb 2013 06:07:30 +0000 (06:07 +0000)]
Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."
Ian Rogers [Sat, 23 Feb 2013 03:59:23 +0000 (19:59 -0800)]
Deprecate and document memory allocation counting.
Bug:
8241521
Change-Id: I174c4024600c5b78e74030ecc99e784a98295f09
Elliott Hughes [Tue, 26 Feb 2013 17:37:58 +0000 (17:37 +0000)]
Merge "Fix incorrect FloatMath documentation."
Kenny Root [Tue, 26 Feb 2013 17:35:13 +0000 (17:35 +0000)]
Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help""
Elliott Hughes [Tue, 26 Feb 2013 17:28:17 +0000 (09:28 -0800)]
Fix incorrect FloatMath documentation.
Change-Id: I30bbe500e634b73f3456ccc797106ad261fd0ce7
Martin Olsson [Tue, 26 Feb 2013 16:54:39 +0000 (17:54 +0100)]
Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help"
Change-Id: I8f869c9d2243ae8ff414399b7d6835c7ca74d500
Signed-off-by: Martin Olsson <martin@minimum.se>
Elliott Hughes [Mon, 25 Feb 2013 22:50:51 +0000 (22:50 +0000)]
Merge "Remove obsolete traceview file format documentation."
Ian Rogers [Mon, 25 Feb 2013 17:13:23 +0000 (17:13 +0000)]
Merge "Recognize odex files in memory accounting."
Elliott Hughes [Sat, 23 Feb 2013 05:21:03 +0000 (21:21 -0800)]
Remove obsolete traceview file format documentation.
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
Ian Rogers [Sat, 23 Feb 2013 04:35:06 +0000 (20:35 -0800)]
Recognize odex files in memory accounting.
Give odex files the same heap category as dex files.
Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
Adam Powell [Fri, 22 Feb 2013 21:29:44 +0000 (21:29 +0000)]
Merge "Fix ListView is not scrolled properly with arrows"
Ian Rogers [Fri, 22 Feb 2013 18:02:40 +0000 (18:02 +0000)]
Merge "Account malloc mmaped pages as native heap."
Ian Rogers [Fri, 22 Feb 2013 17:40:58 +0000 (09:40 -0800)]
Account malloc mmaped pages as native heap.
Currently when malloc uses a page rather than brk the heap gets accounted as
ashmem memory. Previously the memory would be accounted as unknown but since
[1] it gets accounted as ashmem. This change makes the accounting see this
memory as being native, ie the same kind of memory we associate with brk.
[1] https://android-review.googlesource.com/#/c/49583/3
Change-Id: I6f496cfeb590268d41d8e047b12cd5c90359e2b0
Kenny Root [Fri, 22 Feb 2013 00:05:36 +0000 (00:05 +0000)]
Merge "StreamingZipInflater: fix mmap'd end of read"
Wink Saville [Wed, 20 Feb 2013 23:04:31 +0000 (23:04 +0000)]
Merge "Allow three digit phone numbers"
Victoria Lease [Tue, 19 Feb 2013 17:40:08 +0000 (17:40 +0000)]
Merge "Applying ChannelScrolling to remove calculateDragAngle"
kiwon [Thu, 7 Feb 2013 11:02:39 +0000 (20:02 +0900)]
Applying ChannelScrolling to remove calculateDragAngle
To avoid angle calculation changed the logic to use virtual areas.
When try to drag or pan, check where the current touch point locates
and determine how to drag a page.
Change-Id: Id9bd08a69c4ac93ff385c8088e6c16bed5dc5f88
Signed-off-by: kiwon <kiwon98.lee@samsung.com>
Irfan Sheriff [Fri, 15 Feb 2013 23:42:28 +0000 (23:42 +0000)]
Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
* changes:
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
Wink Saville [Wed, 13 Feb 2013 01:07:21 +0000 (17:07 -0800)]
Fix broken test.
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
Irfan Sheriff [Tue, 5 Feb 2013 17:44:12 +0000 (09:44 -0800)]
Track keys per config and allow cert push from apps
Allow configuring keys for a configuration and update/delete
from wificonfigstore.
Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
Irfan Sheriff [Thu, 17 Jan 2013 16:58:14 +0000 (08:58 -0800)]
eix enterprise config storage bugs
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.
Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.
Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
Irfan Sheriff [Tue, 15 Jan 2013 18:35:02 +0000 (10:35 -0800)]
Fix connectivitymanagertest
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
Irfan Sheriff [Tue, 15 Jan 2013 18:02:31 +0000 (10:02 -0800)]
Fix build
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
Irfan Sheriff [Fri, 11 Jan 2013 22:03:55 +0000 (14:03 -0800)]
Refactor enterprise config
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
Kenny Root [Fri, 15 Feb 2013 17:37:11 +0000 (09:37 -0800)]
StreamingZipInflater: fix mmap'd end of read
When reaching the end of a mmap'd segment, it was erroneously trying to
read more data. This is because we were reading data one character at a
time, so we never reached the Z_STREAM_END result without going through
the loop once more.
Bug: https://code.google.com/p/android/issues/detail?id=39041
Change-Id: I6c53b8187384a42217c32112d6a0c2857f471109
Bin Zhu [Wed, 19 Sep 2012 13:00:49 +0000 (15:00 +0200)]
Allow three digit phone numbers
The comment for the PHONE pattern says:
"<digit><digit|sdd>+<digit>"
But the actual pattern requires that the string contains
more than that. A phone number should be allowed to be
three digits.
Change-Id: I86d2f3d634cd0c1654dad9814906f151055dc23a
Kenny Root [Thu, 14 Feb 2013 20:18:09 +0000 (20:18 +0000)]
Merge "KeyStore: stop using state()"
Kenny Root [Thu, 14 Feb 2013 18:18:38 +0000 (10:18 -0800)]
KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
Wim Vander Schelden [Thu, 7 Feb 2013 15:51:51 +0000 (15:51 +0000)]
Check and fail early if requested wallpaper size exceeds maximum texture size.
This fixes an issue where OpenGL initialization succeeds but buffer allocation fails because the requested wallpaper size
is too large (or otherwise unsupported) by the graphics hardware. This fixes an issue where SystemUI crashes constantly
on the PandaBoard when connected to a full HD display. Tested only on PandaBoard, no access to alternative hardware.
Signed-off-by: Wim Vander Schelden <wim.vander.schelden@philips.com>
Change-Id: I8d2e1ae9fd9772977c4e365f23f2f58bbca3787c
Kenny Root [Thu, 14 Feb 2013 00:49:20 +0000 (00:49 +0000)]
Merge "VpnDialogs: filter obscured touches"
Kenny Root [Thu, 14 Feb 2013 00:32:36 +0000 (16:32 -0800)]
VpnDialogs: filter obscured touches
Change-Id: Ifcc919c36006c88e36363f5160f9334df0cf7e5b
Kenny Root [Wed, 13 Feb 2013 23:43:57 +0000 (23:43 +0000)]
Merge "Track keystore binder changes"
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
Kenny Root [Wed, 13 Feb 2013 23:22:25 +0000 (15:22 -0800)]
Track keystore binder changes
Change-Id: Id6133be059a8a0901d16355a9152e40e4a255454
Mathias Jeppsson [Fri, 24 Aug 2012 13:25:32 +0000 (15:25 +0200)]
Fix starting window memory leak
If starting window is added to arrays like mViews in
WindowManagerImpl.java, but not accepted by WindowManagerService,
we leak starting windows. To avoid leaking, remove the view
from WindowManager.
Change-Id: I4d98b883e9dfaf5e71bdece385643ba1b59b2633
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
Jaewan Kim [Sun, 3 Feb 2013 16:12:28 +0000 (01:12 +0900)]
Fix ListView is not scrolled properly with arrows
According to ListView's layoutChildren logic, it detaches all children
and rebuilds its children based on visible area which might omit
invisible elements in the adapter.
In this case, arrowScroll methods only tries to find next scroll
candidates from its children so user is unable to scroll more with
D-pad.
This fixes the issue by look forward next child among the adapter as
well as children.
Bug:
7346868
Change-Id: I01ab19ad899b5bcb5ab420ddf08c9ffd136933d1
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
OSDN Git Service
