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

98376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
a74d1332cc am 81cfb63e: am d13b23a4: Merge "Revert "fix potential memory leak"" 
* commit '81cfb63e9fc6ef72e5b488225fe9b7a43551fc9e':
  Revert "fix potential memory leak"
 2013-01-03 18:50:08 -08:00
Elliott Hughes
f18eb323c3 am 767e1c01: am 9aac0c1b: Merge "fix potential memory leak" 
* commit '767e1c010c0664fa4bf7e7e32b840af4bbe0b0cf':
  fix potential memory leak
 2013-01-03 18:50:03 -08:00
Elliott Hughes
81cfb63e9f am d13b23a4: Merge "Revert "fix potential memory leak"" 
* commit 'd13b23a436075262cc83f7502f7159de24546003':
  Revert "fix potential memory leak"
 2013-01-03 18:47:37 -08:00
Elliott Hughes
767e1c010c am 9aac0c1b: Merge "fix potential memory leak" 
* commit '9aac0c1b35ec666a18f320be99e6aa37d0bcf202':
  fix potential memory leak
 2013-01-03 18:47:32 -08:00
Scott Main
8a4e3fd2ab am c41db6c9: am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit 'c41db6c9ba298c8fac5068ad2843b4aa58ecf1c5':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:47:12 -08:00
Scott Main
c41db6c9ba am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '834b0f3cd90679655ac1549cb427fc9475ac4a4b':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:44:22 -08:00
Scott Main
834b0f3cd9 am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '19b17b419cb11c2ff064021ebdd0dda1daab4c35':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:42:05 -08:00
Roger Chen
1740ada533 Handle nested folder case 
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2013-01-03 18:39:34 -08:00
Scott Main
19b17b419c am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '38a642e987612da86dc4f30b8d2c66a4a4833682':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:38:56 -08:00
Scott Main
38a642e987 am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 
* commit '3e2479dd20ee9a1dab17e5dbec7fc835f2fa427f':
  docs: fix broken links and add new sitemap text file
 2013-01-03 18:36:45 -08:00
Scott Main
3e2479dd20 Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev 2013-01-03 18:32:45 -08:00
Scott Main
188315cf8b docs: fix broken links and add new sitemap text file 
Change-Id: If0f7967a65a6e3a444a565a2e8229a04a5265f56
 2013-01-03 18:02:21 -08:00
Adam Powell
4b816cc269 am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '262b311c3c7d68204a72d3ba87bd76883aec00e2':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:43:43 -08:00
Elliott Hughes
d13b23a436 Merge "Revert "fix potential memory leak"" 2013-01-03 17:40:55 -08:00
Adam Powell
262b311c3c am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit 'b7de79d02743cc3b5372be27be818d3227a34e2b':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:40:32 -08:00
Elliott Hughes
957efcdc73 Revert "fix potential memory leak" 
This reverts commit bc268b9014f211910e412a7fda96b6394ff2badc

Change-Id: I07f49bd0cfecc43bc761d2b0635c9915a8e30272
 2013-01-03 17:38:57 -08:00
Adam Powell
b7de79d027 am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:37:49 -08:00
Elliott Hughes
9aac0c1b35 Merge "fix potential memory leak" 2013-01-03 17:35:57 -08:00
Sungmin Choi
bc268b9014 fix potential memory leak 
use delete before return

Change-Id: I5449ad90bb6910f057bd825b722c9803a7343c34
 2013-01-04 09:56:18 +09:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Katie McCormick
6d2b3fb397 am 0f7cc697: am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit '0f7cc697ed55f9b9587633c912b9bd9b8f41db31':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:22:29 -08:00
Katie McCormick
0f7cc697ed am f420b800: am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit 'f420b800b8813aee636f955012da6fb87e631827':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:20:07 -08:00
Katie McCormick
f420b800b8 am 47f56dbf: am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit '47f56dbf692939ba30a347844d6688e120a666ea':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:16:47 -08:00
Katie McCormick
47f56dbf69 am d56e4eca: am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit 'd56e4eca33639f175790d136d76f0d9cab9b95c3':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:14:39 -08:00
Katie McCormick
d56e4eca33 am ed2a05bc: Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 
* commit 'ed2a05bc5b05e8aec0777ce2eb57bb91626524d8':
  Doc change: minor fixes to support lib lesson.
 2013-01-03 16:11:31 -08:00
Katie McCormick
ed2a05bc5b Merge "Doc change: minor fixes to support lib lesson." into jb-mr1-dev 2013-01-03 16:07:45 -08:00
Katie McCormick
e06b0838e3 Doc change: minor fixes to support lib lesson. 
Bug # 7633596

Change-Id: I380300b818cb6886c3c6857b64ba54e0602f7a37
 2013-01-03 16:01:33 -08:00
Jim Miller
e15c90241f Merge "Remove unused keyguard code" 2013-01-03 15:49:22 -08:00
Christopher Tate
a82fe9faa1 Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)" 2013-01-03 15:40:26 -08:00
Wink Saville
c48233c60d am c6e41cf2: am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes" 
* commit 'c6e41cf2680773b02a7d8caacb6047ed31d6c260':
  frameworks/base: Support for LTE network modes
 2013-01-03 15:21:52 -08:00
Wink Saville
c6e41cf268 am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes" 
* commit '28a7a05952b7c338f2c1746cb20a17e28358bffc':
  frameworks/base: Support for LTE network modes
 2013-01-03 15:19:14 -08:00
Wink Saville
28a7a05952 am 881d5387: Merge "frameworks/base: Support for LTE network modes" 
* commit '881d5387a3e92fa30f5966f00a04c4a33af8f18b':
  frameworks/base: Support for LTE network modes
 2013-01-03 15:14:15 -08:00
Dake Gu
1ee60179bb fix ImageView.getImageMatrix() 
getImageMatrix() does not return "mDrawMatrix",  instead it returns
mMatrix.  This is not reflecting the matrix used in drawing when
Bitmap is changed and mDrawMatrix is set to null while mMatrix still
holds old invalid data.

Change-Id: If24c3118068eca70cfe15786f9715d95c4499f3b
 2013-01-03 15:11:43 -08:00
Wink Saville
881d5387a3 Merge "frameworks/base: Support for LTE network modes" 2013-01-03 14:49:05 -08:00
Romain Guy
5913148104 Merge "Remove unnecessary & uninitialized variable Bug #7728929" 2013-01-03 14:46:20 -08:00
Romain Guy
15a65bfee5 Remove unnecessary & uninitialized variable 
Bug #7728929

The uninitialized variable was taken into account to compute
the hash of gradient cache entries, thus causing cache corruptions
and sometimes infinite loops (it would also cause the cache to fill
up.)

Change-Id: Ic807a9bf901888b121a6a781a81dafc33075ed2a
 2013-01-03 14:45:39 -08:00
Jeff Sharkey
836ecb539f Expose roaming flag for testing. 
Change-Id: I29ef6fc59926a97f4e97c561387ac9bc0e4e4769
 2013-01-03 14:07:46 -08:00
Romain Guy
44080524f0 Merge "Remove C++11 related warning" 2013-01-03 13:10:23 -08:00
Romain Guy
dcfc836b45 Remove C++11 related warning 
Change-Id: I250ff7bd0ea49908e11b14c995d77312cd09a8b4
 2013-01-03 13:08:57 -08:00
Jason Noguchi
ca6a5eee8f Refactoring the media recorder stress test. 
Added test cases for:
- record & playback @ 1080p
- record & playback @ 720p
- record & playback @ 480p
- record & playback @ custom
Plus extending the record duration to a full minute.

Change-Id: I294714811606c1ae57907d6ef6a7052044b6247c
 2013-01-03 12:27:48 -08:00
Christopher Tate
f947930ed2 Merge "Document ContentProvider's API a bit more explicitly" 2013-01-03 12:22:53 -08:00
Christopher Tate
2bc6eb8c17 Document ContentProvider's API a bit more explicitly 
In particular, call out parameters that must not be null.

Change-Id: I67af73163e36efefefa7df86499937f998be5b00
 2013-01-03 12:16:54 -08:00
Scott Main
0b8b0deba9 am 36687030: am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '3668703021cc2f010d90d6194ca57456c9e11dbc':
  docs: dashboard update for 1/3/13
 2013-01-03 11:56:57 -08:00
Scott Main
3668703021 am cd7b6a94: am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit 'cd7b6a947060dfa3da58acbba039274103077757':
  docs: dashboard update for 1/3/13
 2013-01-03 11:54:51 -08:00
Scott Main
cd7b6a9470 am 7b310320: am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '7b31032051f430e03ac05503410b687fd289bdc3':
  docs: dashboard update for 1/3/13
 2013-01-03 11:51:27 -08:00
Scott Main
7b31032051 am 90c0548c: am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '90c0548c057f0c26c4dcd215ee64e787460c4c6e':
  docs: dashboard update for 1/3/13
 2013-01-03 11:49:45 -08:00
Scott Main
90c0548c05 am 9fe82f1b: Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 
* commit '9fe82f1bc7c880bb1ec5ac3a9a1b5fff2c0bdda9':
  docs: dashboard update for 1/3/13
 2013-01-03 11:47:20 -08:00
Scott Main
9fe82f1bc7 Merge "docs: dashboard update for 1/3/13" into jb-mr1-dev 2013-01-03 11:44:43 -08:00
Scott Main
b318318e0a docs: dashboard update for 1/3/13 
Change-Id: I0ff0b045d1c08a071fa706d8c0ff17943f2e752f
 2013-01-03 11:39:34 -08:00
Jean-Michel Trivi
e0c93e085f Merge "Use playback state to update remote control stack" 2013-01-03 11:14:41 -08:00