Steve Block
9f760150f6
Rename (IF_)LOG() to (IF_)ALOG() DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/141576
Bug: 5449033
Change-Id: I42575e7c29cf1c0f465c357a5c97ab118df6f473
2011-10-25 16:28:24 +01:00
Fred Quintana
ae83b8ee9b
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.
2011-10-24 20:39:44 -07:00
Fred Quintana
9adb59f7ac
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
2011-10-24 20:36:30 -07:00
The Android Open Source Project
c4c3c8b20e
Reconcile with ics-mr0-release
...
Change-Id: I73df979432604dda0d826d90e4b0bec6b174e0b8
2011-10-24 17:16:23 -07:00
Peter Ng
32380878c5
Merge "tablet unlock ring and wave updated for ics"
2011-10-24 17:03:40 -07:00
Eric Fischer
a19d7644c2
am 5657b739: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '5657b7399eb94429a8cc00ad9f79eaad0c26b93b':
Import revised translations. DO NOT MERGE
2011-10-24 17:01:36 -07:00
Eric Fischer
b0f5300356
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-24 16:59:41 -07:00
Scott Main
f35496a820
am 057e85ac: Merge "docs: remove links to ADP devices" into ics-mr0
...
* commit '057e85ac0b055e45cfec0e04da3d82c36918af78':
docs: remove links to ADP devices
2011-10-24 16:50:12 -07:00
Scott Main
ac1fc6a492
Merge "docs: remove links to ADP devices" into ics-mr0
2011-10-24 16:47:49 -07:00
Claudia de Veaux
e9135e9ed6
Merge "String scrub to implement punc, wording, cap standards. Bugs: 5165745, 5163232, 5162668, 5162667, 5162328"
2011-10-24 15:35:34 -07:00
Jeff Brown
93a4a7f088
Merge "Use libcorkscrew for stack unwinding."
2011-10-24 15:13:13 -07:00
The Android Automerger
63fcce607b
merge in ics-mr0-release history after reset to ics-mr0
2011-10-24 14:55:08 -07:00
Jim Miller
d706882f07
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
2011-10-24 13:32:31 -07:00
Xavier Ducrohet
f2ec33a777
am e869ca96: (-s ours) CherryPick f9e455 from master to mr0. do not merge.
...
* commit 'e869ca9626146265bbb2b5043018dfe532e0661f':
CherryPick f9e455 from master to mr0. do not merge.
2011-10-24 13:32:30 -07:00
Jim Miller
54450b52d3
Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0
2011-10-24 13:31:15 -07:00
Xavier Ducrohet
c9c85fb2d2
CherryPick f9e455 from master to mr0. do not merge.
...
Fix software GL renderer.
Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
2011-10-24 13:29:26 -07:00
Brian Colonna
32c1a95f18
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
2011-10-24 13:22:13 -07:00
Xavier Ducrohet
e33558752f
am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
...
* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
CherryPick 35530d from master to mr0. do not merge.
2011-10-24 13:20:07 -07:00
Brian Colonna
d4f3e054e0
Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0
2011-10-24 13:19:55 -07:00
Xavier Ducrohet
d58d3c281b
Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys."
2011-10-24 13:01:46 -07:00
The Android Automerger
8da46bf97b
merge in ics-mr0-release history after reset to ics-mr0
2011-10-24 12:56:26 -07:00
Scott Main
3a212f57f0
am 084369fb: docs: add uiOptions attribute to manifest docs
...
* commit '084369fb5e738e4db6ae94b4e24e777bdd9d9c2c':
docs: add uiOptions attribute to manifest docs
2011-10-24 12:46:39 -07:00
Wink Saville
312552da15
am cd3ec73f: Add getAvailableNetworks.
...
* commit 'cd3ec73f0ce164c718146bc1dbb7c430763be25a':
Add getAvailableNetworks.
2011-10-24 12:46:21 -07:00
Svetoslav Ganov
79469f5d93
Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces."
2011-10-24 12:05:38 -07:00
Peter Ng
1b839b1cea
Merge "Stat notify image update"
2011-10-24 10:55:30 -07:00
The Android Open Source Project
754112477f
Reconcile with ics-mr0-release
...
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
2011-10-24 06:32:19 -07:00
Jeff Brown
e27d62bbf2
Use libcorkscrew for stack unwinding.
...
Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
2011-10-22 15:44:12 -07:00
The Android Automerger
1e0ed9d640
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 23:22:41 -07:00
Jake Hamby
f17f5a24c7
Merge "Add support for SMS-PP data download to USIM."
2011-10-21 17:04:15 -07:00
Mathias Agopian
0ef47a6a15
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
2011-10-21 17:04:05 -07:00
Peter Ng
f1b1ee1eb2
am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
...
* commit 'be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
2011-10-21 16:45:23 -07:00
Peter Ng
724e6d05eb
Merge "Do not merge - Recents background protection increased" into ics-mr0
2011-10-21 16:42:49 -07:00
John Reck
231c43a7b2
Merge "Fix rebuildWebTextView issues"
2011-10-21 16:35:50 -07:00
Xavier Ducrohet
7f6aec0185
Merge "Fix software GL renderer."
2011-10-21 16:22:15 -07:00
Xavier Ducrohet
4c4163b53e
Fix software GL renderer.
...
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
2011-10-21 16:18:48 -07:00
Mathias Agopian
51726c381e
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
2011-10-21 16:00:00 -07:00
Eric Fischer
3d62b42d64
am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
...
* commit '148d5bd855e4872bbe99870b0019462bcf73b72c':
Import revised translations. DO NOT MERGE
2011-10-21 15:57:54 -07:00
Mathias Agopian
239c049108
Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0
2011-10-21 15:57:45 -07:00
Eric Fischer
482346aec3
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-21 15:56:22 -07:00
The Android Automerger
69bd1e50f8
merge in ics-mr0-release history after reset to ics-mr0
2011-10-21 15:55:40 -07:00
Mathias Agopian
0dfb7b73a4
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
2011-10-21 15:41:01 -07:00
Daniel Shiplacoff
28e30beef8
Merge "Recents background protection increased"
2011-10-21 15:22:54 -07:00
John Reck
b6f5ebd0a4
am 8bf89f30: (-s ours) Fix the build
...
* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
Fix the build
2011-10-21 15:22:11 -07:00
Adam Cohen
2b9b071810
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
2011-10-21 14:38:41 -07:00
John Reck
888a37534f
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.
2011-10-21 14:38:32 -07:00
Dianne Hackborn
6fe0208494
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...
2011-10-21 14:38:31 -07:00
Dirk Dougherty
7978457c29
am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
...
* commit 'f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
2011-10-21 13:59:34 -07:00
Winson Chung
3abb9fc2ee
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)
2011-10-21 13:59:08 -07:00
Dianne Hackborn
bfdb57b6ca
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
2011-10-21 13:59:07 -07:00
Mike Lockwood
2775ddf89a
am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
...
* commit '6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
2011-10-21 13:59:05 -07:00