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

119285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
847da6abcb am 8fa3f443: am 54e7f53f: Merge "Fix build." 
* commit '8fa3f44342f3089aaf48de5c5a6f5a3e5d346cc7':
  Fix build.
 2014-03-07 02:28:34 +00:00
Paul Duffin
6b786e0012 am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
  Improve Parcel's handling of non-primitive arrays
 2014-03-07 02:27:47 +00:00
Narayan Kamath
e65d3025e4 am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit 'aa98fb51a8a0148b72e1662cc42102c6547776ce':
  Use size_t* in AssetManager::createIdmap
 2014-03-07 02:27:40 +00:00
Dianne Hackborn
e30761460f am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '133f6826e58aa7643858d4e50630103eb01f1815':
  Runtime resource overlay, iteration 2, test cases
 2014-03-07 02:27:13 +00:00
Dianne Hackborn
c1349a9601 am 4ad93639: am 67754d93: Merge "Runtime resource overlay, iteration 2" 
* commit '4ad93639d210297764db3ffcd870ff38464943de':
  Runtime resource overlay, iteration 2
 2014-03-07 02:27:10 +00:00
Dianne Hackborn
0827f986ae am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'" 
* commit '0cd115e1cebf4c090e7c36a65d4a5b7d1c363c21':
  New command line tool 'idmap'
 2014-03-07 02:27:05 +00:00
Narayan Kamath
e2e8046eb4 am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-03-07 02:26:56 +00:00
Narayan Kamath
4b418193d3 am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" 
* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
  Fix in MediaMuxer's JNI code
 2014-03-07 02:26:53 +00:00
Narayan Kamath
a3e2b70274 am 5c770dfb: am b823bd45: Merge "Use long to store pointers in ConsumerIrService" 
* commit '5c770dfba2846ee173d147fd974f8e9f073c1534':
  Use long to store pointers in ConsumerIrService
 2014-03-07 02:26:50 +00:00
Narayan Kamath
e898f14cd5 am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-03-07 02:26:46 +00:00
Narayan Kamath
0cdf6e9e7b am 5f7c0b1d: am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t" 
* commit '5f7c0b1d80f883fa15f88e0e4d508576a36a45de':
  Fix TinyHashMap to use generic hash_type instead of hash_t
 2014-03-07 02:26:39 +00:00
Tim Murray
063e2d077c am eaf82374: am 38d799fc: Merge "Generic object based data copy." 
* commit 'eaf82374186bd7084826f1cd258c82a3c6a4bf29':
  Generic object based data copy.
 2014-03-07 02:26:17 +00:00
Colin Cross
cc07f0f42e am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
  frameworks/base: fix errors inside ALOGV
 2014-03-07 02:26:12 +00:00
Narayan Kamath
7f079c392e am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code" 
* commit '578d4f5f50b3b8969125376d696e893dc355faa6':
  AArch64: Use long for pointers in RS Java/JNI code
 2014-03-07 02:25:55 +00:00
Christopher Tate
8d6c33b426 am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app" 
* commit '379bb6ed4ea4de035569b04018f84d7ce95a8036':
  Use canonical path for /vendor/app
 2014-03-07 02:25:26 +00:00
John Spurlock
8532dc1fc1 am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo mode." 
* commit '6691bfd6462e27af7075a3a46eccce943f0de9dd':
  Example controller app for system ui demo mode.
 2014-03-07 02:25:13 +00:00
Jean-Luc Brouillet
9e7aef4d9c am 8067c9ec: am 11e6cabc: Merge "Fix a typo." 
* commit '8067c9ec87906fb591bbc36d1c8aedb09160b2b4':
  Fix a typo.
 2014-03-07 02:25:07 +00:00
Dan Sandler
3a7f24b349 am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()" 
* commit '6b1f3acdf0f0806c0b3826d1c4ea43bd6cc6f021':
  Make sure to turn off led after pulse()
 2014-03-07 02:25:00 +00:00
Chris Craik
b1fbe205aa am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap" 
* commit '0ec3ca6e08e5933016beda147ca9a82e96434b15':
  Fix for positioning of glyphs within a bitmap
 2014-03-07 02:23:30 +00:00
Stephen Hines
643cd6a38f am eadd6941: am bc80e40b: Merge "Add message to RS docs about application vs. library packaging." 
* commit 'eadd69413a5cbdd32ae56967f48b6ab6f3efbe52':
  Add message to RS docs about application vs. library packaging.
 2014-03-07 02:23:01 +00:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed 
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
 2014-03-06 17:57:05 -08:00
Dianne Hackborn
cb15c7a83b More on issue #12031685 (DO NOT MERGE) 
Integrate from master:

Fix issue #13065185: Frequent runtime restarts on launching...

..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
 2014-03-06 17:39:11 -08:00
Tim Murray
4c639f86d4 am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." 
* commit '6ceac9f099b0ef7ca29351bbefa128df8101b5c2':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-03-07 01:35:10 +00:00
Tim Murray
07652ca847 am b1bec0d9: am 3fb6feac: Merge "Check that bound allocations are 1D" 
* commit 'b1bec0d916c00c7ceb09c691f1e5977909ba698d':
  Check that bound allocations are 1D
 2014-03-07 01:35:07 +00:00
Tim Murray
fc3a69d0b2 am 67d9e0be: am 0cc37f4c: Merge "Fix debug context." 
* commit '67d9e0be8e4ff709c03865c3b4ac9f40d5dcfdbb':
  Fix debug context.
 2014-03-07 01:35:04 +00:00
Tim Murray
4f044b50b5 am 42e4aee5: am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs." 
* commit '42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d':
  Enable asynchronous destruction of BaseObjs.
 2014-03-07 01:35:01 +00:00
Tim Murray
15363edcf5 am 42955bab: am d8b4dd95: Merge "Fix most logging macros for context pointers." 
* commit '42955bab2a275f3ea22d5a50b556cec88697a573':
  Fix most logging macros for context pointers.
 2014-03-07 01:34:58 +00:00
Tim Murray
be585f61cf am d39e19eb: am 351879df: Merge "Fix getBytesSize for YUV allocations." 
* commit 'd39e19eb8af54683d03ae955a5a58fea48a58754':
  Fix getBytesSize for YUV allocations.
 2014-03-07 01:34:55 +00:00
Tim Murray
dbe1aaa6a8 am 16e9362e: am 8fced317: Merge "Move RenderScript from graphics/ to new fw/base subdirectory rs." 
* commit '16e9362e5f5b4f09a46198218380bb386fee28e5':
  Move RenderScript from graphics/ to new fw/base subdirectory rs.
 2014-03-07 01:34:52 +00:00
Tim Murray
ac68141753 am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2." 
* commit '8df3ea66994e96d72040c44099dd2d74ba15ec67':
  Convert Java/JNI to 64-bit, part 2.
 2014-03-07 01:34:49 +00:00
Tim Murray
516f72448a am 72d637e2: am e22e268e: Merge changes If93a5d78,I1957f7ac 
* commit '72d637e297a143e5b18c8e8f4eb85695ed6b10f1':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
 2014-03-07 01:34:46 +00:00
Tim Murray
b0cb2bb53f am bccee732: am 61eb6b55: Merge "Use Object + type in place of specific array" 
* commit 'bccee732b53d06c0e983b3f325e0d9ad889de134':
  Use Object + type in place of specific array
 2014-03-07 01:34:43 +00:00
Tim Murray
5a00a96482 am 69914882: am e559d7ee: Merge "Utility API for creating types." 
* commit '69914882509b8ad81c23eadd1ebae53fb532042b':
  Utility API for creating types.
 2014-03-07 01:34:39 +00:00
Tim Murray
f9b86add00 am 271c3b74: am b1c1518e: Merge "Remove old hidden API." 
* commit '271c3b7499f53f6e7e168d68910efda5cc19f5fd':
  Remove old hidden API.
 2014-03-07 01:34:36 +00:00
Tim Murray
cccdf29d86 am 9bad32c3: am aea3b581: Merge "Remove hidden API setSurfaceTexture." 
* commit '9bad32c3830e45615a6b71e3f80ca7b95ef638b5':
  Remove hidden API setSurfaceTexture.
 2014-03-07 01:34:33 +00:00
Kenny Root
cd77ca1c28 am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory" 
* commit '85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
  Remove DRLCertFactory
 2014-03-07 01:33:25 +00:00
Marco Nelissen
233e7e9f64 am 98a6bcf4: Merge "ExifInterface: fix class load failure" into klp-dev 
* commit '98a6bcf433fc23c343343b04c57c5a68d0177ac7':
  ExifInterface: fix class load failure
 2014-03-07 01:26:10 +00:00
Dianne Hackborn
278fa87cc9 am 430652c1: Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 
* commit '430652c1e18c54dc6ae9debedb6394f2f1905903':
  Fix issue #13199860: PRE_BOOT_COMPLETED intent is...
 2014-03-07 01:26:05 +00:00
Marco Nelissen
98a6bcf433 Merge "ExifInterface: fix class load failure" into klp-dev 2014-03-07 01:16:50 +00:00
Leon Scroggins III
e648c19bf3 resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp 
Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
 2014-03-06 20:10:19 -05:00
Dianne Hackborn
430652c1e1 Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev 2014-03-07 01:04:50 +00:00
Zhijun He
9f97ac433a ExifInterface: fix class load failure 
libexif_jni was renamed as libjhead_jni

b/12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
 2014-03-06 16:54:05 -08:00
Svetoslav
d2a244f976 am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev 
* commit '8cb232cb796718ad91e56672a2c8fdbf88633001':
  ProgressBar is important for accessibility by default.
 2014-03-07 00:39:05 +00:00
Marco Nelissen
4f36104f06 am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
  libexif is now libjhead
 2014-03-07 00:38:48 +00:00
Narayan Kamath
ad7c2c2d8d am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible" 
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
 2014-03-07 00:38:00 +00:00
Narayan Kamath
02054534b1 am 9af95574: am 1cadc07d: Merge "Change ResourceType cookies to int32_t." 
* commit '9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
  Change ResourceType cookies to int32_t.
 2014-03-07 00:37:56 +00:00
Narayan Kamath
364d8180d5 am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" 
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
 2014-03-07 00:37:53 +00:00
Igor Murashkin
872afcd2f3 am 4463a4ef: am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" 
* commit '4463a4ef26b2eb62fae74568193fd07e97dedd4d':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 00:37:49 +00:00
Zhijun He
57d46fd204 am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" 
* commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db':
  Release locked buffer when it fails to acquire graphics buffer
 2014-03-07 00:37:35 +00:00
Brian Carlstrom
ac3b177cc1 am 2cd0563c: am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '2cd0563cb8345747d3705d4f339a0800998767fe':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-03-07 00:37:27 +00:00