65086 Commits

Author SHA1 Message Date
Gilles Debunne
ba3634f355 Fix for AOOB in MeasuredText
Bug 5707593

Change-Id: I3c21343b2938119d7ae9d7892733dc83a209c991
2012-01-23 16:36:35 -08:00
Romain Guy
e575005f7c Merge "Update hardware acceleration doc" 2012-01-23 16:27:50 -08:00
Romain Guy
36d7549181 Update hardware acceleration doc
Change-Id: I3bed77b3c4e1eff96fa462e4849f25f38784c415
2012-01-23 16:26:46 -08:00
Jim Miller
eda775cc89 am 9f080e2a: am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '9f080e2a5bc6a268934e32201c69ea8a86900396':
  Revert "Fix 5797764: Increase lock screen's thread priority"
2012-01-23 15:53:17 -08:00
Jim Miller
9f080e2a5b am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread priority"" into ics-mr1
* commit '44760b106a4bafcf83fb356bf91683db40e0e5a2':
  Revert "Fix 5797764: Increase lock screen's thread priority"
2012-01-23 15:51:23 -08:00
Jim Miller
44760b106a Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ics-mr1 2012-01-23 15:49:32 -08:00
Fabrice Di Meglio
22cfd047ab Merge "Fix bug #5846413 "phone" keyboard layout is broken on master" 2012-01-23 15:46:58 -08:00
Romain Guy
d215ddf3d9 Merge "Fix API typo" 2012-01-23 15:35:24 -08:00
Romain Guy
1e878d2ff5 Fix API typo
Change-Id: Iac6de947b0d550cc8dd4a3b5d88baa322c21bbb8
2012-01-23 15:34:25 -08:00
Jim Miller
54dbbce1c3 Revert "Fix 5797764: Increase lock screen's thread priority"
This reverts commit 6d6a70a33746ef5147ab146f1802f0db424dd2f1

This doesn't appear to have a measurable impact for this issue.
2012-01-23 15:24:42 -08:00
Justin Ho
5d76def68d am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:16:00 -08:00
Justin Ho
feb1d988c8 am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
  DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
2012-01-23 15:13:19 -08:00
Justin Ho
fee5a860a8 Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 2012-01-23 15:11:00 -08:00
Fabrice Di Meglio
0c95dd3f4f Fix bug # 5863709 API request: Change param names of deleteSurroundingText to "before" and "after"
Change-Id: I727fad9a59cda915899674569bfabd29b9f5da60
2012-01-23 15:06:42 -08:00
John Reck
bc932579ea Merge "Fix crash when scrolling a layer" 2012-01-23 15:04:13 -08:00
Justin Ho
b918035d34 DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit 71c4496a9757438afd30b4404824f296f6158a49.

Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
2012-01-23 15:02:41 -08:00
John Reck
7aa7ba1ce6 Fix crash when scrolling a layer
Change-Id: I6e61f3b38c5d1291ceb36c9dfa87fcd78480c2f4
2012-01-23 14:53:47 -08:00
Dianne Hackborn
fc5851579a Merge "New screen rotation animation design." 2012-01-23 14:34:55 -08:00
Joe Malin
a2a46f6294 DOC CHANGE: New Content Provider topics
Change-Id: Ib5507f4c9ecce3aea51cd39310e3f4990c9b3070
2012-01-23 14:18:24 -08:00
Gilles Debunne
3909242141 Merge "Double tap to select enabled on suggestions" 2012-01-23 14:10:44 -08:00
Fabrice Di Meglio
bd901dee31 Fix bug #5846413 "phone" keyboard layout is broken on master
- was a subtle regression introduced when fixing bug #5753006
- as we are now using SkPaint::kGlyphID_TextEncoding (glyph encoding)
instead of SkPaint::kUTF16_TextEncoding (UTF16 encoding), we need to
force the UTF16 encoding in some cases that are NOT going thru
the TextLayoutCache / Harfbuzz shaping

- fix also breakText() the same way

- also clean some old comment

- Warning: depends also on a CL from Skia for having getBaseGlyphCount() "const"

Change-Id: I3d1fc87f070884876c679b33541f810fbfb5df3f
2012-01-23 13:34:08 -08:00
Jeff Brown
86de0590b9 Clean up content observer code.
Improved the documentation a little bit.

Fixed a bug in ContentService wherein if a ContentObserver was
passed as an argument and its deliverSelfNotifications() method
returned true, then notifyChange would tell all observers that
the change was a self-change even though it was only a self-change
from the perspective of the provided observer.

Deprecated ContentObservable.notifyChange since it is never
used and in general it shouldn't be because we want the notification
to be posted to the handler.

Change-Id: Idde49eb40777e011a068f2adae8a32f779dfb923
2012-01-23 13:01:18 -08:00
Dianne Hackborn
fd1c5ed370 New screen rotation animation design.
We now have an animation that can start as soon as we detect to
rotate the screen, and have a different phase once the new UI
is ready to complete the transition into it.

Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
2012-01-23 12:52:43 -08:00
Dianne Hackborn
a6b8fe1c71 Merge "New brightness setting to adjust auto-brightness mode." 2012-01-23 12:36:19 -08:00
Wink Saville
5d6a095e65 Merge "Do not clear good TLVs when a error occurs decoding." 2012-01-23 12:22:21 -08:00
Andy McFadden
d71b9154da Merge "Don't use bootstrap loader directly" 2012-01-23 12:21:19 -08:00
Wink Saville
7c27ac64d5 Do not clear good TLVs when a error occurs decoding.
In change Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf with a sha1 of
e81932e92a773538e1ad1ad1d4bfd8f241860c8d it seemed like a good idea
to throw away all TLV's on errors. In retrospect that was probably
not a good idea. For example on the MTN Ghana SIM the error
occurs because of some 0 pad bytes at the end, all of the actual
TLV's are good, so throwing away everything is unreasonable. Instead
accepting what is valid seems a better approach.

Also, add a couple debug lines on error paths.

Change-Id: I4add0c9cd242f46e0ef8700229d0ec755b9e4c4c
2012-01-23 12:19:20 -08:00
Dianne Hackborn
d9ea468d6a New brightness setting to adjust auto-brightness mode.
Change-Id: Icfec22be99d8c79e9ff5720b80fb9dacbba36134
2012-01-23 12:01:00 -08:00
Robert Greenwalt
7df80fa4e8 Use the carrier-given dns addrs for tethering.
This fixes a complaint from carriers (that we used 8.8.8.8), but also
fixes the case where there is only room for one live radio
connection: the secondary connection (tethering) doesn't have a
default route to prevent on-device traffic from slipping out on the
tethering connection, but tethered dns is proxied through dnsmasq, so
it is appearing as on-device traffic and is unroutable.  By switching
to the carrier-indicated dns servers we can use the host-routes
already set for those and kill two bugs with one fix.

bug:5898904
Change-Id: Ida8777687994f353b2d4f2c7db5d6ea4b6ac3882
2012-01-23 11:29:37 -08:00
Bill Gruber
cf5c78f209 am add87f99: am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit 'add87f99d9ece26c776abe40297e9a49e08932d9':
  DevDocs update: Publishing on Market
2012-01-23 10:41:43 -08:00
The Android Open Source Project
8a6b2832a9 am 961b1df3: Reconcile with ics-mr1-release
* commit '961b1df3fcbf5c441555b69ac52a5aed7f91a94e':
  Fix 5797764: Increase lock screen's thread priority
2012-01-23 10:41:37 -08:00
Bill Gruber
add87f99d9 am 5e5b57ae: Merge "DevDocs update: Publishing on Market" into ics-mr1
* commit '5e5b57aef29b33d03965b4dc370cde9a39220adc':
  DevDocs update: Publishing on Market
2012-01-23 10:23:10 -08:00
Bill Gruber
5e5b57aef2 Merge "DevDocs update: Publishing on Market" into ics-mr1 2012-01-23 10:21:16 -08:00
The Android Open Source Project
961b1df3fc Reconcile with ics-mr1-release
Change-Id: If1b58550b6ddf90a654f08e4add9012a15a7134a
2012-01-23 10:15:41 -08:00
Andy McFadden
dc7bf5d8bf Don't use bootstrap loader directly
The VM is allowed to use null to represent the bootstrap class
loader, so attempting to call methods on it is a bad idea.  Use
the system class loader instead.

Change-Id: I9190848945f679d546d5fb30aba10fd27c7e5404
2012-01-23 09:51:42 -08:00
Andy McFadden
30f1312b3c Merge "Use Map.Entry, not HashMap.Entry" 2012-01-23 09:34:17 -08:00
Jim Miller
8ffd2cccf0 am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" into ics-mr1
* commit 'b1c7785c1110e171d3dd3deb259b1caeed0b9da6':
  Fix 5797764: Increase lock screen's thread priority
2012-01-23 09:18:36 -08:00
Justin Ho
5691f6a882 am e46f8696: am b09f6f96: Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1
* commit 'e46f869629ef27afb149c771e69dbbefe1135f33':
  Update WiMAX assets to match new style Bug: 5724605
2012-01-23 09:18:30 -08:00
Daniel Sandler
e08c3e1520 am aaa7b772: am 639ed754: Hide mobile RSSI on devices without mobile data.
* commit 'aaa7b7728f3ced062273b54e1fc3b9d7d815bdcd':
  Hide mobile RSSI on devices without mobile data.
2012-01-23 09:18:24 -08:00
Justin Ho
9b4b378777 am ffb0c0b3: am 70e21c92: Merge "New out-of-service RSSI." into ics-mr1
* commit 'ffb0c0b3ca2f8693a354aad17e21f1419d9f0379':
  New out-of-service RSSI.
2012-01-23 09:18:20 -08:00
George Mount
699ed80038 Merge "Add cut and paste to ContentEditable." 2012-01-23 07:30:26 -08:00
Michael Jurka
5a89672f3e Merge "Remove fastInvalidate and setFast* methods" 2012-01-23 07:24:32 -08:00
Michael Jurka
5274d6f115 Merge "Improve rapid-fire presses on system bar" 2012-01-23 07:23:56 -08:00
Daniel Lam
f3d30e1c70 SurfaceTexture: use fence sync on omap4 & s5pc110
This change enables the use of the EGL_KHR_fence_sync extension in
SurfaceTexture on omap4 and s5pc110 platforms.

Change-Id: Icad5245bab445413ffb8a7c823c296b678bf3250
2012-01-22 15:51:41 -08:00
Stephen Hines
4cbe25a86b Fix potential bug with reordered size/offset arguments.
This change also cleans up a few uint32_t/size_t issues.

Change-Id: Iae0fc085c12149129b91fce0ebbc28c8cf358eaf
2012-01-20 19:21:35 -08:00
Dianne Hackborn
02d37b9731 resolved conflicts for merge of 892d11f4 to master
Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
2012-01-20 18:42:07 -08:00
Christopher Tate
65f87ec733 Merge "Fix shared-storage full backup" 2012-01-20 17:59:06 -08:00
Christopher Tate
73d7369e0f Fix shared-storage full backup
The special shared-storage step was mistakenly writing its data directly
to the USB output pipe rather than to the proper stacked data handling
chain that applies compression and encryption.  Fix this by getting rid
of the custom handling of the shared-storage data, instead folding it
into the normal data handling flow [with a small amount of additional
management because e.g. it doesn't need a "manifest" pseudofile in the
archive stream].

Fixes bug 5897791

Change-Id: I3995b07963334d2f8cce49b247c87d3d3ff93bed
2012-01-20 17:41:41 -08:00
Glenn Kasten
0f73d75da0 Merge "Remove AudioFlinger dependencies on client" 2012-01-20 17:16:36 -08:00
Glenn Kasten
34f9f8bb83 Remove AudioFlinger dependencies on client
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
2012-01-20 17:12:59 -08:00