Commit Graph

2710 Commits

Author SHA1 Message Date
Tamas Berghammer
21bdaf14a2 [DO NOT MERGE] Add flag to "am start" to enable native debugging
[Backported form internal CL854980]

Specifying the new flag will enable several features in the runtime
required by the native debugger to debug Java and C++ code at the same
time.

The enabled features:
* Force JIT (never use the interpreter)
* Debug info generation
* Disable some optimizations

Change-Id: Iaf5ab649715a0c274bd1b0fc64e483705da53cd0
2016-03-14 11:48:40 +00:00
Colin Cross
bd45c08468 Merge "Add dumpsys meminfo --unreachable"
am: 916ea08119

* commit '916ea081196a47ef3257910a71fa7a7ac609ddb1':
  Add dumpsys meminfo --unreachable
2016-02-19 06:14:50 +00:00
Colin Cross
84b1e3554b Add dumpsys meminfo --unreachable
dumpsys meminfo --unreachable will search the native heap for
allocations that are unreachable.

Change-Id: I40ab1c261cb222ca71d04ab8408f355bcb18ed94
2016-02-08 00:06:34 -08:00
Neil Fuller
69c2907c63 Merge "Fix @code escapes"
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
2016-01-15 16:31:40 +00:00
Neil Fuller
9498e8a8d2 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
(cherry-picked from commit 71fbb81b14)

Change-Id: I19dafddc6501be6fee362c396ac5bbdc934ae39d
2016-01-15 16:14:57 +00:00
Samuel Tan
3caecaec60 Merge "Remove PersistableBundle.aidl from Java framework"
am: 2e37bfd2d2

* commit '2e37bfd2d2f629ca50ecf0e6674484cd30560d26':
  Remove PersistableBundle.aidl from Java framework
2016-01-12 23:17:50 +00:00
Samuel Tan
239951a91e Remove PersistableBundle.aidl from Java framework
Remove PersistableBundle.aidl from the Java framework, since it
has been moved to the native libbinder.

BUG: 26292234
Change-Id: Ia3dc49a3ad92f4c579e6dff0606c1db8fb3be76b
TEST: aosp_arm builds successfully.
2016-01-12 14:43:32 -08:00
Alex Klyubin
4a06b7ea7e Merge "[1/3] Remove unnecessary throws statement in ServiceManager"
am: d1240219aa

* commit 'd1240219aadedc867b50158c67d1737a27fa7c6f':
  [1/3] Remove unnecessary throws statement in ServiceManager
2016-01-07 19:18:01 +00:00
Umair Khan
9ccebbfc37 [1/3] Remove unnecessary throws statement in ServiceManager
The exception is already caught by the try-catch block.

Change-Id: I0c10fe51d12a10cbc02a25c719d03a4ba6497767
Signed-off-by: Umair Khan <omerjerk@gmail.com>
2016-01-07 15:08:27 +05:30
Narayan Kamath
f59c02a65e Merge changes from topic \'aosp-merge-24-12\'
am: e0e81bf407

* commit 'e0e81bf407508ec096c752948f8794af5fd480ca':
  Special case system_server to not create the JIT code cache.
  Don't use IntegralToString
  Track libcore commit 85d69e16fe1e59e50c1ad228e754abf325088362.
  Track API changes to java.lang.ref.Reference.
  Remove merge markers from preloaded-classes
  Move StrictJarFile from libcore to framework
  Switch RecoverySystem impl to use sun.security.pkcs
  API update for OpenJdk based libcore
  Use libcore/known_oj_tags for the javadoc stage.
  Stop preloading fortress classes
  Use HexDump instead of java.lang.IntegralToString
  Add core-oj to the list of core library jars.
2015-12-24 04:07:42 -08:00
Przemyslaw Szczepaniak
62671eaa46 Switch RecoverySystem impl to use sun.security.pkcs
Due to org.apache.harmony.security package removal,
RecoverySystem#verifyPackage was rewritten to use
sun.security.pkcs package for verifining package
signature.

(cherry picked from commit 9ad08ec5be)

Change-Id: I04848ad8f045f87224f9d30ff8dd745aac6d08fd
2015-12-22 13:10:55 +00:00
Samuel Tan
4981ae9083 Merge "Add comments to keep Java and native binder PersistableBundle in sync"
am: 6de926a7d6

* commit '6de926a7d6439745cd0f01a69a5dd75b006b923d':
  Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 00:54:03 +00:00
Samuel Tan
d3decff052 Merge "Fix PersistableBundle handling in Parcel.writeValue"
am: d12959193c

* commit 'd12959193c60254b6b03b2a60a9c6e598e9da2e5':
  Fix PersistableBundle handling in Parcel.writeValue
2015-12-17 00:50:53 +00:00
Samuel Tan
0bc7647f63 Merge "Specify path for native PersistableBundle implementation"
am: 477fa220b1

* commit '477fa220b1766a3822171fa514983198e09daabb':
  Specify path for native PersistableBundle implementation
2015-12-17 00:49:19 +00:00
Samuel Tan
6de926a7d6 Merge "Add comments to keep Java and native binder PersistableBundle in sync" 2015-12-17 00:35:58 +00:00
Samuel Tan
d12959193c Merge "Fix PersistableBundle handling in Parcel.writeValue" 2015-12-17 00:35:43 +00:00
Samuel Tan
477fa220b1 Merge "Specify path for native PersistableBundle implementation" 2015-12-17 00:35:35 +00:00
Samuel Tan
3cefe6a991 Add comments to keep Java and native binder PersistableBundle in sync
Add comments stating that certain methods of the Java binder framework
should be kept in sync with the corresponding methods mirrored in the
native PersistableBundle implementation.

BUG: 25815410
Change-Id: I475b2e9a527291eea58c8178cd733c444dfcfed5
2015-12-15 15:22:52 -08:00
Samuel Tan
ceafe5ed8a Fix PersistableBundle handling in Parcel.writeValue
Previously, in Parcel.writeValue, PersistableBundle objects
would be handled as Parcelable types, since we check for
the Parcelable type before the PersistableBundle type (and
PersistableBundle implements the Parcelable interface).

Fix this by moving the PersistableBundle type "if" condition
above the Parcealble type "if" condition. Also, add a comment
that explicitly states this nuance, in order to prevent future
regressions.

BUG: 25815410
Change-Id: Ia86aa5fc39423422342df0609a0d37e7f38d7ddd
2015-12-15 15:22:52 -08:00
Samuel Tan
0bae77b8f0 Specify path for native PersistableBundle implementation
Specify path for native PersistableBundle implementation in
PersistableBundle.aidl.

BUG: 25815410
Change-Id: If29b06604b938805d5250fe80e54ef9ea1e88365
2015-12-15 15:22:41 -08:00
Greg Hackmann
0f13ddfdff Merge "Trace SQLite operations"
am: 6fe06606c4

* commit '6fe06606c4df39487d240cc1fa4ac6d944b33137':
  Trace SQLite operations
2015-12-14 13:37:30 -08:00
Greg Hackmann
e12350faf7 Trace SQLite operations
Inefficient SQLite use can have non-obvious effects on performance.  For
example, insert and update operations can trigger a surprising number of
fsync() calls, especially if they're not grouped together into
transactions.

Add tracepoints around SQLite operations, to make it easier to pinpoint
their effects on the rest of the system.

Change-Id: I30cc3d02eca264e46dcc09ca7512a32519543834
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-12-14 12:32:26 -08:00
Christopher Wiley
b7b3415899 Merge "Rethrow remote\'s ServiceSpecificException"
am: 85eaca25fe

* commit '85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
  Rethrow remote's ServiceSpecificException
2015-12-08 23:26:40 +00:00
Christopher Wiley
85eaca25fe Merge "Rethrow remote's ServiceSpecificException" 2015-12-08 23:15:52 +00:00
Samuel Tan
e769f25fa4 Merge "Add support for reading and writing double array values" am: 61c0b7cd4d
am: ff8ef28e73

* commit 'ff8ef28e73c0959a4993fea975d0bdefbc27a20b':
  Add support for reading and writing double array values
2015-12-07 23:38:14 +00:00
Samuel Tan
ff8ef28e73 Merge "Add support for reading and writing double array values"
am: 61c0b7cd4d

* commit '61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
  Add support for reading and writing double array values
2015-12-07 23:15:15 +00:00
Samuel Tan
61c0b7cd4d Merge "Add support for reading and writing double array values" 2015-12-07 18:56:01 +00:00
Christopher Wiley
80fd1208b9 Rethrow remote's ServiceSpecificException
Certain system services would like to throw exceptions
with specific error codes, so that the framework can catch
these specific conditions and express them appropriately.

Bug: 25800533
Change-Id: I94b3d30fa131f5e14bba893c971615840085459f
2015-12-04 16:06:08 -08:00
Jeff Sharkey
630f658108 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks
2015-12-03 17:13:43 +00:00
Jeff Sharkey
af588a31bc Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
2015-12-03 17:06:24 +00:00
Jeff Sharkey
29e0b6e789 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 2015-12-03 16:59:13 +00:00
Samuel Tan
a8036660ea Add support for reading and writing double array values
Add support for reading and writing double arrays in
Parcel.readValue() and Parcel.writeValue.

Also, remove some trailing whitespaces in Parcel.java.

BUG: 25848659
Change-Id: Ib5430f492df4195051b83d9bf2b5163ec684bbff
2015-11-30 13:14:01 -08:00
Nicolas Geoffray
5462e46d23 Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0
am: 5485d81578

* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
  Remove DEBUG_JIT from Zygote flags.
2015-11-18 17:21:41 +00:00
Nicolas Geoffray
5485d81578 Merge "Remove DEBUG_JIT from Zygote flags."
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.
2015-11-18 10:54:19 +00:00
Nicolas Geoffray
245ec92b65 Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.

(cherry picked from commit 9abbf45c8d)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
2015-11-18 10:07:53 +00:00
Rom Lemarchand
7d1428d7f3 resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp.
Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f
2015-11-17 15:38:50 -08:00
Badhri Jagan Sridharan
4f72447fbf BatteryService: Add Max charging voltage
Bug: 25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit f92fcfe36a)
2015-11-16 10:43:52 -08:00
Casey Dahlin
7a38be6112 Merge "Add hidden support for arrays of raw file descriptors"
am: 376d5f350c

* commit '376d5f350c6618d915338a9927b5d0f5fb61eba8':
  Add hidden support for arrays of raw file descriptors
2015-11-12 23:57:58 +00:00
Casey Dahlin
2f974b252f Add hidden support for arrays of raw file descriptors
Change-Id: I4013e0700369764a26485d8620ebf16d8bea1951
Test: Built and ran Android in an emulator
Bug: 25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
2015-11-12 14:13:15 -08:00
Adrian Roos
989b719e64 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
  Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 18:25:02 +00:00
Adrian Roos
a53bbb652b Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
  Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:29:13 +00:00
Adrian Roos
0450565d9a Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit e2adb2cf0f.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:49:38 -07:00
Ian Pedowitz
d3511518f9 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
  Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:46:06 +00:00
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:32:37 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel"
This reverts commit ab3f972403.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22 22:09:04 +00:00
Adrian Roos
b531762c89 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel
2015-10-22 01:02:27 +00:00
Adrian Roos
655c12edb0 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
  Track ashmem memory usage in Parcel
2015-10-22 00:49:52 +00:00
Adrian Roos
ab3f972403 Track ashmem memory usage in Parcel
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5)
2015-10-22 00:31:47 +00:00
Tao Bao
db33bfc2a9 Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f
am: ac140e7f76

* commit 'ac140e7f7690979378897546e7934381f62922ab':
  Clean up the uncrypted OTA package on bootup.
2015-10-21 18:05:18 +00:00
Tao Bao
ac140e7f76 Merge "Clean up the uncrypted OTA package on bootup."
am: 5d562d4d2f

* commit '5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
  Clean up the uncrypted OTA package on bootup.
2015-10-21 17:51:53 +00:00