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

63772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
bfd89b35ba Don't forget to close files. 
Change-Id: Ibfe465e1d7a947bbe40da17e8e8a2713856f95b5
 2011-12-15 18:22:54 -08:00
Scott Main
3766a7a275 am 7e065061: am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '7e065061bb47fe88421a6edf62c846144e30fcd8':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:13:31 -08:00
Scott Main
7e065061bb am 481cd5a8: am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '481cd5a8938b5055942f3a9ccaeb08f373b8a4ea':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:11:39 -08:00
Scott Main
481cd5a893 am 3d672e1e: Android U Class: Monetization / Ads without Compromising User Experience 
* commit '3d672e1e789e171e913605945efe95a477ab0505':
  Android U Class: Monetization / Ads without Compromising User Experience
 2011-12-15 11:08:51 -08:00
Glenn Kasten
d9a723bc92 Merge "Fix build error when verbose logging is enabled" 2011-12-15 10:46:14 -08:00
Scott Main
4fbed59804 am fbc17ecc: am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'fbc17eccea267c7cee344ac7e7898709f86b37df':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:45:50 -08:00
Scott Main
3d672e1e78 Android U Class: Monetization / Ads without Compromising User Experience 
Change-Id: I1aaddc6bbbc9fc2b53119893f2b70260f1b0d9a7
 2011-12-15 10:44:11 -08:00
Scott Main
fbc17eccea am cf927f22: am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'cf927f229f55849caf3461621023b5bd61908334':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:43:46 -08:00
Scott Main
cf927f229f am aed4ced6: Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app. 
* commit 'aed4ced6556383483209f454c9e4872e8ad28ebf':
  Android U Class: Developing Android Applications for the Enterprise. This class uses a sample app.
 2011-12-15 10:41:18 -08:00
Scott Main
aed4ced655 Android U Class: Developing Android Applications for the Enterprise. 
This class uses a sample app.

Change-Id: I508edbb98c8e9dea1d3ea26c8dcd9da213330d87
 2011-12-15 10:38:32 -08:00
Martijn Coenen
cb1b2b8b1e Merge "Fix NPE on mock NDEF tech operations." 2011-12-15 10:32:11 -08:00
Martijn Coenen
23fc93a7c1 Fix NPE on mock NDEF tech operations. 
Change-Id: Ib67bd03b6275fdb86a5d6dedc6c7e4fed07ef8b0
 2011-12-15 10:28:52 -08:00
Scott Main
ed29dc09bf am ecaee21d: am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'ecaee21d3050f34bcb8c6d4bafec9764ab1a7027':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:17:15 -08:00
Scott Main
ecaee21d30 am e4e6c066: am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'e4e6c06641a6446c0f26a0ac59c665f34476a6b4':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:15:21 -08:00
Scott Main
e4e6c06641 am f9cca66e: Docs: Training class on Identifying and Authenticating Users. 
* commit 'f9cca66e8b4acbc8d50713b4ed4b92d8274285c1':
  Docs: Training class on Identifying and Authenticating Users.
 2011-12-15 10:13:07 -08:00
Scott Main
f9cca66e8b Docs: Training class on Identifying and Authenticating Users. 
Change-Id: Ie2005687ca3baf28d9e01be8c10ee0f6a58a3cc3
 2011-12-15 10:07:03 -08:00
Victoria Lease
3c65fad4de Merge "URL-decode tel: URIs." 2011-12-15 09:59:42 -08:00
Glenn Kasten
16dabac224 Fix build error when verbose logging is enabled 
Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
 2011-12-15 08:34:59 -08:00
Romain Guy
18ca25be58 Merge "Generate even fewer GL commands" 2011-12-14 19:25:20 -08:00
Romain Guy
8f85e80b64 Generate even fewer GL commands 
Change-Id: I0f4dcacb03ef5ee7f6ebd501df98bfead5f0a7f8
 2011-12-14 19:23:32 -08:00
Dianne Hackborn
51a0e745ee am 13299a33: am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '13299a33e14562a5de14c89ad058d28ab0cd9f37':
  Fix some java docs.
 2011-12-14 18:21:29 -08:00
Dianne Hackborn
13299a33e1 am 399f1df3: Merge "Fix some java docs." into ics-mr1 
* commit '399f1df38594ea8bc927ad23bfbde996a9dc161d':
  Fix some java docs.
 2011-12-14 18:19:42 -08:00
Dianne Hackborn
399f1df385 Merge "Fix some java docs." into ics-mr1 2011-12-14 18:18:29 -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
Dianne Hackborn
251fe26375 Fix some java docs. 
Change-Id: I0eeba6f9108db74418063fba522ed3ef1c27ae95
 2011-12-14 17:20:54 -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
Victoria Lease
4d8ea3bcc6 URL-decode tel: URIs. 
bug: 5688406

Change-Id: I2e3906c22d02b6333ccad7dba529d44ae572a368
 2011-12-14 17:13:47 -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
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
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