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

119072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
aefa427c27 Make MtpDatabase use libexif instead of libjhead 
b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
 2014-03-07 10:30:23 -08:00
Leon Scroggins III
42ae4cf2ce Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp 2014-03-07 18:26:19 +00:00
Leon Scroggins III
74ca3fd34d am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 
* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
 2014-03-07 18:15:23 +00:00
Dianne Hackborn
8e904d565e am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 
* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
 2014-03-07 18:15:19 +00:00
Leon Scroggins III
bc57651fb5 Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev 2014-03-07 18:13:29 +00:00
Dianne Hackborn
785d764bd5 Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev 2014-03-07 18:12:30 +00:00
Andy McFadden
cda61e95f6 am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 
* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
 2014-03-07 17:43:40 +00:00
Andy McFadden
faddd77a91 Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2014-03-07 17:40:40 +00:00
Craig Mautner
2c82c08a54 Show the keyguard if unsecure window on top. DO NOT MERGE. 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-07 09:09:27 -08:00
Leon Scroggins III
278250dafb DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
 2014-03-07 11:28:44 -05:00
Chris Wren
111e981dc7 am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev 
* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
 2014-03-07 15:10:47 +00:00
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Wink Saville
4ee594e305 am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
 2014-03-07 02:30:08 +00:00
Nick Kralevich
943822c93a am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-03-07 02:29:42 +00:00
Dave Platt
9eca7f8fbc am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
 2014-03-07 02:29:30 +00:00
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
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