drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,421 Commits 1 Branch 0 Tags
Commit Graph

74421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Git Automerger
3b5966b069 am d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit 'd1ba68955947c208831711efdf2d6c4e5fb86d84':
 2012-04-10 15:09:20 -07:00
Robert Ly
97dbfc7ae3 am bc8eaa7d: am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit 'bc8eaa7d63865ee2532014419a0e384c62c7027e':
 2012-04-10 15:09:13 -07:00
Robert Ly
5df9ad98b6 am 030c8614: am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '030c86145a011dc20012f2a63aa0da6e365c50b2':
 2012-04-10 15:09:11 -07:00
Robert Ly
55fc26c250 am 21b2ec79: am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '21b2ec7980b405f5c808a265c04cc1b3f1ae23de':
 2012-04-10 15:09:09 -07:00
Android Git Automerger
d1ba689559 Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-10 15:01:06 -07:00
Robert Ly
a8ed2880a8 am d87121f4: am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit 'd87121f46efd48f63f3cd181c8ff081f11ff0feb':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:34:04 -07:00
Robert Ly
b18530c45d am 07ced01f: am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '07ced01f0420ec0d70b1dd38e41e9b3b121fffb0':
  docs: fixing ndk bug 5991108
 2012-04-10 14:34:03 -07:00
Robert Ly
d7e4e482df am 12d80df0: am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '12d80df0b276b5d7e3e56388c02108a3a1f864cb':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:34:00 -07:00
Craig Mautner
f0cabba38b Merge "Fix NPE in setTransparentRegion." 2012-04-10 14:33:07 -07:00
Robert Ly
bc8eaa7d63 am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '11d33b3da5fa8c46be17135deecdded9f11b61a0':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:30:34 -07:00
Robert Ly
030c86145a am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit 'b3f7fc2f7769defa8c7de9254f0cba163a2ea63e':
  docs: fixing ndk bug 5991108
 2012-04-10 14:30:32 -07:00
Robert Ly
21b2ec7980 am 9fd8aaca: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '9fd8aaca4762f0852c016af34db696eebd4bfc92':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:30:30 -07:00
Jeff Brown
cd2a3ea5c8 Merge "Don't reuse StringBuilder outside of lock when dumping ANR." 2012-04-10 14:30:20 -07:00
Robert Ly
d87121f46e am c71a1bb9: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit 'c71a1bb9d455b547cba73947d13a50933c1cb1be':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:30:15 -07:00
Robert Ly
07ced01f04 am 9585dcc4: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
  docs: fixing ndk bug 5991108
 2012-04-10 14:30:13 -07:00
Robert Ly
12d80df0b2 am 86b6e26c: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '86b6e26c78bf5d491a2cf2aa06e3812be326d722':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:30:11 -07:00
Robert Ly
c71a1bb9d4 am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:26:28 -07:00
Jeff Brown
deb6ed8c2e Don't reuse StringBuilder outside of lock when dumping ANR. 
The ANR dumping code was reusing the shared StringBuilder while
not holding the ActivityManagerService lock.  As a result, other
threads could sweep in and clobber the ANR information.
We don't want to hold the lock here, so just create a new StringBuilder.

Change-Id: I0d91af55f5c123102cfab2cd97035491efed59c0
 2012-04-10 14:26:26 -07:00
Robert Ly
9585dcc48a am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
 2012-04-10 14:26:26 -07:00
Robert Ly
86b6e26c78 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:26:19 -07:00
Robert Ly
11d33b3da5 am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1 
* commit '23f08c6d64976989f6519b4c65f2006865e8fd76':
  docs: fixing broken link for bug 6104366
 2012-04-10 14:26:10 -07:00
Robert Ly
b3f7fc2f77 am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1 
* commit '2e9dac4b0584bce238fed60ba2801af3e7a2c003':
  docs: fixing ndk bug 5991108
 2012-04-10 14:26:08 -07:00
Robert Ly
9fd8aaca47 am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 
* commit '876b7b876e6ebb08979cf1a4861910215c4aae2b':
  docs: fixing renderscript doc bug 6111834
 2012-04-10 14:26:07 -07:00
Craig Mautner
1f4e0ccba0 Fix NPE in setTransparentRegion. 
Check for null Surface before using it.

Fixes bug 6312835.

Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7
 2012-04-10 14:24:38 -07:00
Robert Ly
23f08c6d64 Merge "docs: fixing broken link for bug 6104366" into ics-mr1 2012-04-10 14:24:00 -07:00
Robert Ly
2e9dac4b05 Merge "docs: fixing ndk bug 5991108" into ics-mr1 2012-04-10 14:23:50 -07:00
Robert Ly
876b7b876e Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1 2012-04-10 14:23:37 -07:00
Craig Mautner
592647ee2e Merge "Fix IndexOutOfBoundsException." 2012-04-10 14:23:10 -07:00
George Mount
1bee28f4c8 Merge "Revert "Revert "Keep selection handles in edit fields.""" 2012-04-10 14:23:07 -07:00
Eric Fischer
cd1c059bbc Merge "Import translations. DO NOT MERGE" 2012-04-10 14:22:52 -07:00
Jack Palevich
2b39c3126b Merge "Notify monitor waiters when changing mSurfaceIsBad value." 2012-04-10 14:20:28 -07:00
Jeff Sharkey
cc0ec91307 Merge "Move to Android-specific NTP pool." 2012-04-10 14:01:53 -07:00
Jeff Sharkey
40caf8f443 Move to Android-specific NTP pool. 
Use "2.android.pool.ntp.org" since it returns both IPv4 and IPv6
addresses.  Verified that NTP client works correctly on both.

Change-Id: I0187ef4a6d3b353cfcc77957b1303ca01c67cbe9
 2012-04-10 13:48:10 -07:00
George Mount
7102eb2d30 Revert "Revert "Keep selection handles in edit fields."" 
This reverts commit 90c08eafad72454a31282fd887ec23d357c904a4
 2012-04-10 13:41:51 -07:00
Gilles Debunne
ce5f917b54 Merge "Removed exception from SpannableStringBuilder" 2012-04-10 13:36:40 -07:00
Eric Laurent
a219c5eec8 Merge "audio preprocessing: added static factory method" 2012-04-10 13:32:22 -07:00
Gilles Debunne
34ec2b54da Removed exception from SpannableStringBuilder 
Bug 6312196

Change-Id: I9cece36b40d8948e0e85bd433954818991009ad5
 2012-04-10 13:31:11 -07:00
Robert Ly
621ff7d1a5 docs: fixing ndk bug 5991108 
Change-Id: I70b5505fc424b278ea8977955857c92082a1f828
 2012-04-10 13:30:45 -07:00
Eric Fischer
7866e84fbc Import translations. DO NOT MERGE 
Change-Id: I988480b6b1ff1b745b4126ef89ee57b97513d6e2
 2012-04-10 13:29:58 -07:00
Robert Ly
41a8c7e68a docs: fixing broken link for bug 6104366 
Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9
 2012-04-10 13:20:44 -07:00
Craig Mautner
93a035cce1 Fix IndexOutOfBoundsException. 
This fix resolves an exception thrown when the snapshot ArrayList has
no entries.

Fixes bug 6311207.

Change-Id: I84383417116a4a62eb2842792ed04096aebc8ee2
 2012-04-10 13:19:35 -07:00
George Mount
f5711ab0fe Merge "Revert "Keep selection handles in edit fields."" 2012-04-10 13:16:03 -07:00
George Mount
90c08eafad Revert "Keep selection handles in edit fields." 
This reverts commit 5d84368a7577c5d53ce885cd2d095cc5ba40d924
 2012-04-10 13:14:48 -07:00
Craig Mautner
8330e40b98 Merge "Reduce load on CPU when animating rotation." 2012-04-10 13:01:12 -07:00
Craig Mautner
73850cb699 Reduce load on CPU when animating rotation. 
This change keeps requestTraversalLocked from being called on virtually
every call to animate while rotating.

Change-Id: I6d2db37db3bb82f4f9ecc84b17dbf121819a6c1b
 2012-04-10 12:56:27 -07:00
Eric Laurent
855255d89f audio preprocessing: added static factory method 
Added static methods to check availability and create audio preprocessing
effects.

Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267
 2012-04-10 12:34:07 -07:00
George Mount
ad0ef21011 Merge "Keep selection handles in edit fields." 2012-04-10 12:33:58 -07:00
Robert Ly
af16675097 docs: fixing renderscript doc bug 6111834 
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
 2012-04-10 11:56:33 -07:00
Gilles Debunne
d3ce6f50c1 Merge "Faster and simpler replace in SSB, take two" 2012-04-10 11:00:57 -07:00
Dianne Hackborn
79af6063d5 Merge "Hide the optional permission stuff, not making it in to JB." 2012-04-10 10:31:28 -07:00