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

118190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
525680d2bf Merge "Fix loop limits." into klp-modular-dev 2013-12-19 00:45:32 +00:00
Stephen Hines
16c75d3a58 am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit 'a341c97bf7546243fa312d98de59394442142d38':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-19 00:44:27 +00:00
Craig Mautner
704e40b8ba Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2013-12-18 16:43:51 -08:00
Stephen Hines
a341c97bf7 am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit '9fea4caf5bb3f26c3606069218a0ecb860b86e49':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-19 00:40:35 +00:00
Stephen Hines
9fea4caf5b am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit 'ad5ee2f40a1b248aea49657e9f7155daac4cf65e':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-18 16:36:39 -08:00
Stephen Hines
ad5ee2f40a am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 
* commit '7f8c70a1a48df91ee5541b03dc380c08ab6ebf42':
  DO NOT MERGE - Fix improper declaration/use of pointer.
 2013-12-18 16:32:59 -08:00
Stephen Hines
7f8c70a1a4 Merge "DO NOT MERGE - Fix improper declaration/use of pointer." 2013-12-19 00:30:26 +00:00
Baligh Uddin
ac1432443d am f5570908: (-s ours) am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'f5570908a5acc1f68128c974abcfb0117a44589d':
  Import translations. DO NOT MERGE
 2013-12-19 00:28:31 +00:00
Baligh Uddin
bac5ab53c4 am cdbf1e0c: (-s ours) am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit 'cdbf1e0c5bc133cd4f8f8d6e86c28eabc0812730':
  Import translations. DO NOT MERGE
 2013-12-19 00:28:26 +00:00
Baligh Uddin
f5570908a5 am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '53ca3018beb1a7a12d12cddfbc433d50ca793cf9':
  Import translations. DO NOT MERGE
 2013-12-19 00:25:00 +00:00
Baligh Uddin
cdbf1e0c5b am 200bd4d8: (-s ours) am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit '200bd4d814fc4dc759191968f436104586cd339b':
  Import translations. DO NOT MERGE
 2013-12-19 00:24:56 +00:00
Stephen Hines
57cf560719 DO NOT MERGE - Fix improper declaration/use of pointer. 
https://code.google.com/p/android/issues/detail?id=61547

This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.

Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
 2013-12-18 16:24:21 -08:00
Baligh Uddin
53ca3018be am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '17b489f374fc878e2118a095511e209dd69ce3d4':
  Import translations. DO NOT MERGE
 2013-12-18 16:20:16 -08:00
Baligh Uddin
200bd4d814 am 142be9ce: (-s ours) am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit '142be9ce6beaca5e0949176a0a8775ba4cd9dc99':
  Import translations. DO NOT MERGE
 2013-12-18 16:20:12 -08:00
Baligh Uddin
17b489f374 am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '50391871e61e491cf766fc83e261a8345d1cb5b6':
  Import translations. DO NOT MERGE
 2013-12-18 16:16:30 -08:00
Baligh Uddin
142be9ce6b am db41eaef: (-s ours) Import translations. DO NOT MERGE 
* commit 'db41eaef9036d069edd46d101cfa927e3a4cb694':
  Import translations. DO NOT MERGE
 2013-12-18 16:16:25 -08:00
Baligh Uddin
50391871e6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-19 00:14:26 +00:00
Baligh Uddin
3cc579ebac Import translations. DO NOT MERGE 
Change-Id: I30e27dc30d542e9f2d3a23b3b1831cbd99e4b920
Auto-generated-cl: translation import
 2013-12-18 15:37:22 -08:00
Baligh Uddin
db41eaef90 Import translations. DO NOT MERGE 
Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989
Auto-generated-cl: translation import
 2013-12-18 15:11:27 -08:00
Scott Main
3bcdbd6b2d am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match 
* commit '6fda5415e07564b2e8ff000db5635e31d1e6f357':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:25:34 +00:00
Scott Main
6fda5415e0 am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, c 
* commit '709dca4474549772dccabc2f8cd214798f965a39':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:22:05 +00:00
Narayan Kamath
52ba48a850 am f08b83be: am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit 'f08b83beeef66b603dd3df1140e35f8e3f94d344':
  Remove unused field from MediaMuxer
 2013-12-18 18:20:42 +00:00
Narayan Kamath
f08b83beee am 4dd5c377: am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit '4dd5c37711f370af4c507eedd4c7d27ec35a2d64':
  Remove unused field from MediaMuxer
 2013-12-18 18:18:04 +00:00
Scott Main
709dca4474 am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify sectio 
* commit 'fb214e6b108e84f7f55bee378c5c539a723b0569':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 10:17:33 -08:00
Narayan Kamath
4dd5c37711 am be8fbb8f: Merge "Remove unused field from MediaMuxer" 
* commit 'be8fbb8fb63fddac2310dfbafa2594ed165b16b1':
  Remove unused field from MediaMuxer
 2013-12-18 10:14:45 -08:00
Scott Main
fb214e6b10 am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, p 
* commit '3032999bf35cd6a0f1643faacf08370ab69d979c':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification
 2013-12-18 18:14:12 +00:00
Scott Main
3032999bf3 Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification" into klp-docs 2013-12-18 18:11:50 +00:00
Narayan Kamath
be8fbb8fb6 Merge "Remove unused field from MediaMuxer" 2013-12-18 18:08:58 +00:00
Scott Main
326ed257b1 Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) 
clarifications about different external directories,
information about required permissions,
intent resolution technique to match other docs,
clarify section headings, plus other code clarification

Change-Id: I62e3692a53bcd724676c74dc2c98eb72bcf58e1e
 2013-12-18 09:58:15 -08:00
Narayan Kamath
535daa191b Remove unused field from MediaMuxer 
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
 2013-12-18 17:58:11 +00:00
Narayan Kamath
d1cec98ec5 am 04d02d97: am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '04d02d9731e0a199d22ad1408cbca1d39bdc4c91':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 13:05:44 +00:00
Narayan Kamath
04d02d9731 am 39d76302: am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '39d7630234127327d71a773dd563067989da4211':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 13:02:39 +00:00
Narayan Kamath
39d7630234 am 3da645f3: Merge "Don\'t pseudolocalize untranslatable strings." 
* commit '3da645f307695949623d78f280ce12e932eb057c':
  Don't pseudolocalize untranslatable strings.
 2013-12-18 05:00:02 -08:00
Narayan Kamath
3da645f307 Merge "Don't pseudolocalize untranslatable strings." 2013-12-18 12:46:41 +00:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:50:59 +00:00
Scott Main
74e9e69826 am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '7d1f8e6570b8137dbe1e9007bb8496a0f6c3cb53':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:48:03 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
 2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:41:23 +00:00
Scott Main
5dcb75e67b Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 2013-12-18 00:38:30 +00:00
Scott Main
84b8cbdafe am 22591164: am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '2259116450f25ae75d8d142a2bf15f3d5db35bd6':
  fix sidenav links to use toroot variable
 2013-12-17 23:12:13 +00:00
Scott Main
2259116450 am 007ae376: am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '007ae376d7672a456213e7f5475de4a910594cb2':
  fix sidenav links to use toroot variable
 2013-12-17 23:08:37 +00:00
Scott Main
007ae376d7 am 8c95a149: am 5b50239c: fix sidenav links to use toroot variable 
* commit '8c95a149b516595e22fa7b6479d7bc02750531c2':
  fix sidenav links to use toroot variable
 2013-12-17 15:06:31 -08:00
Scott Main
8c95a149b5 am 5b50239c: fix sidenav links to use toroot variable 
* commit '5b50239c33176e0b321d2ee32a589e0583767e02':
  fix sidenav links to use toroot variable
 2013-12-17 23:03:49 +00:00
Scott Main
5b50239c33 fix sidenav links to use toroot variable 
Change-Id: I5f63979adbe13ea0d02bb8fedc1a7d29d79f307f
 2013-12-17 14:59:05 -08:00
Scott Main
6652ef463d am dd55de3d: am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-d 
* commit 'dd55de3ddc7d9e7d2782a409560cb3eda30ba05b':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:06:38 +00:00
Scott Main
dd55de3ddc am 9767f9e2: am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '9767f9e2120609ada992e558ba16608aafa96811':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 22:03:16 +00:00
Scott Main
9767f9e212 am 7df86ef4: am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '7df86ef441835aedf24477f61e12cf78c5a86244':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 14:00:45 -08:00
Scott Main
7df86ef441 am 9e36f588: Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 
* commit '9e36f588993e02210f02d9b7c0600a842d67bbdb':
  update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502
 2013-12-17 21:57:46 +00:00
Scott Main
688342f98c fix typos 
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
 2013-12-17 13:55:02 -08:00
Scott Main
9e36f58899 Merge "update storage doc for secondary external storage in KK and add some new sample code and remove documentation for APIs below level 8 and add information about permission changes in KK bug: 11907502" into klp-docs 2013-12-17 21:54:48 +00:00