ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
39,984 Commits 2 Branches 0 Tags 54 MiB
754112477f
Commit Graph

39984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
754112477f Reconcile with ics-mr0-release 
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
 2011-10-24 06:32:19 -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
Gilles Debunne
93245acf5e 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
 2011-10-21 13:59:04 -07:00
Eric Fischer
f0fcd8acdf am 4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0 
* commit '4e7ce9352b9c3a832715ac4b8014b2434a447172':
  Import revised translations.
 2011-10-21 13:59:03 -07:00
Adam Cohen
f91a2f070a Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0 2011-10-21 13:34:46 -07:00
Peter Ng
86079cdbff Merge "Sharpening text edit assets" 2011-10-21 13:29:52 -07:00
George Mount
94e43502d4 Merge "Fixed spell check failing to change word." 2011-10-21 13:02:05 -07:00
RoboErik
dbbe0342d6 Merge "s/should/can" 2011-10-21 13:01:56 -07:00
John Reck
b038496fca Merge changes I2df047b6,I791eeb3c into ics-mr0 
* changes:
  Fix rebuildWebTextView issues
  DO NOT MERGE Fixed spell check failing to change word.
 2011-10-21 13:01:48 -07:00
Mangesh Ghiware
24fd6e4f65 Merge "Fix issue# 5492404: Reading level check thread error." 2011-10-21 12:45:30 -07:00
Dianne Hackborn
615699532b Merge "Fix issue #5342788: Setting wallpaper from gallery set default..." into ics-mr0 2011-10-21 12:45:07 -07:00
Dirk Dougherty
458e581b48 Merge "Doc change: fix typo in platform highlights." into ics-mr0 2011-10-21 11:55:21 -07:00
Winson Chung
f8bf356c3e Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0 2011-10-21 11:07:06 -07:00
Dianne Hackborn
9ed4fbc0cd Merge "Fix issue #5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0 2011-10-21 11:03:34 -07:00
RoboErik
d43e420ee6 Merge "Color API comment updates." 2011-10-21 11:00:40 -07:00
Mike Lockwood
b3edff3264 Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0 2011-10-21 10:26:55 -07:00
Gilles Debunne
307f970b88 Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0 2011-10-21 09:48:07 -07:00
Eric Fischer
07c74bdad2 Merge "Import revised translations." into ics-mr0 2011-10-21 09:34:22 -07:00
Kristian Monsen
87e18446c5 Merge "WebView part of fix for bug 5307956" 2011-10-21 04:48:22 -07:00
Jake Hamby
df27253f83 Merge "Add wrapper classes for UICC service tables." 2011-10-21 00:49:41 -07:00
satok
4850ca9760 am 2cf1cf09: Fix possible NPE 
* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE
 2011-10-20 23:35:27 -07:00
Romain Guy
25e6e077af Merge "Make sure 9patches are not filtered when not necessary Bug #5383406" 2011-10-20 20:33:51 -07:00
Fabrice Di Meglio
b3e39c43bb Merge "Fix compilation issue when DEBUG_GLYPHS define is activated" 2011-10-20 18:58:03 -07:00
Mathias Agopian
7ec662c07a 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
 2011-10-20 17:48:02 -07:00
Mathias Agopian
52cbf99446 Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0 2011-10-20 17:45:55 -07:00
Jim Miller
4da8dfc68d am 6b024448: Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 
* commit '6b0244485c1d20261cffb0fbabebdfefd701867e':
  Fix 5493266: Properly restore background after playing music
 2011-10-20 17:35:51 -07:00
Jim Miller
3b91d48938 Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 2011-10-20 17:33:42 -07:00
Mathias Agopian
d5e4ef9e43 added dpi and refresh rate info in SF's dumpsys 
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
 2011-10-20 17:22:38 -07:00