Commit Graph

252341 Commits

Author SHA1 Message Date
Treehugger Robot
7c4efe421c Merge "Debug: Add test for bug 31943543" 2016-10-07 00:37:50 +00:00
Treehugger Robot
8d08d0fa83 Merge "Correctly pass number of input allocations for BLAS" 2016-10-06 21:04:56 +00:00
Jakub Pawlowski
44c013d739 Merge "Fix connecting to profiles when bonding from local device (1/3)" 2016-10-06 20:54:08 +00:00
Andreas Gampe
636451443f Debug: Add test for bug 31943543
Bug: 31943543
Test: adb shell setprop debug.checkjni 1 && runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/os/DebugTest.java
Change-Id: I895f3f9927ed3572dc4e77b49d12cadd53ce5d6a
2016-10-06 13:49:52 -07:00
Miao Wang
b742fcc808 Correctly pass number of input allocations for BLAS
Bug: 31992305

Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
2016-10-06 10:45:42 -07:00
Treehugger Robot
05d950ee3b Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" 2016-10-06 17:35:33 +00:00
Treehugger Robot
0169a3b094 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" 2016-10-06 17:21:44 +00:00
Neil Fuller
8873c3821d Merge "Remove .mk lines that are just setting the default" 2016-10-06 08:31:34 +00:00
Etan Cohen
f12c6e4f5e Merge "[NAN] Expose NAN characteristics as an API" 2016-10-06 04:45:29 +00:00
Etan Cohen
e64c62fd02 [NAN] Expose NAN characteristics as an API
Expose NAN characteristics as an API.

(cherry-pick of commit 3a9de10963)

Bug: 31912101
Test: build and validate API updates
Change-Id: If02942d738aab8fa2f2f47489c6840af1bc38280
2016-10-05 20:00:53 -07:00
Etan Cohen
ee1e81ec5d Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" 2016-10-06 02:06:36 +00:00
Etan Cohen
2a4c81b7a7 [NAN] Add COARSE_LOCATION permission check to NAN discovery
NAN discovery can expose location based on service signatures.

(cherry-pick of commit e1d8a5a6fc)

Bug: 31907534
Test: unit test + integrated (sl4a) testing
Change-Id: Iec0fae507dfdae65fe08ab6e2ddb89334c15def5
2016-10-05 15:23:21 -07: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
Neil Fuller
b04b5f697d Remove .mk lines that are just setting the default
1.8 is now the default unless targeting an old SDK.

Bug: 31944681
Test: make checkbuild
Change-Id: Ic8a50cfd332da8b84eb87207a3c2d2c9a9a58e99
2016-10-05 13:38:36 +01:00
Etan Cohen
141a2840e1 Merge "[NAN] Use NAN capability information to validate configurations" 2016-10-05 05:20:05 +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
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
Jakub Pawlowski
0278ab957a Fix connecting to profiles when bonding from local device (1/3)
When bond is created from Bluetooth Settings, profiles gets properly
auto connected when services are discovered. If pairing is done from any
other app, i.e. NFC app, the bond is not being recognized as initiated
from local device, and profiles are not connected.

This patch makes sure that if bonding is initiated, no matter from which
app, it will cause proper profiles to connect.

Bug: 30211618
Change-Id: I71131f33eb5b9db2f5b4a8737b191d541bf1fd3d
2016-10-04 17:29:37 +00:00
Peter Qiu
1e9dd72b64 wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates
Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443
2016-10-04 10:18:50 -07:00
Peter Qiu
49f2684f31 wifi: add ParcelUtil for parcelizing non-parcelable objects
This CL adds the support for X509Certificate and PrivateKey objects.

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: I1416a2aeeb0dfdd4a562d1a3b578addf55deb4ab
2016-10-04 10:18:44 -07:00
Wale Ogunwale
1a02a26838 Merge "Fix window animation flash issue" 2016-10-03 23:14:34 +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
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
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
42d25b5992 Merge "Handle the race condition when calling uncrypt services." 2016-09-30 20:30:43 +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
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
c60c70dcf9 Merge "Add new StrictMode thread policy - DETECT_UNBUFFERED_IO" 2016-09-30 08:43:17 +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
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
5d71e2d671 Merge "Remove migrated config_carrier_wfc_ims_available" 2016-09-29 22:50:15 +00: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
Treehugger Robot
00b678dd2d Merge "Clear pending activity launches when force stop package" 2016-09-29 19:17:36 +00:00
Jordan Liu
14f4fd7d0b Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" 2016-09-29 17:15:05 +00:00
Jordan Liu
8abf78dc58 Merge "Remove configs in frameworks/base" 2016-09-29 17:15:05 +00:00
liulvping
b55e42df97 Clear pending activity launches when force stop package
https://code.google.com/p/android/issues/detail?id=223731

It is possible that an activity in pending launches be resumed while
it's package was stopped by some other reason, like uninstall pkg.

Merged-In: I130ded89cee162aa59ac2bf330f026e49e16ef69
Change-Id: I130ded89cee162aa59ac2bf330f026e49e16ef69
Signed-off-by: liulvping <liulvping@xiaomi.com>
2016-09-29 16:42:16 +00:00
Shubham Ajmera
c95b2c85f3 Add new StrictMode thread policy - DETECT_UNBUFFERED_IO
This will enable the developers to check if they could replace an unbuffered
I/O operation with a corresponding buffered I/O operation.

The policy can be set as follow:
     StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
        .detectUnbufferedIO().build());

Test: vogar BlockGuardTest
Bug: 3018772
Change-Id: Ib804a8e9980ae40abfd216f8b87c250fd413bd5c
(cherry picked from commit 9b7184a8fd)w
2016-09-29 16:36:12 +01:00