Commit Graph

252498 Commits

Author SHA1 Message Date
Andreas Huber
553866e9c3 Merge "Start hw-binder threadpool on HwBinder.getService() call."
am: 5d49f802a4

Change-Id: I155ec0240f1ddce7b9128646378f18bfee153b86
2016-10-05 22:24:07 +00:00
Andreas Huber
5d49f802a4 Merge "Start hw-binder threadpool on HwBinder.getService() call." 2016-10-05 22:18:04 +00:00
Andreas Huber
781c083f32 Start hw-binder threadpool on HwBinder.getService() call.
Bug: 31961648
Test: hidl_test_java
Change-Id: I6caf778ab78a875427a17e1758ab724836c8d34e
2016-10-05 11:10:26 -07:00
Etan Cohen
6619d5b545 Merge "[NAN] Use NAN capability information to validate configurations"
am: 141a2840e1

Change-Id: I247e246a2e74b7940eb9b8f30bc1bdbe14c30574
2016-10-05 05:24:47 +00:00
Etan Cohen
141a2840e1 Merge "[NAN] Use NAN capability information to validate configurations" 2016-10-05 05:20:05 +00:00
Andreas Gampe
3327b49429 Merge "Debug: Initialize local to false"
am: 33d404efb0

Change-Id: Ia6fdb36342a392d777da45f562d0173bdd4bebed
2016-10-05 04:42:56 +00:00
Treehugger Robot
33d404efb0 Merge "Debug: Initialize local to false" 2016-10-05 04:34:57 +00:00
Andreas Gampe
ce71149cc3 Debug: Initialize local to false
Ensure that a later read always sees a well-defined value.

Bug: 31943543
Test: m
Change-Id: I654f7896bf1c07a67911196f8906007955f00b85
2016-10-04 19:35:50 -07:00
Etan Cohen
99997dc1ab [NAN] Use NAN capability information to validate configurations
Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.

(cherry-pick of commit 65eaa6d821)

Bug: 31912101
Test: unit tests
Change-Id: I0328cabf1aafb3f350c5fe38e6d03b0e002c693b
2016-10-04 18:37:19 -07:00
Jordan Liu
2b7118fcbf Merge "Add editable_voicemail_number key to CarrierConfig"
am: 25b64aad01

Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368
2016-10-04 18:17:25 +00:00
Jordan Liu
32e1d7f6b4 Merge "Remove config in frameworks/base"
am: 529f8d7209

Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b
2016-10-04 18:16:30 +00:00
Jordan Liu
25b64aad01 Merge "Add editable_voicemail_number key to CarrierConfig" 2016-10-04 18:07:01 +00:00
Jordan Liu
529f8d7209 Merge "Remove config in frameworks/base" 2016-10-04 18:07:01 +00:00
Wale Ogunwale
bb5f6db56a Merge "Fix window animation flash issue"
am: 1a02a26838

Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2
2016-10-03 23:20:52 +00:00
Wale Ogunwale
1a02a26838 Merge "Fix window animation flash issue" 2016-10-03 23:14:34 +00:00
Colin Cross
6d0b466935 Merge "Fix struct vs. class mismatch in forward definitions"
am: 8f1011d584

Change-Id: I259197408884f11e61f61e5241ee0012de28b54f
2016-10-03 20:23:40 +00:00
Adam Lesinski
f48d0b8f19 Merge "[AssetManager]:Fix thread race caused double free issue."
am: 126e022095

Change-Id: I9928064b4811579bd50d4eeaff98bd4200b8bc7b
2016-10-03 20:18:52 +00:00
Colin Cross
8f1011d584 Merge "Fix struct vs. class mismatch in forward definitions" 2016-10-03 20:16:17 +00:00
Adam Lesinski
126e022095 Merge "[AssetManager]:Fix thread race caused double free issue." 2016-10-03 20:07:37 +00:00
Tobias Thierer
abc432fd09 Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
am: 01614e4e7f

Change-Id: Iaa1c3b284d4ff97799dd1939da34c088b95b7915
2016-10-03 13:50:39 +00:00
Tobias Thierer
01614e4e7f Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" 2016-10-03 13:41:48 +00:00
Qiushi Han
32fed96632 Fix window animation flash issue
The original logic cuts down the mShownPosition, causing 1 pixel offset,
sometimes this will cause flash.

To fix this, Use Math.round() instead.

google issue:
https://code.google.com/p/android/issues/detail?id=224185

Change-Id: I8a2fe55a2df6eaa9eda4ba78966a74ea492ab8ea
2016-10-01 17:32:28 +08:00
Colin Cross
08f5f1f03a Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: Ib7227295e7b94c79cdc52e19c71be4066a11cedc
2016-09-30 21:07:26 -07:00
Etan Cohen
12b4883032 Merge changes from topic 'cherry-pick'
am: e3d5fa1094

Change-Id: I73321476de15f230ba19f04a5561238f0567eb9a
2016-09-30 20:56:58 +00:00
Etan Cohen
083f313756 [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
am: 720d175757

Change-Id: I5916af955c4452afe07a7fa35e8229aa53f56638
2016-09-30 20:56:54 +00:00
Etan Cohen
c3066c1d68 [NAN] Update API javadoc to clarify NAN status change broadcast scope
am: 4c22e8bede

Change-Id: I42709b7829a32c0767c20f6273451c478492f97b
2016-09-30 20:55:36 +00:00
Etan Cohen
e3d5fa1094 Merge changes from topic 'cherry-pick'
* changes:
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
  [NAN] Update API javadoc to clarify NAN status change broadcast scope
2016-09-30 20:45:02 +00:00
Tao Bao
86df8ecdf3 Merge "Handle the race condition when calling uncrypt services."
am: 42d25b5992

Change-Id: Ia5d37580f8bf1489fcc5ccf9c74cf64b94858dc6
2016-09-30 20:40:03 +00:00
Tao Bao
42d25b5992 Merge "Handle the race condition when calling uncrypt services." 2016-09-30 20:30:43 +00:00
Jordan Liu
4fe680f920 Merge "Add config_carrier_wfc_ims_available to config.xml"
am: d1d682e446

Change-Id: I78e496cd8d01f283cfb9a737b155b0dab4984b67
2016-09-30 18:50:24 +00:00
Jordan Liu
d1d682e446 Merge "Add config_carrier_wfc_ims_available to config.xml" 2016-09-30 18:42:45 +00:00
Etan Cohen
720d175757 [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
Broadcast can be registered protected (as in this CL) in which case they
are restricted to system apps. Broadcasts sent by the System Service must
be protected (so no one else can fake them).

The WIFI_NAN_STATE_CHANGED is sent by the System Service and no other apps
should be able to send them (e.g. to deny access to NAN to other apps).

(cherry-pick of commit b8ce87175e)

Bug: 31811154
Test: build & run - enable/disable Wi-Fi to trigger bug
Change-Id: I77ea18291d68c38a63d64a75affc6b7ea114e549
2016-09-30 11:32:18 -07:00
Etan Cohen
4c22e8bede [NAN] Update API javadoc to clarify NAN status change broadcast scope
(cherry-pick of commit 1fceaf9d63)

Bug: 31675932
Test: make -j 32 update-api (to generate doc)
Change-Id: I7263a15902c423c1c71c2c457c82e8caef5abceb
2016-09-30 11:31:47 -07:00
Randy Pan
63224d9ea3 Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate"
am: 673b47f234

Change-Id: I79fda4350062d27c4399df80d7edca4df79152f2
2016-09-30 17:36:57 +00:00
Randy Pan
673b47f234 Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" 2016-09-30 17:30:15 +00:00
Jordan Liu
786e4f7d23 Add config_carrier_wfc_ims_available to config.xml
The migration of this config to CarrierConfig breaks the build on
certain devices, so we should leave the original config in.

Bug: 29873049
Change-Id: I2f526c37198359de7adec4cfd4c391ccaa8ab0be
2016-09-30 09:43:49 -07:00
Przemyslaw Szczepaniak
8297d74de5 Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO"
am: c60c70dcf9

Change-Id: I33ffda7e4e0ef230a4de28560262339cea102ec4
2016-09-30 08:50:41 +00:00
Przemyslaw Szczepaniak
c60c70dcf9 Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO" 2016-09-30 08:43:17 +00:00
Christopher Ferris
b66b1d26b3 Merge "Fix code for new malloc debug enable."
am: 1efb3e93e6

Change-Id: Ifbab90962878670fdacfc7b308afa46dce898f6d
2016-09-30 01:09:43 +00:00
Treehugger Robot
1efb3e93e6 Merge "Fix code for new malloc debug enable." 2016-09-30 01:01:03 +00:00
Jordan Liu
3643dd1a7a Add editable_voicemail_number key to CarrierConfig
Add KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]

This value exists to fix http://b/14093735. If a SIM card has no
voicemail number available, since the default number is empty, we allow
users to edit the voicemail number when this flag is true.
Merged-In: I68a494e2176306e4e9181a8ccb0aa818f3e08154

Bug: 29873049
Change-Id: I68a494e2176306e4e9181a8ccb0aa818f3e08154
2016-09-29 17:21:15 -07:00
Jordan Liu
53704b3138 Merge "fix branch break by adding carrierconfig key" into stage-aosp-master 2016-09-29 23:08:14 +00:00
Tao Bao
794c8b0b3f Handle the race condition when calling uncrypt services.
We call uncrypt services to setup / clear bootloader control block (BCB)
for scheduling tasks under recovery (applying OTAs, performing FDR).
However, we cannot start multiple requests simultaneously. Because they
all use the same socket (/dev/socket/uncrypt) for communication and init
deletes the socket on service exits.

This CL fixes the issue by a) adding synchronized blocks for the service
requests; b) checking the availability of the socket before initiating a
new one.

Note that adding synchronized blocks to RecoverySystem doesn't help,
because the calls could be made from different processes (e.g. priv-app,
system_server).

Bug: 31526152
Test: FDR works while a priv-app keeps calling clear BCB.

Change-Id: I95308989e849a9c98a9503ac509f2bc51ed3de19
2016-09-29 16:07:19 -07:00
Jordan Liu
edc05eeccf Remove config in frameworks/base
Remove old config within frameworks/base. With move to CarrierConfig no
need for the old editable_voicemailnumber resources.
Merged-In: Ib70ac5f488b45f32b705e471478e13802ebe9dd7

Bug: 29873049
Change-Id: Ib70ac5f488b45f32b705e471478e13802ebe9dd7
2016-09-29 16:05:30 -07:00
Jordan Liu
86cdc8f330 Merge "Remove migrated config_carrier_wfc_ims_available"
am: 5d71e2d671

Change-Id: Iaf50b529303f8449b776c33942175953ff0fc6e1
2016-09-29 22:57:28 +00:00
Jordan Liu
5d71e2d671 Merge "Remove migrated config_carrier_wfc_ims_available" 2016-09-29 22:50:15 +00:00
Jordan Liu
e787323e03 fix branch break by adding carrierconfig key
Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager

Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
2016-09-29 15:25:46 -07:00
Christopher Ferris
e336eea49a Fix code for new malloc debug enable.
When using am dumpheap -n, modify the code to print the new
way malloc debug works instead of the old way.

Also, the old code had a hard-coded number of backtrace frames. The
new code allows this to be variable so the code needed to be modified
for this too.

Test: am dumpheap -n <PID> <FILE> dumps properly.

Change-Id: Id79e4acbe04313090eb2b973f023e5b27591bb7d
2016-09-29 15:18:58 -07:00
Randy Pan
634d97add8 Remove the obsoleted ScanResult.isAutoJoinCandidate
Bug: 31565767
Test: unit tests
Change-Id: I3e1ee0e919c800c4d5eeaf94fdc68123b6de542e
2016-09-29 13:12:55 -07:00
liulvping
5b65b132b3 Merge "Clear pending activity launches when force stop package"
am: 00b678dd2d

Change-Id: Icd953ce6aff52a657e960d84799db7e4ca079688
2016-09-29 19:45:25 +00:00