Commit Graph

62652 Commits

Author SHA1 Message Date
Ruchi Kandoi
bbc00c877f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f
am: c1db6c05d0

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d
2017-01-06 19:10:22 +00:00
Ruchi Kandoi
c1db6c05d0 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b
am: 388980d88f

Change-Id: I8d5498492cae8ffe9048422720427855eaad5ca8
2017-01-06 19:03:07 +00:00
Ruchi Kandoi
388980d88f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings."
am: cc4203221b

Change-Id: I4add3ce1cf3170aff887865302964b4425094692
2017-01-06 18:58:17 +00:00
Ruchi Kandoi
104e0b4399 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings.
Bug: 32881476
Test: Manual; backup, change settings, restore

Change-Id: Ibc31b23f632c50a2c7120734fc96e7d855df062e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-06 18:48:51 +00:00
Ajay Panicker
af525ff403 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53 am: d76576b6d1
am: e0211af867

Change-Id: I5ac57ca6439359fc65622254090a3ea6cc2aec18
2017-01-06 01:50:03 +00:00
Ajay Panicker
e0211af867 Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd53
am: d76576b6d1

Change-Id: I0b59b10a095bf23d4f26856690bf6be2a5304cbc
2017-01-06 01:46:10 +00:00
Ajay Panicker
d76576b6d1 Merge "Prevent LocalSocket from creating an fd if fd is already there"
am: 616910fd53

Change-Id: I90192dd7e656b9bec62815ad628fc4e67f806240
2017-01-06 01:41:09 +00:00
Treehugger Robot
616910fd53 Merge "Prevent LocalSocket from creating an fd if fd is already there" 2017-01-06 01:29:47 +00:00
Steven Moreland
4d3caf3938 Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca am: 3290ba072b
am: 94924f38fb

Change-Id: I3b871a941856fdeb0e989aeaadc5fdbc7732b681
2017-01-06 01:16:02 +00:00
Steven Moreland
94924f38fb Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca
am: 3290ba072b

Change-Id: I49ee88cca2b2da0eac8d73cf408d2c5bfb409ce9
2017-01-06 01:09:26 +00:00
Steven Moreland
3290ba072b Merge "HwBinder: get/register checked exceptions."
am: 9ec4fec5ca

Change-Id: Id6abc10992428af2e55cb5228c298b69c111c621
2017-01-06 01:05:02 +00:00
Treehugger Robot
9ec4fec5ca Merge "HwBinder: get/register checked exceptions." 2017-01-06 00:58:17 +00:00
Amin Shaikh
ea7931d107 Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 am: 7495cf633c
am: d7f371813a

Change-Id: I8fc3a45a910294c46982bac9a3f6e183977aad16
2017-01-06 00:21:56 +00:00
Amin Shaikh
d7f371813a Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4
am: 7495cf633c

Change-Id: Ie6913526fbc1b0ae63eb7c0c7be7d9eac5772f50
2017-01-06 00:15:01 +00:00
Amin Shaikh
7495cf633c Merge "Fix NetworkScorerAppManager#isCallerActiveScorer."
am: 48eecdcbc4

Change-Id: I6b9ecd35dbc0758cd45b804dc9586287428af293
2017-01-06 00:08:19 +00:00
Treehugger Robot
48eecdcbc4 Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." 2017-01-05 23:57:54 +00:00
Ajay Panicker
7a8c36aa4e Prevent LocalSocket from creating an fd if fd is already there
Any LocalSocket created with a FileDescriptor will throw IOExceptions
when performing most opperations due to the fact that the LocalSocket
tries to create an implementation but fails since there is a FileDescriptor
already set.

Bug: 34095140
Test: Setup using tap&go
Change-Id: Ie8f50def6156c16617697d939d6c0ab570281642
2017-01-05 23:52:30 +00:00
Amin Shaikh
2cd918a63e Fix NetworkScorerAppManager#isCallerActiveScorer.
The current implementation checks whether the caller's uid has the
SCORE_NETWORKS permission instead of checking the passed in callingUid. I
removed this check entirely because the getActiveScorer method already checks
whether the scorer's package has the SCORE_NETWORKS permission. There is no way
callingUid can equal the active scoring package's uid without also having the
SCORE_NETWORKS permission.

Bug: 34107721
Test: runtest --path core/tests/coretests/src/android/net/NetworkScorerAppManagerTest.java
Change-Id: Ifd427792169837c84a10a76b208c76137db06ae9
2017-01-05 14:28:47 -08:00
Steven Moreland
c0631d0bb7 HwBinder: get/register checked exceptions.
Bug: 33673120
Test: hidl_test_java
Change-Id: Id19b61b252e756a032ae11f7b59bd8eed82edbe9
2017-01-05 09:20:44 -08:00
Robert Sesek
8be4cfc638 Merge "Synchronize access to WebViewZygote." am: fd6f631de5 am: c8111e07d0
am: 2c3818158a

Change-Id: Ib6afc79a3905a68fa92d5ff9389752724a77d305
2017-01-05 09:43:53 +00:00
Robert Sesek
2c3818158a Merge "Synchronize access to WebViewZygote." am: fd6f631de5
am: c8111e07d0

Change-Id: I8c389a9c06bd0b8d1964756323e6c7e010901f89
2017-01-05 09:37:32 +00:00
Robert Sesek
c8111e07d0 Merge "Synchronize access to WebViewZygote."
am: fd6f631de5

Change-Id: I20eaaf40b2ed060caf3685f229005c3e78f29d19
2017-01-05 09:31:24 +00:00
Treehugger Robot
fd6f631de5 Merge "Synchronize access to WebViewZygote." 2017-01-05 09:21:00 +00:00
Pavlin Radoslavov
01be004c72 Merge "Integration of the LDAC codec for A2DP source" am: 3c050268f0 am: bb8f1cd92b
am: 7d14914239

Change-Id: I01686a6a4c493dc1dce90c82f2215e955c2ce61f
2017-01-05 07:59:59 +00:00
Pavlin Radoslavov
7d14914239 Merge "Integration of the LDAC codec for A2DP source" am: 3c050268f0
am: bb8f1cd92b

Change-Id: I62f8462330d7661b8008abf862c4d4bb47c129dc
2017-01-05 07:55:27 +00:00
Pavlin Radoslavov
bb8f1cd92b Merge "Integration of the LDAC codec for A2DP source"
am: 3c050268f0

Change-Id: I79092dfa7a6918bf359b266bec7a7bbc736f08ce
2017-01-05 07:49:49 +00:00
Pavlin Radoslavov
546866988a Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b am: a750c90ac1
am: 5aaa985e97

Change-Id: I1ef73d7f11e244d77293a9b8b9c747ee79498819
2017-01-05 02:12:04 +00:00
Pavlin Radoslavov
fad8b730d2 Integration of the LDAC codec for A2DP source
The codec can be used if the encoding shared library is installed
on the device:
 libldacBT_enc.so

Test: A2DP streaming to LDAC headsets
Bug: 30958229

Change-Id: I524805fd308b5181427515617eda05625a7c4ae5
2017-01-04 18:07:29 -08:00
Pavlin Radoslavov
5aaa985e97 Merge "Integration of the aptX and aptX-HD codecs for A2DP source" am: 5242acbd0b
am: a750c90ac1

Change-Id: I7957fb151bb113485240fdc2bae1cdd380930f27
2017-01-05 02:07:05 +00:00
Pavlin Radoslavov
a750c90ac1 Merge "Integration of the aptX and aptX-HD codecs for A2DP source"
am: 5242acbd0b

Change-Id: I4007f4e68e889ed0a41ac5fc035f175e3709bb0d
2017-01-05 02:02:01 +00:00
Pavlin Radoslavov
feeb9b245c Integration of the aptX and aptX-HD codecs for A2DP source
Each of the codecs can be used if the corresponding encoding
shared library is installed on the device:
 - aptX: libaptX.so
 - aptX-HD: libaptXHD.so

Test: A2DP streaming to aptX and aptX-HD headsets
Bug: 30958229
Change-Id: I24faddc8cd88ae3e1370922c633f30e13124a867
2017-01-04 16:30:35 -08:00
Joe LaPenna
bb879cedc7 Merge "Expose RecommendationRequest.Builder as SystemApi." am: 944b017031 am: 1c4cfe1af9
am: 303b853671

Change-Id: Ic35415f7d7b721faf09f9968cb2fd8e9ba6749b0
2017-01-04 19:58:56 +00:00
Joe LaPenna
303b853671 Merge "Expose RecommendationRequest.Builder as SystemApi." am: 944b017031
am: 1c4cfe1af9

Change-Id: I094905e8fa7f54f4f5f0be80fa833ca44654f334
2017-01-04 19:54:32 +00:00
Joe LaPenna
1c4cfe1af9 Merge "Expose RecommendationRequest.Builder as SystemApi."
am: 944b017031

Change-Id: If63881b8b33ced7950ebb7e83fb8994e454b8642
2017-01-04 19:49:35 +00:00
Treehugger Robot
944b017031 Merge "Expose RecommendationRequest.Builder as SystemApi." 2017-01-04 19:42:17 +00:00
Joe LaPenna
010e8b0dc8 Expose RecommendationRequest.Builder as SystemApi.
In order to test our recommender, we need to be able to create
network recommendation requests.

Test: make update-api
Change-Id: I68df0d3e684bcdb90709a34478d2aa669ee23547
Merged-In: I68df0d3e684bcdb90709a34478d2aa669ee23547
2017-01-04 10:15:52 -08:00
Neil Fuller
88c9e31fd3 Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am: 75ba827a4e am: 6a29676687
am: df49ab5576

Change-Id: I6aac69506e00ec9f0fdb431191a94b7b9b9fc0df
2017-01-04 12:45:11 +00:00
Neil Fuller
df49ab5576 Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am: 75ba827a4e
am: 6a29676687

Change-Id: Icb55f2b160f6bd2f6c12845613ea3b4ea834693d
2017-01-04 12:38:50 +00:00
Neil Fuller
6a29676687 Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
am: 75ba827a4e

Change-Id: I08b809241b6e025c9a30377c09f616be3484d7af
2017-01-04 12:32:29 +00:00
Treehugger Robot
75ba827a4e Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" 2017-01-04 12:26:49 +00:00
Ivan Podogov
daa72ea3ab Merge "HID Device role API fixes" am: f33a71d017 am: a7d58fecc6
am: 8e2e2b1381

Change-Id: I9e35c73f1a6094ddae892758d81955490aaa5f92
2017-01-04 10:45:33 +00:00
Ivan Podogov
8e2e2b1381 Merge "HID Device role API fixes" am: f33a71d017
am: a7d58fecc6

Change-Id: Iab0dc91a8e2d4066d5eb85ec4771d42642783671
2017-01-04 10:41:26 +00:00
Ivan Podogov
a7d58fecc6 Merge "HID Device role API fixes"
am: f33a71d017

Change-Id: Ib7f524b7ad0bf63b852f2ffd4039d8b47ef7fc01
2017-01-04 10:37:38 +00:00
Neil Fuller
b08c7bc0bd Set isConnected, isBound, implCreated on server-side LocalSockets
Previously LocalServerSocket.accept() would return a LocalSocket
instance with isConnected, isBound and implCreated set to false.
[implCreated determines whether impl.create() needs to called].

A socket created via accept() in this way is implicitly bound
and connected. impl.create() does not need to be called because
impl.accept(LocalSocketImpl s) is called instead and has the same
effect (s.fd and s.mFdCreatedInternally set correctly).

This change modifies the behavior so that the flags are now all
set to true in this case and isBound() and isConnected() will
now return the correct answer.

Attempts to call bind() and connect() will still throw
IOException as before, but with a different exception message.

Correctly setting implCreated in LocalSocket means that
LocalSocketImpl.create() will no longer be called for accept()
created sockets and no longer needs to treat the "fd != null"
case as a no-op: we can now assert that there must be no fd set
when create() is called as we will no longer call it with sockets
created using accept().

Bug: https://code.google.com/p/android/issues/detail?id=35942
Test: Device boot
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I3ac55439412e84501ae7c5ae6c9976e03b2d6fc5
2017-01-04 10:33:18 +00:00
Ivan Podogov
f33a71d017 Merge "HID Device role API fixes" 2017-01-04 10:32:41 +00:00
Steven Moreland
3b20d72697 Merge "Add checked exceptions to HwBinder transact." am: 6c5cc261f8 am: ca5d560090
am: d38478cb50

Change-Id: Ic0c6eb87c57aca798ff167a71929f1a0e3132a75
2017-01-04 05:11:06 +00:00
Steven Moreland
d38478cb50 Merge "Add checked exceptions to HwBinder transact." am: 6c5cc261f8
am: ca5d560090

Change-Id: I6d2dd373f83244e3fe61197cd704a3833a50329c
2017-01-04 05:07:06 +00:00
Steven Moreland
ca5d560090 Merge "Add checked exceptions to HwBinder transact."
am: 6c5cc261f8

Change-Id: I3bcac03a745722acd983dc4e7bdc31ae806bdbd4
2017-01-04 05:03:28 +00:00
Treehugger Robot
6c5cc261f8 Merge "Add checked exceptions to HwBinder transact." 2017-01-04 04:58:38 +00:00
Pavlin Radoslavov
62c5226e9c Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e
am: da3de76bdb

Change-Id: If62a29812dad856d262c38804f3d88a5406ef79e
2017-01-04 03:49:09 +00:00