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
Glenn Kasten
972d899337 am 5bdc60c9: Merge "Delete obsolete includes" 
* commit '5bdc60c968a372672afd72c46dc13ef37ef9d58b':
  Delete obsolete includes
 2011-12-15 10:09:36 -08:00
Glenn Kasten
d53339669c am 46f54359: Merge "Remove redundant clear()" 
* commit '46f54359b6adf4e7a7134bd495c69c035bdc382f':
  Remove redundant clear()
 2011-12-15 10:09:34 -08:00
Glenn Kasten
9ea36c8802 am 788b3120: Merge "Fix includes" 
* commit '788b3120e2e9bdf9eb9c8d1f4846eaf780716744':
  Fix includes
 2011-12-15 10:09:32 -08:00
Jaikumar Ganesh
6ea24f0490 am ec62f12a: Merge "Change the fd to be blocking for health profile." 
* commit 'ec62f12a94fd8c955f025328e0d3ff48217bea42':
  Change the fd to be blocking for health profile.
 2011-12-15 10:09:29 -08:00
Glenn Kasten
f407bd83ec am 30cca7ec: Merge "AudioTrack::setVolume check range" 
* commit '30cca7ecbe725108de98294660223a81752e2d17':
  AudioTrack::setVolume check range
 2011-12-15 10:09:25 -08:00
Scott Main
1516390f2f am fca4f2d2: am 5ebf8fbb: am d1f2b7cc: am 56a3e326: Merge "docs: add Android U class for "Improving Performance of Layouts"" into ics-mr0 
* commit 'fca4f2d2951e7912e979265c3fcc81f5c6537eac':
  docs: add Android U class for "Improving Performance of Layouts"
 2011-12-15 10:09:22 -08:00
Scott Main
a2f20e8c72 am a253ec52: am d8dec142: am b8ea1f93: am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" into ics-mr0 
* commit 'a253ec52d93a5fdc16c186c490cb2f8718b50d97':
  doc change: Android U lessons for audio and battery
 2011-12-15 10:09:20 -08:00
Scott Main
97274d2c60 am 123c3b1e: am fd24af66: am 691fea72: am 70645e36: Docs: Add class for Sharing Content 
* commit '123c3b1eee1695f39b615183487bd4748cc28407':
  Docs: Add class for Sharing Content
 2011-12-15 10:09:16 -08:00
Brian Colonna
42e895f4c1 am 4c1920c9: Merge "Added Face Unlock to tablet lockscreen layouts" 
* commit '4c1920c98a1d4424d0fca0a9712ee4274e934fa4':
  Added Face Unlock to tablet lockscreen layouts
 2011-12-15 10:09:09 -08:00
James Dong
3bad26b4fe am 29e97f16: 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 9f704f6c46a171357e49c411c83458b9d 
* commit '29e97f169d87490e4755e8b7608e6324367e752f':
  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-15 10:09:02 -08:00
Fabrice Di Meglio
8282b57a30 am 54b9f984: Merge "Fix bug #5674155 Segmentation issue for Thai" 
* commit '54b9f98417a075645c0b57e1f041817e422a645f':
  Fix bug #5674155 Segmentation issue for Thai
 2011-12-15 10:08:57 -08:00
Irfan Sheriff
88f1e1c7db am dd73df35: Merge "Track scan count by UID" 
* commit 'dd73df35b84007b1735a45577560912434246aae':
  Track scan count by UID
 2011-12-15 10:08:49 -08:00
Jeff Sharkey
786665f05d am 17b28904: Merge "Avoid reading network stats when disabled." 
* commit '17b289048766d6b101e70061fe5774ec8f370b55':
  Avoid reading network stats when disabled.
 2011-12-15 10:08:43 -08:00
Romain Guy
374c12275a am 926d55eb: Merge "Reduce the number of active texture changes" 
* commit '926d55eb40b9042c200f154fdf0c7c7969e0e359':
  Reduce the number of active texture changes
 2011-12-15 10:08:20 -08:00
The Android Open Source Project
7ce06524e9 am 476f15c0: am 16bdd1e6: Reconcile with ics-mr1-release 
* commit '476f15c0de4dea1388076c7482eefd154cc3ad3d':
 2011-12-15 10:08:04 -08:00
Fabrice Di Meglio
95d0370bcb am a9960076: Merge "Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B" 
* commit 'a9960076efe46be2d98c72faa68f09fc28853503':
  Fix bug #5727213 Rendering issues with Bengali in Textview in IML63B
 2011-12-15 10:07:54 -08:00
Romain Guy
58d0579eec am 9c986b7f: Merge "<Insert something improper about OpenGL>" 
* commit '9c986b7f387adb8b65d9094ba931645141bc5253':
  <Insert something improper about OpenGL>
 2011-12-15 10:07:52 -08:00
Dirk Dougherty
aa572771b1 am 269be7dd: am 1451f598: am 2e335cb0: Merge "Doc change: API diff report for 15." into ics-mr1 
* commit '269be7dd6c71054ff748a574f172703262276366':
  Doc change: API diff report for 15.
 2011-12-15 10:07:47 -08:00
Romain Guy
27ecb1ab5f am 8a5f8ba4: Merge "Further reduce the number of GL commands sent to the driver" 
* commit '8a5f8ba4f3e8352155c711adb649e6f536d194b5':
  Further reduce the number of GL commands sent to the driver
 2011-12-15 10:07:33 -08:00
Dianne Hackborn
372d1715da am b5052de7: resolved conflicts for merge of a80bab37 to master 
* commit 'b5052de75736527549d7e537632777c6fec2e4f0':
  Fix issue #5756204: Crespo IME briefly appears shortened when...
 2011-12-15 10:07:25 -08:00
Alex Sakhartchouk
b98f6d3466 Refactoring shader creation. 
Change-Id: I140aeb0a6a8185441d49b3a1af8144c6a46dd419
 2011-12-14 18:09:45 -08:00
Alex Sakhartchouk
18f6419bfe Adding default scene to assets. 
Change-Id: Iec48cb53cd5c2902aa64dd02d23724f607f9114c
 2011-12-14 17:10:04 -08:00
Glenn Kasten
5bdc60c968 Merge "Delete obsolete includes" 2011-12-14 15:40:11 -08:00
Glenn Kasten
46f54359b6 Merge "Remove redundant clear()" 2011-12-14 15:40:01 -08:00
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
Alex Sakhartchouk
85d02dc75c Merge "make loading assets more robust" into graphics-dev 2011-12-14 15:11:14 -08:00
Alex Sakhartchouk
1168868e76 make loading assets more robust 
Change-Id: I9a2b7be8e8522264f8f2de04b43dbe5ec98bc24a
 2011-12-14 15:07:17 -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
Glenn Kasten
51e445f701 Remove redundant clear() 
Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
 2011-12-14 13:31:40 -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