Marie Janssen
7fd7bc57ee
Merge "Bluetooth: fix issues re-enabling after crash" am: e2c22e38d5
...
am: ff0d3e1c8d -s ours
Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472
2016-12-18 00:20:18 +00:00
Joe Fernandez
bd7fab30dc
docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38
...
am: 536dc4ecc4
Change-Id: I00433f2c53c4ae494082ce21a4edb63717347906
2016-12-17 04:59:05 +00:00
Joe Fernandez
536dc4ecc4
docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a
...
am: e161f75d38
Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
2016-12-17 04:48:04 +00:00
Joe Fernandez
e161f75d38
docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e
...
am: 045ae0458a
Change-Id: I2257467a9b263897d2af594720de61d29a982709
2016-12-17 04:37:05 +00:00
Joe Fernandez
045ae0458a
docs: Add deprecation message for the developer.android.com docs
...
am: b9bd6cca9e
Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
2016-12-17 04:26:02 +00:00
Svet Ganov
d10857f210
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3
...
am: 0dca3a2fba
Change-Id: Ifd62443464dfa77b022552a1fada1288cfd42afe
2016-12-17 03:54:05 +00:00
Svet Ganov
0dca3a2fba
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753
...
am: 5034efbaf3
Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
2016-12-17 03:42:58 +00:00
Svet Ganov
5034efbaf3
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours
...
am: c91845f753
Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
2016-12-17 03:32:01 +00:00
Svet Ganov
c91845f753
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
...
am: c3db570a00 -s ours
Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
2016-12-17 03:21:28 +00:00
Mark Lu
760d127583
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739
...
am: 1474527789
Change-Id: I9ec8192fcf3bf3fa180e471648894d6b2e51abc9
2016-12-17 02:29:43 +00:00
Mark Lu
c9328c18a4
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
...
am: 58d24b22ed
Change-Id: I0420f0eba2d7d99b0c19aad72082b53dca3ac00e
2016-12-17 02:28:31 +00:00
Joe Fernandez
b9bd6cca9e
docs: Add deprecation message for the developer.android.com docs
...
Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67
2016-12-16 18:20:56 -08:00
Mark Lu
1474527789
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
...
am: 88e64bb739
Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f
2016-12-17 02:19:55 +00:00
Mark Lu
58d24b22ed
docs: update description for BitmapFactory.Options#inBitmap
...
am: a8f4286272
Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430
2016-12-17 02:19:51 +00:00
Mark Lu
88e64bb739
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
2016-12-17 02:04:28 +00:00
Philip P. Moltmann
fbdcaa7278
Merge "Increment vers of PrintRecommendationService" am: 08bff42ef4
...
am: a791fee2bc
Change-Id: I2a39d30b3627872d996786b276430982eba92b60
2016-12-17 00:03:28 +00:00
Vitalii Tomkiv
82160ca083
Merge changes Ic85892b4,I627e47c6 am: d995c94426
...
am: d49df21f80
Change-Id: Ia916b1a329769a22bf3831dec03c753018c2e24c
2016-12-17 00:01:23 +00:00
Vitalii Tomkiv
9dd81c9170
Make sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6
...
am: 7f797cc54c
Change-Id: Ic5f00cb15b996317fdf6ac8aa4053c79426f1e23
2016-12-17 00:00:34 +00:00
Todd Kjos
391d3e1aad
Revert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a
...
am: 501875bbe8 -s ours
Change-Id: Iaa49788db807d3d1965e6e85e10f6659e760146e
2016-12-16 23:59:45 +00:00
Mark Lu
a8f4286272
docs: update description for BitmapFactory.Options#inBitmap
...
bug: 18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188
2016-12-16 15:43:27 -08:00
Marie Janssen
ff0d3e1c8d
Merge "Bluetooth: fix issues re-enabling after crash"
...
am: e2c22e38d5
Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded
2016-12-16 23:07:42 +00:00
Marie Janssen
e2c22e38d5
Merge "Bluetooth: fix issues re-enabling after crash"
2016-12-16 22:56:59 +00:00
Philip P. Moltmann
a791fee2bc
Merge "Increment vers of PrintRecommendationService"
...
am: 08bff42ef4
Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3
2016-12-16 22:51:11 +00:00
Marie Janssen
ed50bbcffd
Bluetooth: fix issues re-enabling after crash
...
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance. In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.
Luckily in this case the persisted system state is also ON. Use the
persisted state as information about whether we should be fully enabled.
Test: basic sanity check, forced crash of BT
Bug: 33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
2016-12-16 22:50:13 +00:00
Philip P. Moltmann
08bff42ef4
Merge "Increment vers of PrintRecommendationService"
2016-12-16 22:36:11 +00:00
Vitalii Tomkiv
d49df21f80
Merge changes Ic85892b4,I627e47c6
...
am: d995c94426
Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5
2016-12-16 22:35:54 +00:00
Vitalii Tomkiv
7f797cc54c
Make sure Zygote is running at process priority 0 after VM has started.
...
am: 1e52ce48a6
Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52
2016-12-16 22:35:49 +00:00
Todd Kjos
501875bbe8
Revert "Add boost to increase the load on newly-forked zygote processes."
...
am: 8175f0955a
Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00
2016-12-16 22:35:08 +00:00
Treehugger Robot
d995c94426
Merge changes Ic85892b4,I627e47c6
...
* changes:
Make sure Zygote is running at process priority 0 after VM has started.
Revert "Add boost to increase the load on newly-forked zygote processes."
2016-12-16 22:20:25 +00:00
Torne (Richard Coles)
e19d6d414d
Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834
...
am: bc801c663e
Change-Id: If1edf0bf30e8359912235c788a49131b528efb30
2016-12-16 21:45:40 +00:00
Torne (Richard Coles)
bc801c663e
Merge "Add the webview zygote socket to the zygote whitelist."
...
am: f8882ae834
Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
2016-12-16 21:38:17 +00:00
Treehugger Robot
f8882ae834
Merge "Add the webview zygote socket to the zygote whitelist."
2016-12-16 21:25:35 +00:00
TreeHugger Robot
85a19e86d0
Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
...
* changes:
Revert "Add boost to increase the load on newly-forked zygote processes."
Make sure Zygote is running at process priority 0 after VM has started.
2016-12-16 21:03:00 +00:00
Philip P. Moltmann
c56da03d06
Increment vers of PrintRecommendationService
...
as the Samsung PlugIn was updated.
Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55
2016-12-16 12:52:53 -08:00
Joe LaPenna
de89c74f51
Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac
...
am: 4c3b2f5f99
Change-Id: I7ee10f1336c48969fa64cd6f5a45087027a2e8c3
2016-12-16 20:44:05 +00:00
Joe LaPenna
4c3b2f5f99
Merge "Set com.android.networkrecommendation as the default network recommendation service."
...
am: 0b4df21aac
Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44
2016-12-16 20:35:53 +00:00
Treehugger Robot
0b4df21aac
Merge "Set com.android.networkrecommendation as the default network recommendation service."
2016-12-16 20:23:48 +00:00
Andreas Gampe
2260a6ef9a
Merge changes Ia4bec085,I59095f2a am: 733d007279
...
am: 3d17e17b0a
Change-Id: I835f1efcf985c73db9ddb5ffe15d80842afdf6e2
2016-12-16 19:47:42 +00:00
Tamas Berghammer
ed8757a761
Enable logwrapper functionality on user builds am: 0ca16fa584
...
am: db05d4b4ed
Change-Id: Ic6c3395f9965657a7f9abe580867eeb81b59ed88
2016-12-16 19:46:55 +00:00
Tamas Berghammer
d71bb300e6
Zygote: Add invoke-with to zygote protocol am: b8f7c351b9
...
am: 45c2fffc52
Change-Id: I90999d84c9694bfeebea8d2c2d95d1d545bac7e8
2016-12-16 19:46:03 +00:00
Andreas Gampe
3d17e17b0a
Merge changes Ia4bec085,I59095f2a
...
am: 733d007279
Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c
2016-12-16 19:38:43 +00:00
Tamas Berghammer
db05d4b4ed
Enable logwrapper functionality on user builds
...
am: 0ca16fa584
Change-Id: Ic18991f9a59f05356fcbcc65acc79be43fc68542
2016-12-16 19:38:38 +00:00
Tamas Berghammer
45c2fffc52
Zygote: Add invoke-with to zygote protocol
...
am: b8f7c351b9
Change-Id: I79db6f759b02ef612364fc857102615d51900cd9
2016-12-16 19:37:57 +00:00
Todd Kjos
80fb0b0a44
Revert "Add boost to increase the load on newly-forked zygote processes."
...
This reverts commit 6d43a861d01ef48f37c69f96346a13d23164a585.
(cherry picked from commit 0f2ded62ae3d88ddb732df182c3bfee3e2729018)
Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
2016-12-16 11:31:30 -08:00
Andreas Gampe
733d007279
Merge changes Ia4bec085,I59095f2a
...
* changes:
Enable logwrapper functionality on user builds
Zygote: Add invoke-with to zygote protocol
2016-12-16 19:24:13 +00:00
Vitalii Tomkiv
5cbce85fd3
Make sure Zygote is running at process priority 0 after VM has started.
...
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.
(cherry picked from commit 5d551a5ac3d13706f62a86842ff6851e1d25213b)
Bug: 28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
2016-12-16 11:19:33 -08:00
Torne (Richard Coles)
898fd69451
Add the webview zygote socket to the zygote whitelist.
...
Allow the webview zygote socket to be open at time of fork, so that
webview renderers can be forked successfully.
(cherry picked from commit a7fcb2bc2a65da3743914727adb0df89a4eb0b66)
Test: WebView functions correctly with multiprocess dev setting enabled
Bug: 21643067
Change-Id: I312846433a43a8e4548cb2f98b96b56acf9f5333
2016-12-16 10:53:35 -08:00
Andreas Gampe
77274269ba
Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10
...
am: 109a82d7e3
Change-Id: I362df209d24a9e2602da1b8cf72e4ea63b5e7f60
2016-12-16 18:53:01 +00:00
Andreas Gampe
109a82d7e3
Merge "NativeLibraryHelper: Minor fixes"
...
am: c1536f0d10
Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797
2016-12-16 18:44:54 +00:00
Joe LaPenna
56346808a1
Set com.android.networkrecommendation as the default network recommendation service.
...
BUG: 33224286
Test: Build image and verified the config value was set.
Change-Id: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Merged-In: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
2016-12-16 10:42:23 -08:00