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
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
85eaca25fe
Merge "Rethrow remote's ServiceSpecificException"
2015-12-08 23:15:52 +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
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
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
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
Tao Bao
87212ad6a8
Clean up the uncrypted OTA package on bootup.
...
An OTA package needs to be uncrypted before rebooting into recovery if
it sits on an encrypted /data partition. Once uncrypt gets started, we
cannot re-run it on the package again. Because the file may have been
fully or particially uncrypted and we may end up with a corrupt file
under recovery. Always clean up the package when the device boots into
the normal system to avoid that.
Bug: 24973532
Change-Id: I91682c103d1f2b603626c4bf8d818bced71e3674
2015-10-19 14:49:09 -07:00
Jeff Sharkey
de0b34ea14
am d56756fd: am 535726f6: am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
...
* commit 'd56756fdee9fce3d08bea769710d7173bcbc263a':
Update docs to reflect adoptable behavior.
2015-10-16 16:38:29 +00:00
Jeff Sharkey
535726f637
am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
...
* commit '0c15693e8de6f89fab7ca3d582f0a8605a54df9f':
Update docs to reflect adoptable behavior.
2015-10-16 16:25:38 +00:00
Jeff Sharkey
0c15693e8d
Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev
2015-10-16 16:18:38 +00:00
Gavin Li
06af46922e
StrictMode: fix deserialization of ViolationInfo on large stacks
...
When a large stack trace is encountered, one too many ViolationInfo
objects would be drained, which may cause a system_server crash
when readStringArray() is called on incorrect data.
Change-Id: Icb30d0402638ea5b6d63004b598d2f0bb276d685
2015-10-15 16:02:03 -07:00
Dianne Hackborn
1e46ee937c
am 522222bc: am f96ca344: am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
...
* commit '522222bc9bbfb6d62e101eaa6af2668277143e19':
Docs only change: update build version docs.
2015-10-15 01:16:00 +00:00
Dianne Hackborn
f96ca3441e
am 75765dbe: am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
...
* commit '75765dbe48ed38d7044f458062510a9082750049':
Docs only change: update build version docs.
2015-10-15 01:05:54 +00:00
Dianne Hackborn
75765dbe48
am e34445f1: Merge "Docs only change: update build version docs." into mnc-dev
...
* commit 'e34445f11a6a14dd30ba0e018b82e852ef82ecbc':
Docs only change: update build version docs.
2015-10-15 01:01:12 +00:00
Jeff Sharkey
59d28dc820
Update docs to reflect adoptable behavior.
...
Update storage related docs on Context to be consistent, and to call
out relevant Environment methods. Start calling it "shared" storage,
and only mention external for historical reasons. Mention that there
isn't much benefit to using emulated storage over private data
directories to help guide developers to safer locations.
Point out which paths can change over time, so developers know to
only persist relative paths.
Update Environment docs to reflect how they behave for the new
class of adopted storage devices.
Bug: 24251945
Change-Id: Ie5ab337649b4740dfd7594997bbb19c4969cfd2f
2015-10-14 14:41:23 -07:00
Dianne Hackborn
a7036ce15a
am 05222c34: am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296 : Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
...
* commit '05222c3440d1ba207fe6f87037a8297f33f3318a':
"Fix" issue #24357296 : Debug.getMemoryInfo doesn't include EGL mtrack...
2015-10-13 00:20:42 +00:00
Dianne Hackborn
829920ede0
am 34c120dc: Merge ""Fix" issue #24357296 : Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
...
* commit '34c120dc6142c861cb131c900cdee3c19f81ce51':
"Fix" issue #24357296 : Debug.getMemoryInfo doesn't include EGL mtrack...
2015-10-12 23:00:20 +00:00
Dianne Hackborn
b02ce29144
"Fix" issue #24357296 : Debug.getMemoryInfo doesn't include EGL mtrack...
...
...due to lack of permissions
Still doesn't, but an alternative is now offered.
Change-Id: I7b9da709c96ed7790c70d686c30c7855f3979778
2015-10-12 15:14:16 -07:00
Daniel Erat
f0e8744620
am d3e3d889: am c3f37589: Merge "Update instructions in IPowerManager.aidl."
...
* commit 'd3e3d8896ea0f2eba1424b57ac8a5b5d9287000c':
Update instructions in IPowerManager.aidl.
2015-09-30 21:39:01 +00:00
Daniel Erat
d3e3d8896e
am c3f37589: Merge "Update instructions in IPowerManager.aidl."
...
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c':
Update instructions in IPowerManager.aidl.
2015-09-30 21:30:31 +00:00
Daniel Erat
22f58762e1
Update instructions in IPowerManager.aidl.
...
Clarify IPowerManager.aidl's instructions for keeping the
C++ implementation in sync.
Change-Id: Ic51a3844483031e71fe2cfa1d3e8a065df86d119
2015-09-30 14:55:35 -06:00
Dianne Hackborn
e7a3435c91
Docs only change: update build version docs.
...
Change-Id: I30f55549394693ea04cd390b1ae66347ae212123
2015-09-24 17:32:26 -07:00
Adam Lesinski
4092eeb7f7
am 069594f9: am 4e86aae6: am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
...
* commit '069594f96a3c70b01119f689f2195e0d933c0700':
BatteryStats: Better big-little CPU accounting
2015-09-18 21:02:27 +00:00
Adam Lesinski
4e86aae667
am 68055395: Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
...
* commit '680553957e4ff47343334881c34de6969b2ed977':
BatteryStats: Better big-little CPU accounting
2015-09-18 20:38:02 +00:00
Adam Lesinski
680553957e
Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev
2015-09-18 20:26:07 +00:00
Tim Murray
0816319a29
am 4816ea0e: am a02f9823: am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
...
* commit '4816ea0e120fd4e2892d372f33c8ca21e4b2efb6':
Send power hint on fling gestures.
2015-09-17 02:51:39 +00:00
Tim Murray
a02f98239e
am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev
...
* commit '952d5b334ccdf9cab0f56673861906e59d4e9933':
Send power hint on fling gestures.
2015-09-17 02:33:35 +00:00