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

64520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
d70c64db9f Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 
1. Revert "Fix drm flag setting missed in false drm recognition fix."
   This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
   This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
   This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
   This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
 2011-12-14 11:01:59 -08:00
Irfan Sheriff
8cef06798e Track scan count by UID 
Helps track down misbehaving apps that are initiating
too many scans

Bug:5722180
Change-Id: I0bc396cf5e68ed53b900e8a65abb56acdbd8d8a5
 2011-12-14 10:58:49 -08:00
Jeff Sharkey
17b2890487 Merge "Avoid reading network stats when disabled." 2011-12-14 10:12:17 -08:00
Scott Main
604e4ed481 doc change: Android U lessons for audio and battery 
Change-Id: I98d83f8458e3ad62be28d09b85fe099916d1b73d
 2011-12-14 10:06:34 -08:00
Romain Guy
926d55eb40 Merge "Reduce the number of active texture changes" 2011-12-13 22:11:45 -08:00
Romain Guy
2d4fd36484 Reduce the number of active texture changes 
Change-Id: I94046bdfe20740c26c8183822e3002d692fde7c4
 2011-12-13 22:00:19 -08:00
The Android Open Source Project
476f15c0de am 16bdd1e6: Reconcile with ics-mr1-release 
* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':
 2011-12-13 19:13:18 -08:00
The Android Open Source Project
16bdd1e65e Reconcile with ics-mr1-release 
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
 2011-12-13 19:10:19 -08:00
Fabrice Di Meglio
a4d0770063 Fix bug #5674155 Segmentation issue for Thai 
- force Harfbuzz to shape with the Thai font

Change-Id: I3830acae17385b050e2745fca277cf66af103099
 2011-12-13 18:52:13 -08:00
Fabrice Di Meglio
a9960076ef Merge "Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B" 2011-12-13 18:43:04 -08:00
Romain Guy
9c986b7f38 Merge "<Insert something improper about OpenGL>" 2011-12-13 18:41:58 -08:00
Romain Guy
ec31f83bd3 <Insert something improper about OpenGL> 
Change-Id: Ib645376093838156771588adc76a718da0ceb0db
 2011-12-13 18:41:12 -08:00
Dirk Dougherty
269be7dd6c am 1451f598: am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1 
* commit '1451f598ae5da5b8f0e24b4714f7321c2e6f59f5':
  Doc change: API diff report for 15.
 2011-12-13 18:37:34 -08:00
Dirk Dougherty
1451f598ae am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1 
* commit '2e335cb02891d3653b938340a11698844e2c3d6d':
  Doc change: API diff report for 15.
 2011-12-13 18:35:10 -08:00
Dirk Dougherty
2e335cb028 Merge "Doc change: API diff report for 15." into ics-mr1 2011-12-13 18:33:04 -08:00
Fabrice Di Meglio
65194adc9a Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B 
- force Harfbuzz to shape with the Bengali font
- also fix potential returned NULL value from SkTypeface::CreateFromFile(path)

Change-Id: I25be09d06e449b89bb4a62444e27f77e436b77ba
 2011-12-13 18:14:49 -08:00
Romain Guy
8a5f8ba4f3 Merge "Further reduce the number of GL commands sent to the driver" 2011-12-13 17:29:42 -08:00
Alex Sakhartchouk
a74c7ce5bf Merge "Rename some elements to be more in line with rest of framework." into graphics-dev 2011-12-13 17:11:32 -08:00
Alex Sakhartchouk
684267525b Rename some elements to be more in line with rest of framework. 
Change-Id: Icb007bafca9c76959eee2e8134b1d7c592ca885c
 2011-12-13 17:02:52 -08:00
Dianne Hackborn
b5052de757 resolved conflicts for merge of a80bab37 to master 
Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef
 2011-12-13 16:31:43 -08:00
The Android Automerger
c58e649e43 merge in ics-mr1-release history after reset to ics-mr1 2011-12-13 16:03:26 -08:00
Gilles Debunne
ba711588cd am 6e87ecbb: am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 
* commit '6e87ecbb1db883aa60aeb37b059f066974220d2b':
  Do not spell check the foreground ExtractEditText.
 2011-12-13 16:02:18 -08:00
Gilles Debunne
6e87ecbb1d am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 
* commit '2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
  Do not spell check the foreground ExtractEditText.
 2011-12-13 15:59:26 -08:00
Fabrice Di Meglio
e9e19a448c am b5048bce: Merge "TextLayoutCache - fix diacritics composition" 
* commit 'b5048bceebf1ada63a18fce0b5d9fbe2dd6c0351':
  TextLayoutCache - fix diacritics composition
 2011-12-13 15:44:30 -08:00
Jeff Sharkey
418d12dc8f Avoid reading network stats when disabled. 
Bug: 5518868
Change-Id: Idb5c588b018bf735597ad7ff904ecc69224dd0a0
 2011-12-13 15:43:47 -08:00
Dianne Hackborn
a80bab372d am caa8e69a: Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 
* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
  Fix issue #5756204: Crespo IME briefly appears shortened when...
 2011-12-13 15:41:54 -08:00
Amith Yamasani
f08f70588c am 513e14e3: Merge "Dump system and secure settings in bugreport." 
* commit '513e14e31627430f3198d56a4a9c6336a5a058a6':
  Dump system and secure settings in bugreport.
 2011-12-13 15:41:51 -08:00
Fabrice Di Meglio
b5048bceeb Merge "TextLayoutCache - fix diacritics composition" 2011-12-13 15:41:47 -08:00
Dianne Hackborn
caa8e69a65 Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 2011-12-13 15:40:18 -08:00
Amith Yamasani
513e14e316 Merge "Dump system and secure settings in bugreport." 2011-12-13 15:39:17 -08:00
Gilles Debunne
2450b36a36 am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 
* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
  Do not spell check the foreground ExtractEditText.
 2011-12-13 15:38:43 -08:00
Gilles Debunne
19636dc421 Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 2011-12-13 15:36:48 -08:00
Fabrice Di Meglio
902a5b31c5 TextLayoutCache - fix diacritics composition 
- normalize (with ICU) each BiDi run before shaping them

We are normalizing by "chuncks" and starting from the end of the string. Each "chunck"
is composed of the main code point and its associated diacritics.

Fix bug #5738435 TextLayoutCache should be able to take care about diacritics during shaping

Change-Id: I7288027a7fa8eafb8b9f38d449625be60214548a
 2011-12-13 15:28:16 -08:00
Alex Sakhartchouk
930c941b31 Merge "Properly detecting blending case." into graphics-dev 2011-12-13 15:24:48 -08:00
Alex Sakhartchouk
b6e9dad782 Properly detecting blending case. 
Change-Id: I9963e50928f17610c509d00780714aea0cb00613
 2011-12-13 15:22:34 -08:00
Dianne Hackborn
33b8ee509f Fix issue #5756204: Crespo IME briefly appears shortened when... 
...rotating to landscape

When doing spell checking in the same process as the spell checker, we
need to make sure it is still done asynchronously.

Putting this in I noticed quite a few threading issues in this code, so
I also addressed those (which became very obviously a problem with the
async stuff here now).

Also tweaked the service side to run spell checking at background priority.

Change-Id: I01bafe3bec6bceeca911d6bf2f61a486a2fd4c48
 2011-12-13 15:15:33 -08:00
Romain Guy
a1d3c91afb Further reduce the number of GL commands sent to the driver 
Change-Id: Id922b2a166ea4573b767c27d3195e11c70320b23
 2011-12-13 14:58:14 -08:00
Gilles Debunne
770f0fa92e Do not spell check the foreground ExtractEditText. 
Bug 5755099

In extracted text mode, we spell check the background and the foreground
edit text. All changes in the background are already propagated to the
foreground, and updates on the foreground may trigger a spell check
of the entire text since we use setText.

Change-Id: Ie44c3d9113258082ac6df5890851d0e21c702ea2
 2011-12-13 14:47:26 -08:00
Chet Haase
5bc5de87f3 am e829bc0f: Merge "Make glyph cache more flexible" 
* commit 'e829bc0f0364e942bed01536d115a5c08d25d776':
  Make glyph cache more flexible
 2011-12-13 14:29:06 -08:00
Dianne Hackborn
0457b0a734 am ee4d45f3: am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 
* commit 'ee4d45f3052c8d339035c4bb8eca9b7a724e5074':
  Fix issue #5755172: Soft menu key disappears when menu is open
 2011-12-13 14:29:03 -08:00
Gilles Debunne
b00caf3cad am 78efa026: am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1 
* commit '78efa026c7b5e7bcd06ab1f58ccd024366687cd3':
  NPE in GMail / TextLine
 2011-12-13 14:29:00 -08:00
Scott Main
be58a958d1 am 09bd7978: am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0 
* commit '09bd797895a0c549186454f6a0274bc402e95581':
  Created Android University lesson for Multiple APKs.
 2011-12-13 14:28:51 -08:00
Scott Main
8363ca41b4 am 71786dd1: am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens. 
* commit '71786dd191b899a6121d1a0d2a3a4544db1a91a6':
  AndroidU lesson on designing for multiple screens.
 2011-12-13 14:28:49 -08:00
Romain Guy
07c04f7755 am 6f2de0a5: Merge "Reduce the number of GL commands generated by the UI" 
* commit '6f2de0a5d6303ecff2795a94d5051ea0621be07f':
  Reduce the number of GL commands generated by the UI
 2011-12-13 14:28:46 -08:00
Andreas Huber
59e07a6484 am 17453336: am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1 
* commit '17453336f4c9ec176ff8a39ab482df0c12e26f63':
  DO NOT MERGE: Support for parsing of "folded" RTSP header values
 2011-12-13 14:28:34 -08:00
Amith Yamasani
5e96ecc767 am 9413c200: Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB." 
* commit '9413c200eb41230ec9bb93f94ee44e09a8b43a7d':
  Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-13 14:28:15 -08:00
Gilles Debunne
b5b1db8a41 am a2ea425f: Merge "Re-synced MR1 and master for SpellChecker" 
* commit 'a2ea425f2541e25c13034b09e37c8a5e6b255d01':
  Re-synced MR1 and master for SpellChecker
 2011-12-13 14:28:12 -08:00
Selim Gurun
981646b1c8 am 4f433d53: Merge "Move ssl callbacks to webcore thread." 
* commit '4f433d53c9cfe850103b33dfbc2a36fa246f8d96':
  Move ssl callbacks to webcore thread.
 2011-12-13 14:28:09 -08:00
Chet Haase
e829bc0f03 Merge "Make glyph cache more flexible" 2011-12-13 14:03:43 -08:00
Dianne Hackborn
ee4d45f305 am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 
* commit '0be53567c1c2299c548d3204d2b9240108fbd53a':
  Fix issue #5755172: Soft menu key disappears when menu is open
 2011-12-13 13:44:14 -08:00