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

118246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
804ff38bff Handle user-defined cache path for RS. 
Change-Id: I92e3346dca331ae6a9dfbe4f95292bc604dfd196
 2013-12-18 17:04:04 -08:00
Dave Allison
24bafbc933 Add a call to registerAppInfo for the VMRuntime 
This calls into the VMRuntime tells it where the
application directory is located.

Bug: 11539952
Change-Id: I20e0b8c63e459699a1bc9af435e65ae96f1e1e73
 2013-12-18 17:01:37 -08:00
Oscar Rydhé
e795ec73eb Add NULL check in updateProxyConfig 
If the exclusionList was null in updateProxyConfig the VM would
crash when converting it to a UTF8 string. Avoid this by adding a
null check.

Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
 2013-12-19 09:38:59 +09: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
Baligh Uddin
986859998c Import translations. DO NOT MERGE 
Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3
Auto-generated-cl: translation import
 2013-12-18 16:36:21 -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
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
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
f11dd63e0c MediaDrm#mNativeContext is a long, not int. 
Therefore, we must use SetLongField and not SetIntField.

Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
 2013-12-18 16:58:36 +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
Niklas Brunlid
d64fe0f53c MountService listeners can not be unregistered 
When unregistering MountService listeners, their Binder proxy
objects were compared to registered listeners instead of their
backing objects.

Change-Id: Ie98a686b1d17544f1eda59fb3eb0dc02d836c1b2
 2013-12-18 12:51:26 +01: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
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
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
Dirk Dougherty
4ffa6a4ae9 am d994602f: am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit 'd994602f99827adc589946453ab58551e31f878e':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 13:45:32 -08:00
Dirk Dougherty
d994602f99 am 731ba045: Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 
* commit '731ba04536a07582904b4bf64a9eed896cb93bc5':
  Doc change: update list of tablets supported in Google Play for Education.
 2013-12-17 21:37:19 +00:00
Dirk Dougherty
731ba04536 Merge "Doc change: update list of tablets supported in Google Play for Education." into klp-docs 2013-12-17 21:34:58 +00:00
Scott Main
37826fa9a9 am 4e73847a: am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above 
* commit '4e73847ab0d2278c314f67496b896d4de8c7abdb':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 13:21:36 -08:00
Scott Main
4e73847ab0 am 5cdadb48: initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perf 
* commit '5cdadb48d0e696352c21794861ba533214b06318':
  initial shuffle of the API guide nav to add introduction * revise to the Compatibility doc, put it in Intro * put Permissions in Intro * put App Fundamentals in Intro * move Manifest docs to the top of side nav tree * move App Resources above UI Will perform another fix to the Best Practices section later to deprecate some docs there and point to Training instead
 2013-12-17 21:19:42 +00:00
Scott Main
5cdadb48d0 initial shuffle of the API guide nav to add introduction 
* revise to the Compatibility doc, put it in Intro
* put Permissions in Intro
* put App Fundamentals in Intro
* move Manifest docs to the top of side nav tree
* move App Resources above UI
Will perform another fix to the Best Practices section
later to deprecate some docs there and point to Training instead

Change-Id: I88a8f94167ba15e97eb3bbbc08fd82dd82498e4b
 2013-12-17 13:14:17 -08:00
Dirk Dougherty
d6fb69933d Doc change: update list of tablets supported in Google Play for Education. 
Change-Id: Ic042a7b7d422f843c8274d94b46f4a874014d7ff
 2013-12-17 12:46:40 -08:00
Greg Hackmann
0b64fa7e4b am c978799c: Merge "Add /dev/rtc backend to SystemClock" 
* commit 'c978799c4a7cc8339d560bb47a029861230fa2a6':
  Add /dev/rtc backend to SystemClock
 2013-12-17 10:15:37 -08:00
Greg Hackmann
060ae1db7b am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService" 
* commit 'eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
  Add timerfd backend to AlarmManagerService
 2013-12-17 10:15:33 -08:00
Greg Hackmann
3545433d05 am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 
* commit '9f4e67c50b5c311adeaaf6135ef79214a46d0e26':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
 2013-12-17 10:15:29 -08:00
Greg Hackmann
c978799c4a Merge "Add /dev/rtc backend to SystemClock" 2013-12-17 18:11:06 +00:00
Greg Hackmann
eb0ca2b7bf Merge "Add timerfd backend to AlarmManagerService" 2013-12-17 18:10:49 +00:00
Greg Hackmann
9f4e67c50b Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 2013-12-17 18:10:33 +00:00
Craig Mautner
422d7003db am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 
* commit 'f431daa22811fdce9c4ec975d5d33121898b4f9b':
  Fix to NullPointerException on move back in ActivityStack.
 2013-12-17 08:42:31 -08:00