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

5002 Commits

Author SHA1 Message Date
Elliott Hughes
ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master 
* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables
 2015-09-24 17:14:10 +00:00
Elliott Hughes
b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master 
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
 2015-09-24 10:01:32 -07:00
Daniel Micay
76f6a86de2 constify JNINativeMethod function pointer tables 
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
 2015-09-22 17:10:35 -04:00
Dan Stoza
8dcd14cdc9 am 4a90942e: am f615872c: am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 
* commit '4a90942ea75039f916d8371111fdc41a80039b98':
  SurfaceControl: Add colorTransform to DisplayInfo
 2015-09-04 02:21:41 +00:00
Sharvil Nanavati
db8a6ee56b am 80770c09: am 16db4101: Merge "DO NOT MERGE Add \'bluetooth\' user to the \'system\' group." into cw-e-dev 
* commit '80770c099144b65e9c7768bbdb56608eebf03b01':
  DO NOT MERGE Add 'bluetooth' user to the 'system' group.
 2015-09-04 02:21:21 +00:00
Dan Stoza
f615872cb4 am 0b887e57: Merge "SurfaceControl: Add colorTransform to DisplayInfo" into mnc-dr-dev 
* commit '0b887e579b766012c09626e7089a3fade5415ee6':
  SurfaceControl: Add colorTransform to DisplayInfo
 2015-09-03 22:03:08 +00:00
Sharvil Nanavati
16db410182 Merge "DO NOT MERGE Add 'bluetooth' user to the 'system' group." into cw-e-dev 2015-09-03 21:02:43 +00:00
Dan Stoza
904f485bc6 SurfaceControl: Add colorTransform to DisplayInfo 
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the PhysicalDisplayInfo
class, and populates it from the corresponding field from
ISurfaceComposer.

Bug: 20853317
Change-Id: Ic59ca5142bdaa73c42d9c044d7aae345255f1dad
 2015-09-03 13:38:39 -07:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
 2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
 2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Sharvil Nanavati
babe81546e DO NOT MERGE Add 'bluetooth' user to the 'system' group. 
Also grant the Bluetooth process CAP_BLOCK_SUSPEND so it can acquire
wake locks directly from /sys/power/wake_lock.

Bug: 23375670
Change-Id: Ib094c5752d49488c2560897ff6bb821daf98a281
 2015-08-31 23:25:06 -07:00
Christopher Ferris
7dd51792e2 am d6597cb4: am 1bc7d0c8: am 70c958c4: Merge "Save/restore errno in SIGCHLD handler." into mnc-dr-dev 
* commit 'd6597cb43c1985ec955f2f5c5daf7be52a9f12a2':
  Save/restore errno in SIGCHLD handler.
 2015-09-01 00:41:06 +00:00
Christopher Ferris
a8a795428a Save/restore errno in SIGCHLD handler. 
The SIGCHLD handler can set the errno, which can change the errno found
on the thread on which the signal handler is invoked. Most of the time
this is harmless, but it's possible that if the main thread was making
a system call, and allows certain failures based on errno, that logic
can fail. The fix is to save/restore errno in the handler.

Bug: 23572286
Bug: 23689391
Change-Id: I4542fd60cc1398ce0a8902d8df98a3d089fb6efe
 2015-08-31 16:36:14 -07:00
Ruben Brunk
7ba74bf260 am e65066d3: am 7a193899: am 96990d0c: Merge "Fix DngCreator default crop calculations." into mnc-dr-dev 
* commit 'e65066d30eb52d2ef938501890ba4cf99d8f1b7b':
  Fix DngCreator default crop calculations.
 2015-08-28 22:05:46 +00:00
Ruben Brunk
96990d0cdd Merge "Fix DngCreator default crop calculations." into mnc-dr-dev 2015-08-28 21:42:26 +00:00
Ruben Brunk
a4ff47ced1 Fix DngCreator default crop calculations. 
Bug: 23591407
Change-Id: I1b0e46e7371b3db63e8d68230964d09d7537c3ce
 2015-08-28 11:35:42 -07:00
Eric Laurent
4803708270 am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp() 
* commit '155c1ad113dd6ec6bab9fdcb0934db255603237a':
  AudioTrack: error reporting for getTimestamp()
 2015-08-27 19:22:22 +00:00
Eric Laurent
aef51d09ef am 4a8034ca: AudioTrack: error reporting for getTimestamp() 
* commit '4a8034caea13a90c01800ff554539772c6ff5523':
  AudioTrack: error reporting for getTimestamp()
 2015-08-27 18:28:48 +00:00
Eric Laurent
4a8034caea AudioTrack: error reporting for getTimestamp() 
Add a new getTimestamp() method that returns an error code.

Bug: 21886109.
Bug: 22202349.
Bug: 17548098.

Change-Id: Ib072dd3442de79bab9aca77c3c33b0790b492154
(cherry picked from commit 4e1ccd370fc268f3207c5baee08ac8c943c3fdf9)
 2015-08-27 17:52:38 +00:00
Yasuhiro Matsuda
1ab43d5978 Add trace code to system server. 
- Add TRACE_TAG_SYSTEM_SERVER for tracing system server code.
- Add a few more tracing code to the code paths related to boot.

BUG: 21739901
BUG: 22207144
Change-Id: I08b424d2f83783f512c3818394099909cd55f327
 2015-08-27 12:22:07 +09:00
Elliott Hughes
1262059c07 am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process" 
* commit '260cb53fdb751dd6997b6b6f60a358257c4df82a':
  zygote: fix memory leak when fork process
 2015-08-20 19:31:45 +00:00
Elliott Hughes
31b1b2766d am 260cb53f: am ce4fbb4d: Merge "zygote: fix memory leak when fork process" 
* commit '260cb53fdb751dd6997b6b6f60a358257c4df82a':
  zygote: fix memory leak when fork process
 2015-08-20 01:30:41 +00:00
Elliott Hughes
ce4fbb4da6 Merge "zygote: fix memory leak when fork process" 2015-08-20 01:14:00 +00:00
Mykola Kondratenko
1ca062f21e zygote: fix memory leak when fork process 
Release memory allocated by GetIntArrayElements.

Change-Id: If7ce2a78a480e58b0376352ce438dbe51f664f3a
 2015-08-19 09:41:03 +02:00
Sebastien Hertz
60a2716f72 am 3244dc22: am 677cd087: am e9de1b4c: am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev 
* commit '3244dc229af4d4c8b764bf9ca1e108b5cd933d90':
  Allow debugging only for apps forked from zygote
 2015-08-18 09:52:46 +00:00
Sebastien Hertz
e95386852e am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev 
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote
 2015-08-18 07:50:27 +00:00
Sebastien Hertz
e9de1b4cef am 9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev 
* commit '9a010d0a4157f97870bc38bd3dd0a8f4fd18a172':
  Allow debugging only for apps forked from zygote
 2015-08-18 07:50:06 +00:00
Sebastien Hertz
9a010d0a41 Merge "Allow debugging only for apps forked from zygote" into mnc-dev 2015-08-18 07:41:50 +00:00
Eino-Ville Talvala
3a94b2d22e am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:55:33 +00:00
Eino-Ville Talvala
eec25a4ffe am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 01:34:42 +00:00
Eino-Ville Talvala
c964884eb7 am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-15 00:54:18 +00:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras. 
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
 2015-08-14 14:52:57 -07:00
Narayan Kamath
0d2e3d3ea3 am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'c42acbdb65d89b1e5fc1cafde4cbe0996c104f7a':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:55:33 +00:00
Narayan Kamath
d29382aaf0 am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:39:16 +00:00
Narayan Kamath
86b6d204a5 am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:39:13 +00:00
Narayan Kamath
bf88205bef Fall back to persist.sys.language/country if locale isn't set. 
This will prevent users from losing their language setting when they
take an OTA to M.

bug: 23021286
Change-Id: Ifb66f6bf6a940ab745edac709321f3009ec6eab4
 2015-08-12 11:03:46 +01:00
Andreas Gampe
d38110bdcd am 1be6e1c7: am 9502cc54: am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit '1be6e1c7643859839157534d45677fa20169fd1d':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:56:19 +00:00
Andreas Gampe
d06696939b am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:35:42 +00:00
Andreas Gampe
af7855ff85 am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:35:37 +00:00
Andreas Gampe
b08c24a3e4 Frameworks/base: Disable Clang in core/jni 
thread_local does not work with Clang at the moment.

Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
 2015-08-11 06:18:49 +00:00
Sebastien Hertz
7a09b8322c Allow debugging only for apps forked from zygote 
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463
Change-Id: If8ea719063a65db4cdeed69a838b52e87b078b08
 2015-08-10 20:39:13 +02:00
Ruben Brunk
ffbe794353 am 1a232510: am 3b006485: am ae81ebf8: Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev 
* commit '1a2325105f88b6160409299ca9b6668e128a1beb':
  camera2: Update DngCreator with bad pixel opcode.
 2015-08-07 23:34:40 +00:00
Ruben Brunk
ae81ebf892 Merge "camera2: Update DngCreator with bad pixel opcode." into mnc-dr-dev 2015-08-07 23:11:50 +00:00
Jeff Sharkey
ce8f8edcc4 am 48697332: am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit '48697332c7793d17a12887b5d508aeb96049c7f7':
  Protect runtime storage mount points.
 2015-08-06 21:31:49 +00:00
Jeff Sharkey
3d4f4b33fd am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
  Protect runtime storage mount points.
 2015-08-06 19:58:04 +00:00
Jeff Sharkey
7d28ad9b63 am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
  Protect runtime storage mount points.
 2015-08-06 19:36:01 +00:00
Jeff Sharkey
928e1ecfe2 Protect runtime storage mount points. 
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.

This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.

Also add CTS tests to verify that we're protecting access to
internal mount points like this.

Bug: 22964288
Change-Id: I74dbdcb01d4fabe92166b8043a74c6a1e93c6d5f
 2015-08-06 11:46:30 -07:00
Tim Murray
edd15f39f5 am 34f4e88d: am ffd8889a: am f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev 
* commit '34f4e88d7e08b2c2cbfb28b3c7f7aa627709f95b':
  Add boost to increase the load on newly-forked zygote processes.
 2015-08-05 23:32:45 +00:00
Tim Murray
6d43a861d0 Add boost to increase the load on newly-forked zygote processes. 
Makes it more likely for app launches to end up on a large core in
an HMP environment.

bug 21915482

Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
 2015-08-05 14:32:44 -07:00