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

4711 Commits

Author SHA1 Message Date
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap 
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
 2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap* 
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
 2015-05-01 14:30:21 -07:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base 
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
 2015-05-01 13:56:04 -07:00
Mathieu Chartier
9308462a59 Look at map extensions before /dev/ + ashmem. 
Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af
 2015-05-01 11:50:47 -07:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
John Reck
3731dc220e A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-30 14:34:55 -07:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places 
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
 2015-04-30 12:46:57 -07:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
Jean-Michel Trivi
5a56109d1f AudioService receives callback for dynamic policy mix state changes 
AudioService registers a callback for dynamic policies from
  AudioSystem.
AudioSystem keeps track of a single callback for dynamic policies.

Bug 20226914

Change-Id: I48899d20d1dbb47bb680e733a3bc9fd064b60f07
 2015-04-29 17:56:19 -07:00
Andy Hung
1afdbe3b77 Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-dev 2015-04-29 23:50:46 +00:00
Andy Hung
fe48e0dfb9 Pass PlaybackSettings as class object for AudioTrack JNI 
Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
 2015-04-29 14:09:18 -07:00
Svet Ganov
5686780404 Merge "Respect the record audio app op - framework" into mnc-dev 2015-04-29 19:34:06 +00:00
Jeff Brown
b957a742b2 Merge changes from topic 'brightness' into mnc-dev 
* changes:
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.
 2015-04-29 01:18:05 +00:00
Jeff Brown
e7e9ccea32 Add float support to binary event log. 
Bug: 20664753
Change-Id: I90456400b878f943e39cbddec45649662176e2aa
 2015-04-28 17:53:32 -07:00
Mathieu Chartier
325a57218e Merge "Properly describe exception" into mnc-dev 2015-04-28 23:47:26 +00:00
Mathieu Chartier
876b7d8fa8 Properly describe exception 
Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.

Bug: 20640601

(cherry picked from commit d12065f581defd9e8199593e85aa2036a0713684)

Change-Id: I00126b678ff296e0076247554af8328fe2767038
 2015-04-28 16:46:59 -07:00
Svet Ganov
fa5ecdc4ac Respect the record audio app op - framework 
Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
 2015-04-28 16:31:58 -07:00
Chris Craik
ff623a5ab3 Merge "Remove unused flags and dirty rects" into mnc-dev 2015-04-28 21:39:49 +00:00
Andreas Gampe
27c39f1ade am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp 
* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
  Frameworks/base: Add debug.gencfi property

(cherry picked from commit a5b55a017a984608eacdf414bc1cbcd7615f1c13)
 2015-04-28 13:46:00 -07:00
Paul McLean
6bd27e1a0c AudioRecord device select continued 
Change-Id: I3b6ace370b878351d98dbdcba2db718b30de2f27
 2015-04-28 17:16:18 +00:00
Chris Craik
956f340aac Remove unused flags and dirty rects 
bug:17209071

Also update DisplayList->RenderNode naming in Editor

Change-Id: I1d505640ba7388a0b0042d9c787f859e45a24da5
 2015-04-28 09:40:01 -07:00
Martijn Coenen
398e24ee14 Fix vmalloc memory accounting (DO NOT MERGE). 
VmallocUsed from meminfo sums all vmalloc'd
memory areas, but it shouldn't count the areas
that were mapped with ioremap(); ioremap()'d
ranges usually map to I/O memory, not actual
physical memory.

Binder and CMA are exceptions, but in the
common case we're more accurate not counting
those regions either.

Bug: 20483106
Change-Id: I75e74d9477a30a3de84877531b6e614a71469d24
(cherry picked from commit f33b6292168ea6e90c9d52d477c922af23001f63)
 2015-04-27 19:47:48 +00:00
Aravind Akella
398e11837b Merge "Add hidden SensorManager APIs for injecting sensor data." 2015-04-25 01:40:26 +00:00
Andy Hung
30d794360f Move channel index computation to native AudioTrack JNI 
Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
 2015-04-24 16:08:27 -07:00
Aravind Akella
18ebf732b8 Add hidden SensorManager APIs for injecting sensor data. 
Change-Id: If49467ced1a719c49bb5ac7ab670e86ff4642eaa
 2015-04-23 17:30:04 -07:00
Paul McLean
ec4097b0ca Merge "Explicit routing in AudioRecord" 2015-04-23 22:25:19 +00:00
Paul McLean
2d6de4c38c Explicit routing in AudioRecord 
Change-Id: Ib3af1041d9f7bbccefd6b86cd3c35baf742be861
 2015-04-23 16:11:34 -06:00
Andy Hung
25d4a63983 Merge "Add channel index mask to AudioRecord" 2015-04-23 01:30:05 +00:00
Andy Hung
98d4ca6229 Add channel index mask to AudioRecord 
Change-Id: I5d2504d3a7af6611d3ffa9a4c2d3665a2cf97fef
 2015-04-22 15:43:48 -07:00
Andy Hung
463cb818ba Merge "Add PlaybackSettings for use with AudioTrack" 2015-04-22 22:36:17 +00:00
Andy Hung
263b4c9782 Add PlaybackSettings for use with AudioTrack 
Change-Id: Ie59686d46869558d489a7600170ddace00e548d5
 2015-04-22 15:27:16 -07:00
John Reck
c1b33d665c GraphicsJNI Canvas cleanup 
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
 2015-04-22 09:34:34 -07:00
Chris Craik
2099ee8ab5 Merge "Rename native DisplayListRenderer to DisplayListCanvas" 2015-04-21 16:30:08 +00:00
Dan Sandler
aa861666ed Fix build. 
Change-Id: I0e419fdb36cedba67fc6da7f71134d9728f66150
 2015-04-21 10:26:13 -04:00
Dan Sandler
954863ab9b Merge "Add ashmem stats to Parcels." 2015-04-21 14:10:20 +00:00
Raph Levien
1c17ba5f83 Merge "Add Paint methods for cursor positioning" 2015-04-20 22:13:55 +00:00
John Reck
8222a7ec81 Merge "Revert "Change how Java Bitmaps are accessed in a few places"" 2015-04-20 22:07:45 +00:00
John Reck
edc22fba59 Revert "Change how Java Bitmaps are accessed in a few places" 
Bug: 20207616

This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.

Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
 2015-04-20 22:06:31 +00:00
Chris Craik
db663fe83f Rename native DisplayListRenderer to DisplayListCanvas 
Change-Id: I33e6f8cc85da1e7da7ff7bf18d4ebde64222067a
 2015-04-20 14:20:47 -07:00
Jeff Brown
f9978f863f Merge "Fix leaks due to GC circular references." 2015-04-17 22:27:03 +00:00
Jeff Brown
3b4049e79b Fix leaks due to GC circular references. 
The DisplayEventReceiver and SensorManager event queue both get
leaked when the Looper thread they are attached to dies because
the Java object holds a strong reference to its native peer and
meanwhile the native peer holds a strong reference to the Java
object through JNI.

Fixed the issue by indirecting through a weak reference as was
done for InputEventReceiver some time ago.

Bug: 12455729
Change-Id: I3d80a2a190192d1a2981bf5ae0cad30f0f7688a5
 2015-04-17 15:24:31 -07:00
John Reck
9d4efdf280 Revert "A bunch more cleanups" 
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.

Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
 2015-04-17 20:47:27 +00:00
John Reck
7809f835ca Revert "Move AssetAtlas off of SkBitmap*" 
This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220.

Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
 2015-04-17 20:46:47 +00:00
John Reck
afbeb2c237 Merge "Revert "Remove Bitmap#getSkBitmap"" 2015-04-17 20:46:22 +00:00
John Reck
1ff961dd6d Revert "Remove Bitmap#getSkBitmap" 
This reverts commit 4bd981ec533a65e8dee053a0a709b484770b0a76.

Change-Id: I5c92cd955c6e70e197dc5cbc5dfeed8369a24a31
 2015-04-17 20:45:15 +00:00