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

63720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
788b3120e2 Merge "Fix includes" 2011-12-14 15:39:52 -08:00
Jaikumar Ganesh
ec62f12a94 Merge "Change the fd to be blocking for health profile." 2011-12-14 15:25:25 -08:00
Glenn Kasten
30cca7ecbe Merge "AudioTrack::setVolume check range" 2011-12-14 15:05:56 -08:00
Scott Main
fca4f2d295 am 5ebf8fbb: am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit '5ebf8fbb1e925d411d928757712c41a7cafe8231':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-14 15:00:59 -08:00
Scott Main
5ebf8fbb1e am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit 'd1f2b7ccb7e8672f0af9f940864111c8dbe1ff80':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-14 14:58:02 -08:00
Scott Main
a253ec52d9 am d8dec142: am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit 'd8dec14201250055fe9bcccead361168c839d9f9':
  doc change: Android U lessons for audio and battery
 2011-12-14 14:57:50 -08:00
Scott Main
d8dec14201 am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit 'b8ea1f93bb97c2aa0a3fffaa12aaaa8923449b4c':
  doc change: Android U lessons for audio and battery
 2011-12-14 14:56:02 -08:00
Scott Main
d1f2b7ccb7 am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit '56a3e326192c7496b67666b29071dc9f38c59da9':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-14 14:55:44 -08:00
Scott Main
b8ea1f93bb am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1':
  doc change: Android U lessons for audio and battery
 2011-12-14 14:53:40 -08:00
Scott Main
56a3e32619 Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 2011-12-14 14:53:04 -08:00
Scott Main
4dc763c700 Merge "doc change: Android U lessons for audio and battery" into ics-mr0 2011-12-14 14:51:30 -08:00
Scott Main
123c3b1eee am fd24af66: am 691fea72: am 70645e36: Docs: Add class for Sharing Content 
* commit 'fd24af6620ee346bfbbc29a62290f67141a79245':
  Docs: Add class for Sharing Content
 2011-12-14 14:45:46 -08:00
Scott Main
fd24af6620 am 691fea72: am 70645e36: Docs: Add class for Sharing Content 
* commit '691fea726dbefe2a7142b403bfc47f5c9029f61a':
  Docs: Add class for Sharing Content
 2011-12-14 14:42:57 -08:00
Scott Main
691fea726d am 70645e36: Docs: Add class for Sharing Content 
* commit '70645e363e8601550468b726251f4f52f383b9fc':
  Docs: Add class for Sharing Content
 2011-12-14 14:40:19 -08:00
Brian Colonna
4c1920c98a Merge "Added Face Unlock to tablet lockscreen layouts" 2011-12-14 14:14:24 -08:00
Jaikumar Ganesh
82477b5e3c Change the fd to be blocking for health profile. 
This is sync with the java IO stream APIs for the public APIs.

Change-Id: I5c7958687275d89257ac26f6a5abd08906327d02
 2011-12-14 14:00:44 -08:00
James Dong
29e97f169d am 3f6a7d1e: am d70c64db: 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. 
* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
  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.
 2011-12-14 13:53:31 -08:00
James Dong
3f6a7d1ee9 am d70c64db: 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. 
* commit 'd70c64db9f67dbe8f888de6b1bdcc835226ec526':
  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.
 2011-12-14 13:50:08 -08:00
Fabrice Di Meglio
54b9f98417 Merge "Fix bug #5674155 Segmentation issue for Thai" 2011-12-14 13:47:00 -08:00
Glenn Kasten
778170d705 Fix includes 
Remove unused #include dlfcn.h

Add #include String8.h
Forward class declaration is only for references and pointers.
In this case, we need the full class declaration,
and were incorrectly depending on another header file to do it.

Change-Id: Iff65cceb3982698cc1ebaeec405695fc190c03ff
 2011-12-14 13:33:51 -08:00
Scott Main
70645e363e Docs: Add class for Sharing Content 
Change-Id: I078a02d952e652c16f84e1b3f7613f3dc9364c97
 2011-12-14 13:18:37 -08:00
Glenn Kasten
1c50a789ca AudioTrack::setVolume check range 
Change-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5
 2011-12-14 13:06:57 -08:00
Irfan Sheriff
dd73df35b8 Merge "Track scan count by UID" 2011-12-14 12:06:00 -08:00
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
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
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
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
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