OSDN Git Service
Steve Block [Wed, 12 Oct 2011 16:27:03 +0000 (17:27 +0100)]
Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/141576
Bug:
5449033
Change-Id: I42575e7c29cf1c0f465c357a5c97ab118df6f473
Fred Quintana [Tue, 25 Oct 2011 03:39:44 +0000 (20:39 -0700)]
am
763480fb: Merge "Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable." into ics-mr0
* commit '
763480fbcabedfc2f425484ed74bc1e2e1392176':
Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable.
Fred Quintana [Tue, 25 Oct 2011 03:36:30 +0000 (20:36 -0700)]
Merge "Fixed a bug that causes AccountManager calls to hang forever, eventually exhausting the binder threads in the gapps process, making it unusable." into ics-mr0
The Android Open Source Project [Tue, 25 Oct 2011 00:16:23 +0000 (17:16 -0700)]
Reconcile with ics-mr0-release
Change-Id: I73df979432604dda0d826d90e4b0bec6b174e0b8
Peter Ng [Tue, 25 Oct 2011 00:03:40 +0000 (17:03 -0700)]
Merge "tablet unlock ring and wave updated for ics"
Eric Fischer [Tue, 25 Oct 2011 00:01:36 +0000 (17:01 -0700)]
am
5657b739: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
5657b7399eb94429a8cc00ad9f79eaad0c26b93b':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 24 Oct 2011 23:59:41 +0000 (16:59 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Scott Main [Mon, 24 Oct 2011 23:50:12 +0000 (16:50 -0700)]
am
057e85ac: Merge "docs: remove links to ADP devices" into ics-mr0
* commit '
057e85ac0b055e45cfec0e04da3d82c36918af78':
docs: remove links to ADP devices
Scott Main [Mon, 24 Oct 2011 23:47:49 +0000 (16:47 -0700)]
Merge "docs: remove links to ADP devices" into ics-mr0
Claudia de Veaux [Mon, 24 Oct 2011 22:35:34 +0000 (15:35 -0700)]
Merge "String scrub to implement punc, wording, cap standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328"
Jeff Brown [Mon, 24 Oct 2011 22:13:13 +0000 (15:13 -0700)]
Merge "Use libcorkscrew for stack unwinding."
The Android Automerger [Mon, 24 Oct 2011 21:55:08 +0000 (14:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jim Miller [Mon, 24 Oct 2011 20:32:31 +0000 (13:32 -0700)]
am
7a962fef: Merge "Fix
3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
* commit '
7a962fef2f26b941b916595562d5adfae943d432':
Fix
3384942: Force ASCII-capable IME to show on lockscreen
Xavier Ducrohet [Mon, 24 Oct 2011 20:32:30 +0000 (13:32 -0700)]
am
e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.
* commit '
e869ca9626146265bbb2b5043018dfe532e0661f':
CherryPick f9e455 from master to mr0. do not merge.
Jim Miller [Mon, 24 Oct 2011 20:31:15 +0000 (13:31 -0700)]
Merge "Fix
3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
CherryPick f9e455 from master to mr0. do not merge.
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
Brian Colonna [Mon, 24 Oct 2011 20:22:13 +0000 (13:22 -0700)]
am
c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
* commit '
c9c417c85d08074e5ececd5c74db1364e9c097c2':
Added callback to allow Face Unlock to hide black area
Xavier Ducrohet [Mon, 24 Oct 2011 20:20:07 +0000 (13:20 -0700)]
am
b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
* commit '
b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
CherryPick 35530d from master to mr0. do not merge.
Brian Colonna [Mon, 24 Oct 2011 20:19:55 +0000 (13:19 -0700)]
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
Xavier Ducrohet [Mon, 24 Oct 2011 20:01:46 +0000 (13:01 -0700)]
Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys."
The Android Automerger [Mon, 24 Oct 2011 19:56:26 +0000 (12:56 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Mon, 24 Oct 2011 19:46:39 +0000 (12:46 -0700)]
am
084369fb: docs: add uiOptions attribute to manifest docs
* commit '
084369fb5e738e4db6ae94b4e24e777bdd9d9c2c':
docs: add uiOptions attribute to manifest docs
Wink Saville [Mon, 24 Oct 2011 19:46:21 +0000 (12:46 -0700)]
am
cd3ec73f: Add getAvailableNetworks.
* commit '
cd3ec73f0ce164c718146bc1dbb7c430763be25a':
Add getAvailableNetworks.
Svetoslav Ganov [Mon, 24 Oct 2011 19:05:38 +0000 (12:05 -0700)]
Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
Peter Ng [Mon, 24 Oct 2011 17:55:30 +0000 (10:55 -0700)]
Merge "Stat notify image update"
The Android Open Source Project [Mon, 24 Oct 2011 13:32:19 +0000 (06:32 -0700)]
Reconcile with ics-mr0-release
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
Jeff Brown [Thu, 20 Oct 2011 03:32:43 +0000 (20:32 -0700)]
Use libcorkscrew for stack unwinding.
Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
The Android Automerger [Sat, 22 Oct 2011 06:22:41 +0000 (23:22 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Jake Hamby [Sat, 22 Oct 2011 00:04:15 +0000 (17:04 -0700)]
Merge "Add support for SMS-PP data download to USIM."
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Peter Ng [Fri, 21 Oct 2011 23:45:23 +0000 (16:45 -0700)]
am
be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
* commit '
be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
Peter Ng [Fri, 21 Oct 2011 23:42:49 +0000 (16:42 -0700)]
Merge "Do not merge - Recents background protection increased" into ics-mr0
John Reck [Fri, 21 Oct 2011 23:35:50 +0000 (16:35 -0700)]
Merge "Fix rebuildWebTextView issues"
Xavier Ducrohet [Fri, 21 Oct 2011 23:22:15 +0000 (16:22 -0700)]
Merge "Fix software GL renderer."
Xavier Ducrohet [Fri, 21 Oct 2011 23:18:48 +0000 (16:18 -0700)]
Fix software GL renderer.
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
Mathias Agopian [Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)]
am
aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
* commit '
aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
mDirtyRegion is single threaded, but could be accessed from a hwc thread
Eric Fischer [Fri, 21 Oct 2011 22:57:54 +0000 (15:57 -0700)]
am
148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
Mathias Agopian [Fri, 21 Oct 2011 22:57:45 +0000 (15:57 -0700)]
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 22:56:22 +0000 (15:56 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
The Android Automerger [Fri, 21 Oct 2011 22:55:40 +0000 (15:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 22:18:28 +0000 (15:18 -0700)]
mDirtyRegion is single threaded, but could be accessed from a hwc thread
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.
Bug:
5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
Daniel Shiplacoff [Fri, 21 Oct 2011 22:22:54 +0000 (15:22 -0700)]
Merge "Recents background protection increased"
John Reck [Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)]
am
8bf89f30: (-s ours) Fix the build
* commit '
8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
Adam Cohen [Fri, 21 Oct 2011 21:38:41 +0000 (14:38 -0700)]
am
e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
* commit '
e3bb0ecb2b36964cb3b02bc0d575e9366818ee00':
Removing fades on last item in StackView for major FPS improvement on Prime
John Reck [Fri, 21 Oct 2011 21:38:32 +0000 (14:38 -0700)]
am
2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
* commit '
2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Dianne Hackborn [Fri, 21 Oct 2011 21:38:31 +0000 (14:38 -0700)]
am
943da7b8: Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
* commit '
943da7b895b7cc69cdaed7979cff422a7dbaac19':
Fix issue #
5342788: Setting wallpaper from gallery set default...
Dirk Dougherty [Fri, 21 Oct 2011 20:59:34 +0000 (13:59 -0700)]
am
f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
* commit '
f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
Winson Chung [Fri, 21 Oct 2011 20:59:08 +0000 (13:59 -0700)]
am
53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
* commit '
53a1b82c9a2133c5c3184898335fce0826279691':
Last update for screenshot animations for MR0. (Bug:
5333706)
Dianne Hackborn [Fri, 21 Oct 2011 20:59:07 +0000 (13:59 -0700)]
am
4bbd71a6: Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
* commit '
4bbd71a6b2f4957f4778da13861ec03d30afbee7':
Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped
Mike Lockwood [Fri, 21 Oct 2011 20:59:05 +0000 (13:59 -0700)]
am
6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
* commit '
6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
Gilles Debunne [Fri, 21 Oct 2011 20:59:04 +0000 (13:59 -0700)]
am
0499f90a: Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
* commit '
0499f90a2d2774f28ca3d430dfe563391669c515':
Bug
5428541: Check that span is still in text before deleting
Eric Fischer [Fri, 21 Oct 2011 20:59:03 +0000 (13:59 -0700)]
am
4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0
* commit '
4e7ce9352b9c3a832715ac4b8014b2434a447172':
Import revised translations.
Adam Cohen [Fri, 21 Oct 2011 20:34:46 +0000 (13:34 -0700)]
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
Peter Ng [Fri, 21 Oct 2011 20:29:52 +0000 (13:29 -0700)]
Merge "Sharpening text edit assets"
George Mount [Fri, 21 Oct 2011 20:02:05 +0000 (13:02 -0700)]
Merge "Fixed spell check failing to change word."
RoboErik [Fri, 21 Oct 2011 20:01:56 +0000 (13:01 -0700)]
Merge "s/should/can"
John Reck [Fri, 21 Oct 2011 20:01:48 +0000 (13:01 -0700)]
Merge changes I2df047b6,I791eeb3c into ics-mr0
* changes:
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
Mangesh Ghiware [Fri, 21 Oct 2011 19:45:30 +0000 (12:45 -0700)]
Merge "Fix issue#
5492404: Reading level check thread error."
Dianne Hackborn [Fri, 21 Oct 2011 19:45:07 +0000 (12:45 -0700)]
Merge "Fix issue #
5342788: Setting wallpaper from gallery set default..." into ics-mr0
Dirk Dougherty [Fri, 21 Oct 2011 18:55:21 +0000 (11:55 -0700)]
Merge "Doc change: fix typo in platform highlights." into ics-mr0
Winson Chung [Fri, 21 Oct 2011 18:07:06 +0000 (11:07 -0700)]
Merge "Last update for screenshot animations for MR0. (Bug:
5333706)" into ics-mr0
Dianne Hackborn [Fri, 21 Oct 2011 18:03:34 +0000 (11:03 -0700)]
Merge "Fix issue #
5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0
RoboErik [Fri, 21 Oct 2011 18:00:40 +0000 (11:00 -0700)]
Merge "Color API comment updates."
Mike Lockwood [Fri, 21 Oct 2011 17:26:55 +0000 (10:26 -0700)]
Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
Gilles Debunne [Fri, 21 Oct 2011 16:48:07 +0000 (09:48 -0700)]
Merge "Bug
5428541: Check that span is still in text before deleting" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 16:34:22 +0000 (09:34 -0700)]
Merge "Import revised translations." into ics-mr0
Kristian Monsen [Fri, 21 Oct 2011 11:48:22 +0000 (04:48 -0700)]
Merge "WebView part of fix for bug
5307956"
Jake Hamby [Fri, 21 Oct 2011 07:49:41 +0000 (00:49 -0700)]
Merge "Add wrapper classes for UICC service tables."
satok [Fri, 21 Oct 2011 06:35:27 +0000 (23:35 -0700)]
am
2cf1cf09: Fix possible NPE
* commit '
2cf1cf098513807ffd3420ae106f438e943d0cd8':
Fix possible NPE
Romain Guy [Fri, 21 Oct 2011 03:33:51 +0000 (20:33 -0700)]
Merge "Make sure 9patches are not filtered when not necessary Bug #
5383406"
Fabrice Di Meglio [Fri, 21 Oct 2011 01:58:03 +0000 (18:58 -0700)]
Merge "Fix compilation issue when DEBUG_GLYPHS define is activated"
Mathias Agopian [Fri, 21 Oct 2011 00:48:02 +0000 (17:48 -0700)]
am
16bece04: Merge "added dpi and refresh rate info in SF\'s dumpsys" into ics-mr0
* commit '
16bece04bdbac9af5228436f70267ec5763315de':
added dpi and refresh rate info in SF's dumpsys
Mathias Agopian [Fri, 21 Oct 2011 00:45:55 +0000 (17:45 -0700)]
Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0
Jim Miller [Fri, 21 Oct 2011 00:35:51 +0000 (17:35 -0700)]
am
6b024448: Merge "Fix
5493266: Properly restore background after playing music" into ics-mr0
* commit '
6b0244485c1d20261cffb0fbabebdfefd701867e':
Fix
5493266: Properly restore background after playing music
Jim Miller [Fri, 21 Oct 2011 00:33:42 +0000 (17:33 -0700)]
Merge "Fix
5493266: Properly restore background after playing music" into ics-mr0
Mathias Agopian [Fri, 21 Oct 2011 00:22:38 +0000 (17:22 -0700)]
added dpi and refresh rate info in SF's dumpsys
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
Jake Hamby [Thu, 20 Oct 2011 23:55:48 +0000 (16:55 -0700)]
Merge "Add new RIL requests to support SIM data download via SMS over IMS."
Adam Powell [Thu, 20 Oct 2011 23:26:56 +0000 (16:26 -0700)]
am
a5c371bf: Merge "Bug
5275928 - Invasion of the monkeys" into ics-mr0
* commit '
a5c371bf1fc878f84c296a63839a5d031dea843f':
Bug
5275928 - Invasion of the monkeys
Adam Powell [Thu, 20 Oct 2011 23:25:04 +0000 (16:25 -0700)]
Merge "Bug
5275928 - Invasion of the monkeys" into ics-mr0
Iliyan Malchev [Thu, 20 Oct 2011 05:35:56 +0000 (22:35 -0700)]
add -ldl to host executables
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.
Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Automerger [Thu, 20 Oct 2011 22:49:44 +0000 (15:49 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Michael Chan [Thu, 20 Oct 2011 22:42:30 +0000 (15:42 -0700)]
Merge "Fix typos"
Gilles Debunne [Thu, 20 Oct 2011 22:35:34 +0000 (15:35 -0700)]
Merge "Renaming of a hidden API: ShowSoftInputOnFocus"
Gilles Debunne [Thu, 20 Oct 2011 22:35:20 +0000 (15:35 -0700)]
Merge "Typo in ViewRootImpl"
Gilles Debunne [Thu, 20 Oct 2011 22:35:12 +0000 (15:35 -0700)]
Merge "Wrong word cut at end of lines with spaces"
Irfan Sheriff [Thu, 20 Oct 2011 22:07:46 +0000 (15:07 -0700)]
am
2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0
* commit '
2159927f366fd8a617128df60865923e131cad7b':
Fix handling in DisconnectingState
Irfan Sheriff [Thu, 20 Oct 2011 22:05:07 +0000 (15:05 -0700)]
Merge "Fix handling in DisconnectingState" into ics-mr0
Dirk Dougherty [Thu, 20 Oct 2011 21:34:50 +0000 (14:34 -0700)]
am
957ad44e: Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
* commit '
957ad44e9c6f1415dae85a0177d37c3a69f1e955':
Doc change: minor fixes to ICS highlights.
Dirk Dougherty [Thu, 20 Oct 2011 21:32:19 +0000 (14:32 -0700)]
Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
Svetoslav Ganov [Thu, 20 Oct 2011 21:29:18 +0000 (14:29 -0700)]
Merge "Add content description setter to RemoteViews"
Jason Sams [Thu, 20 Oct 2011 20:54:37 +0000 (13:54 -0700)]
Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff."
Jason Sams [Thu, 20 Oct 2011 20:52:43 +0000 (13:52 -0700)]
Merge "Remove ObjBaseRef from the hal struct"
Jason Sams [Thu, 20 Oct 2011 20:49:59 +0000 (13:49 -0700)]
Merge "Fixes and optimizations of two quaternion functions."
Christopher Tate [Thu, 20 Oct 2011 20:21:07 +0000 (13:21 -0700)]
Merge "Don't inappropriately kill ANRing drop recipients"
Daniel Sandler [Thu, 20 Oct 2011 20:11:15 +0000 (13:11 -0700)]
am
d2cd1f72: Merge "Lazily fetch the status bar service." into ics-mr0
* commit '
d2cd1f722421c33e88df92d036663f30b316fa3f':
Lazily fetch the status bar service.
Daniel Sandler [Thu, 20 Oct 2011 20:08:36 +0000 (13:08 -0700)]
Merge "Lazily fetch the status bar service." into ics-mr0
Scott Main [Thu, 20 Oct 2011 20:05:38 +0000 (13:05 -0700)]
am
b321cd99: docs: fix tools release notes links
* commit '
b321cd99c24272494bb9af5662c18c5bdc507186':
docs: fix tools release notes links
Eric Fischer [Thu, 20 Oct 2011 18:29:19 +0000 (11:29 -0700)]
am
7ec4284a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
7ec4284ab2026a82e6904a4974db8f947c159960':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:25:44 +0000 (11:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Michael Chan [Thu, 20 Oct 2011 17:51:58 +0000 (10:51 -0700)]
Merge "Update comments for Calendar ExtendedProperties."