Commit Graph

174427 Commits

Author SHA1 Message Date
Mark Salyzyn
533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags
2015-02-25 19:13:12 +00:00
Mark Salyzyn
0d8b97a44e Merge "jni: switch to ANDROID_LOG_* mode flags" 2015-02-25 19:04:24 +00:00
Mark Salyzyn
18998c9852 jni: switch to ANDROID_LOG_* mode flags
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
2015-02-25 18:07:21 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap."
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
2015-02-24 12:56:52 +00:00
Narayan Kamath
72dc62ead2 Merge "Track removal of refcounts from FileMap." 2015-02-24 12:50:57 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment"
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Chad Brubaker
cdc70256f4 am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"
* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore
2015-02-23 22:45:11 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API"
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
2015-02-23 22:45:01 +00:00
Chad Brubaker
f3c117ca0d Merge "Add new IKeystoreService methods to KeyStore" 2015-02-23 22:20:59 +00:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
e6a461341c Add new IKeystoreService methods to KeyStore
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
2015-02-23 14:12:44 -08:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
2015-02-23 14:12:37 -08:00
Narayan Kamath
688ff4cf0f Track removal of refcounts from FileMap.
Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
2015-02-23 15:47:54 +00:00
Narayan Kamath
c90df0768a am 6b492e78: Merge "Clean up Javadocs for UEventObserver"
* commit '6b492e78115833f0093d1517483728b574121c07':
  Clean up Javadocs for UEventObserver
2015-02-23 10:54:40 +00:00
Narayan Kamath
6b492e7811 Merge "Clean up Javadocs for UEventObserver" 2015-02-23 10:50:19 +00:00
Valter Strods
7014b26c3e Clean up Javadocs for UEventObserver
This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f
2015-02-23 10:48:32 +00:00
Elliott Hughes
92c4f1756d am d002e027: Merge "Fix \'fuchsia\' typo."
* commit 'd002e02750b51fed3da41a2b4b222824df8d1a10':
  Fix 'fuchsia' typo.
2015-02-21 17:09:46 +00:00
Elliott Hughes
d002e02750 Merge "Fix 'fuchsia' typo." 2015-02-21 17:04:21 +00:00
Elliott Hughes
fd9bc7bb36 Fix 'fuchsia' typo.
Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
2015-02-21 09:03:13 -08:00
Jason Sams
a15ac5fea3 am adb52ef7: Merge "Implement finalizer for RS contexts."
* commit 'adb52ef7034d4d3e0eee58cedae2a343d29771b9':
  Implement finalizer for RS contexts.
2015-02-20 20:00:40 +00:00
Jason Sams
adb52ef703 Merge "Implement finalizer for RS contexts." 2015-02-20 19:51:54 +00:00
Jason Sams
d22a6f09dc Implement finalizer for RS contexts.
Fixes memory leak when apps forget to call .destroy() on the context.

Change-Id: Ida4685768e92cfe3875da38846d17b86cc386cd0
2015-02-19 17:19:52 -08:00
Bill Yi
4fecab570d Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD 2015-02-19 14:31:36 -08:00
Narayan Kamath
644ebc8800 am 0a7936b7: Merge "Fix a couple of issues with system_server forking."
* commit '0a7936b7c54fb7dff0406a40452cb0242f66a067':
  Fix a couple of issues with system_server forking.
2015-02-19 10:23:57 +00:00
Narayan Kamath
0a7936b7c5 Merge "Fix a couple of issues with system_server forking." 2015-02-19 10:17:32 +00:00
Robert Greenwalt
b4a3edace7 am e460f88d: Merge "Support single PDP network for Unite operator of Moldova"
* commit 'e460f88d37ce035718987b9424190956a6bba52f':
  Support single PDP network for Unite operator of Moldova
2015-02-19 00:46:07 +00:00
Robert Greenwalt
e460f88d37 Merge "Support single PDP network for Unite operator of Moldova" 2015-02-19 00:39:22 +00:00
Tim Murray
712572d406 am 41c93ffe: Merge "Add BLAS intrinsic."
* commit '41c93ffee5bd271cabc4c111994c1d30970933b1':
  Add BLAS intrinsic.
2015-02-17 22:02:48 +00:00
Tim Murray
41c93ffee5 Merge "Add BLAS intrinsic." 2015-02-17 21:57:24 +00:00
Tim Murray
25207df658 Add BLAS intrinsic.
Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324
2015-02-17 13:10:25 -08:00
Elliott Hughes
2aa2672dd8 am 627396ac: Merge "Add missing <sys/file.h> include for flock."
* commit '627396ac90dd4f8510e931bffb6705f41878c87a':
  Add missing <sys/file.h> include for flock.
2015-02-17 01:28:34 +00:00
Elliott Hughes
627396ac90 Merge "Add missing <sys/file.h> include for flock." 2015-02-17 01:22:19 +00:00
Craig Mautner
5d8f249104 am 2a005f6f: Merge "Prevent leaking surfaces from exiting windows"
* commit '2a005f6fe91eac2ac2646be17815756637ed610f':
  Prevent leaking surfaces from exiting windows
2015-02-16 23:04:08 +00:00
Craig Mautner
2a005f6fe9 Merge "Prevent leaking surfaces from exiting windows" 2015-02-16 22:59:20 +00:00
Elliott Hughes
b9de25f7db Add missing <sys/file.h> include for flock.
Change-Id: I0c66c03aeb4df614f7880a830b95c40f43f804db
2015-02-16 10:43:19 -08:00
Piotr Jastrzebski
58524b2aa6 am e7e92381: Merge "Register DDM handlers at the beginning of main method."
* commit 'e7e923818096a8a046ad183e932454428218c867':
  Register DDM handlers at the beginning of main method.
2015-02-16 12:52:59 +00:00
Piotr Jastrzebski
e7e9238180 Merge "Register DDM handlers at the beginning of main method." 2015-02-16 12:47:08 +00:00
tiger_huang
713abc2879 Prevent leaking surfaces from exiting windows
AM would set the exiting app to be invisible twice by calling
setAppVisibility(). If the screen is turned off during these calls,
the window surfaces of this exiting app won't be destroyed.

The flow:
 1. Screen is on
 2. App A is finished
 3. AM calls setAppVisibility() token=App A, visible=false
 4. WM sets a dummy animation to App A
 5. WM marks App A's wtoken.inPendingTransaction=true
 6. Screen is turned off
 7. AM calls setAppVisibility() token=App A, visible=false
 8. WM calls setTokenVisibilityLocked() directly (screen is off)
 9. WM sends app visibility to App A's client (ViewRootImpl)
10. WM clears the dummy animation from App A
11. App A's client calls WMS.relayoutWindow() to be not visible
12. WM sets App A's window mExiting=true but not destroy its surface
13. App A's window surface leaks...

Note:
a. The call in 3. is from ActivityStack.finishActivityLocked
b. The call in 7. is from ActivityStack.resumeTopActivityInnerLocked
c. In 10., App A won't get the real animation while screen is off
d. In 12., App A's inPendingTransaction=true; WM takes it's animating
e. mExiting won't be cleared because App A has no animation to
   trigger WindowStateAnimator.finishExit()

After applying this patch, WM would destroy the surface in 12. of the
above flow.

Change-Id: I18b79ba96695ec80d57a85dc15cf92a9e7d3a6ef
2015-02-16 08:27:28 +00:00
Yohei Yukawa
32acf753e8 am 83c804be: Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" automerge: efd9abb
* commit '83c804be9c1f33ff4bafbfd60218751a00c7d2b9':
  Prevent duplicated registration of OnComputeInternalInsetsListener
2015-02-14 15:17:17 +00:00
Yohei Yukawa
83c804be9c Merge "Prevent duplicated registration of OnComputeInternalInsetsListener"
automerge: efd9abb

* commit 'efd9abb7dfd8d5015e73ab52b4f9b7854df4b02c':
  Prevent duplicated registration of OnComputeInternalInsetsListener
2015-02-14 15:11:37 +00:00
Yohei Yukawa
efd9abb7df Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" 2015-02-14 15:08:07 +00:00
Filip Gruszczynski
f1df1970db am 88a9a2a4: Merge "Support for faster brightness response to light changes." into lmp-mr1-modular-dev
* commit '88a9a2a46eb77ea340175f5d272433f4de1b6f93':
  Support for faster brightness response to light changes.
2015-02-14 02:27:19 +00:00
Filip Gruszczynski
88a9a2a46e Merge "Support for faster brightness response to light changes." into lmp-mr1-modular-dev 2015-02-14 02:21:42 +00:00
Narayan Kamath
b6b044ae82 Fix a couple of issues with system_server forking.
- Remove the obsolete --runtime-init arg. its prescence
  was preventing other arguments from being parsed.

- Be stricter about unparsed args - throw if we see arguments
  we don't expect. This was already implemented but broken
  (probably implemented by a crap programmer).

bug: 19378905
Change-Id: Id8b6158db7ef6368dd13ae61f591cdf2b278dfd1
2015-02-13 17:45:06 +00:00
Filip Gruszczynski
d81ecd12ce Support for faster brightness response to light changes.
Bug: 18572096

Change-Id: Ic9448db672b036779d16883f3476249cea45d97a
2015-02-13 09:40:15 -08:00
Piotr Jastrzebski
da74a628f5 Register DDM handlers at the beginning of main method.
Compiler initializes RuntimeInit during compilation and stores an
initialized version of the class in oat file. Same thing happens to
DdmServer which handles DDM packets in JDWP thread started during JVM
creation. This means that after the creation of JVM all
DDM packets are handled by DdmServer.dispatch and since it's already
initialized during compilation it has all framework related handlers
already registered. If a packet arrives before AndroidRuntime.startReg
is called then framework native methods are not yet registered and the
processing of the packet fails with UnsatisfiedLinkError.

To fix this problem the registration of framework related DDM handlers
is moved to the beginning of ZygoteInit.main and RuntimeInit.main. This
means that the handlers won't be registered until main method is called
and that's guaranteed to be after AndroidRuntime.startReg is called. It
also guarantees that DDM packets will be properly handled as soon as
Java code is executed.

Bug: 18081539.
Change-Id: I9c674f53f3f62d58c46886e0b60698182e08f0c3
2015-02-13 13:32:25 +00:00
Narayan Kamath
a511eea83b am aee7f64c: am b4a5c04c: Merge "Remove code that sets user.* system properties."
* commit 'aee7f64c10ffd2135dc98f7a540836ad7a32438b':
  Remove code that sets user.* system properties.
2015-02-13 12:09:31 +00:00
Narayan Kamath
aee7f64c10 am b4a5c04c: Merge "Remove code that sets user.* system properties."
* commit 'b4a5c04c305a04a876728397dec7cc809e26b823':
  Remove code that sets user.* system properties.
2015-02-13 12:04:36 +00:00
Narayan Kamath
b4a5c04c30 Merge "Remove code that sets user.* system properties." 2015-02-13 11:57:39 +00:00