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

64553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
6f42a33a2b am 25adf474: Merge "Fix indentation and whitespace" 
* commit '25adf474775acb3eea260cb0a6251cf43ff798ce':
  Fix indentation and whitespace
 2011-12-15 10:10:27 -08:00
Glenn Kasten
7ad757bd53 am 927cc6c7: Merge "Improve AudioFlinger error logging" 
* commit '927cc6c7e8765c3b8b1e18e7105c9e5312a475c8':
  Improve AudioFlinger error logging
 2011-12-15 10:10:24 -08:00
Glenn Kasten
4c1b6a33a4 am a55d4f9d: Merge "AudioMixer uninitialized simple fields" 
* commit 'a55d4f9dab9efc56836ab5fe54af8ce167868ad7':
  AudioMixer uninitialized simple fields
 2011-12-15 10:10:22 -08:00
Dirk Dougherty
ffec1a5fea am 41aeee28: am 41d90f39: am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '41aeee28075fe68078ac9f376ea74c45528cc61b':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-15 10:10:20 -08:00
Glenn Kasten
a6a2d221bf am da7923ac: Merge "Audio C++ comments" 
* commit 'da7923ac2932769e6d64508376a449c9dcd2889e':
  Audio C++ comments
 2011-12-15 10:10:09 -08:00
The Android Open Source Project
6d5a1c2f15 am 377d4ae5: am b14436d0: Reconcile with ics-mr1-release 
* commit '377d4ae5cbb5304d3bae11a511bd51e2c58db236':
  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:55 -08:00
Glenn Kasten
51d6c304c4 am ad2ac95d: Merge "Remove unnecessary this->" 
* commit 'ad2ac95d06e1b283c625cc4bb9f0ab581d98dda3':
  Remove unnecessary this->
 2011-12-15 10:09:50 -08:00
Glenn Kasten
4e544a30d9 am 3e62a5bd: Merge "Use const char correctly in AudioFlinger" 
* commit '3e62a5bd8c488284572f78c3b49e3240eb6532bc':
  Use const char correctly in AudioFlinger
 2011-12-15 10:09:48 -08:00
Glenn Kasten
3a5f8a1dfd am 478e37d6: Merge "Use units after all times" 
* commit '478e37d60cebb9f1ae63a68a78d58a141f312eb2':
  Use units after all times
 2011-12-15 10:09:46 -08:00
Glenn Kasten
22ab7ff1b5 am ef2b0caf: Merge "Fix typo in error message, missing space" 
* commit 'ef2b0caf533d09404e7f593ee3067e5f90c84427':
  Fix typo in error message, missing space
 2011-12-15 10:09:40 -08:00
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
Glenn Kasten
25adf47477 Merge "Fix indentation and whitespace" 2011-12-14 17:35:36 -08:00
Glenn Kasten
927cc6c7e8 Merge "Improve AudioFlinger error logging" 2011-12-14 17:35:24 -08:00
Glenn Kasten
a55d4f9dab Merge "AudioMixer uninitialized simple fields" 2011-12-14 17:35:14 -08:00
Glenn Kasten
a763b44ee1 AudioMixer uninitialized simple fields 
Change-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93
 2011-12-14 17:25:28 -08:00
Dirk Dougherty
41aeee2807 am 41d90f39: am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '41d90f39a5c40e3036e15efef5b07789296c8bb9':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-14 17:24:46 -08:00
Dirk Dougherty
41d90f39a5 am 26bd66df: Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 
* commit '26bd66df4fc8caa7885fe3a4e78e379389a24a94':
  Doc change: add MR1 API summary and updated highlights.
 2011-12-14 17:22:59 -08:00
Glenn Kasten
9818a9da59 Improve AudioFlinger error logging 
Change-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939
 2011-12-14 17:22:40 -08:00
Dirk Dougherty
26bd66df4f Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1 2011-12-14 17:21:13 -08:00
Dirk Dougherty
9a6b4245c9 Doc change: add MR1 API summary and updated highlights. 
Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
 2011-12-14 17:17:09 -08:00
Alex Sakhartchouk
18f6419bfe Adding default scene to assets. 
Change-Id: Iec48cb53cd5c2902aa64dd02d23724f607f9114c
 2011-12-14 17:10:04 -08:00
Glenn Kasten
da7923ac29 Merge "Audio C++ comments" 2011-12-14 16:56:31 -08:00
Glenn Kasten
fb2ab9efc3 Fix indentation and whitespace 
Use git diff -w to verify.

Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
 2011-12-14 16:54:05 -08:00
The Android Open Source Project
377d4ae5cb am b14436d0: Reconcile with ics-mr1-release 
* commit 'b14436d0700f6e837e4d6066ddcf672c61d7f033':
  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 16:08:46 -08:00
The Android Open Source Project
b14436d070 Reconcile with ics-mr1-release 
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
 2011-12-14 16:05:32 -08:00
James Dong
4a30052bea 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 15:44:42 -08:00
Glenn Kasten
ad2ac95d06 Merge "Remove unnecessary this->" 2011-12-14 15:40:43 -08:00
Glenn Kasten
3e62a5bd8c Merge "Use const char correctly in AudioFlinger" 2011-12-14 15:40:35 -08:00
Glenn Kasten
478e37d60c Merge "Use units after all times" 2011-12-14 15:40:27 -08:00
Glenn Kasten
ef2b0caf53 Merge "Fix typo in error message, missing space" 2011-12-14 15:40:18 -08:00