Brad Ebinger
c906a167cb
Merge "Disable a phone number log for user build" am: 59a40691a5
...
am: d31314d550
2017-03-09 21:52:10 +00:00
Brad Ebinger
d31314d550
Merge "Disable a phone number log for user build"
...
am: 59a40691a5
2017-03-09 21:46:39 +00:00
Brad Ebinger
59a40691a5
Merge "Disable a phone number log for user build"
2017-03-09 21:39:00 +00:00
Miao Wang
dbe0a73edb
Merge changes from topic 'USAGE_IO_INPUT' am: 70fac233fa
...
am: db889edb1d
2017-03-09 20:57:29 +00:00
Miao Wang
d464402ab7
[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface. am: 33287e8a89
...
am: 483a424903
2017-03-09 20:56:16 +00:00
Miao Wang
db889edb1d
Merge changes from topic 'USAGE_IO_INPUT'
...
am: 70fac233fa
2017-03-09 20:51:50 +00:00
Miao Wang
483a424903
[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.
...
am: 33287e8a89
2017-03-09 20:50:38 +00:00
Miao Wang
70fac233fa
Merge changes from topic 'USAGE_IO_INPUT'
...
* changes:
[RenderScript] Update RenderScript JNI with the corresponding AllocationGetSurface driver implementation change.
[RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface.
2017-03-09 20:38:49 +00:00
Paul Navin
501c3d1005
DO NOT MERGE Change permissions review mode check. am: 59bd89fa29
...
am: 97e12736ce
2017-03-09 15:52:17 +00:00
Paul Navin
97e12736ce
DO NOT MERGE Change permissions review mode check.
...
am: 59bd89fa29
2017-03-09 15:46:12 +00:00
Paul Navin
59bd89fa29
DO NOT MERGE Change permissions review mode check.
...
In ag/1835531 we introduced a check for permissions review mode,
that relies on an overlay resource. Since we can't use overlay
resources for the Unified Build, this CL temporarily introduces
the checking for a build property as well. This possibly won't work
for O/G, but will work for the Feldspar release of the Unified build.
BUG: 35028846
Change-Id: I4c82f242bc680028ecd872589552534a419f0152
2017-03-09 15:33:29 +00:00
Hugo Benichi
4f9e934c5f
Merge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9
...
am: 43961ee6ae
2017-03-09 10:17:23 +00:00
Hugo Benichi
43961ee6ae
Merge "CaptivePortalLoginActivity correctly gets UserAgent"
...
am: 4903487fd9
2017-03-09 10:11:55 +00:00
Treehugger Robot
4903487fd9
Merge "CaptivePortalLoginActivity correctly gets UserAgent"
2017-03-09 10:03:26 +00:00
Martijn Coenen
7669e41d8a
Merge "Remove interfaceChain from IServiceManager::add()" am: 4a75e32f1d
...
am: 7665332a7a
2017-03-09 08:44:17 +00:00
Martijn Coenen
7665332a7a
Merge "Remove interfaceChain from IServiceManager::add()"
...
am: 4a75e32f1d
2017-03-09 08:39:15 +00:00
Martijn Coenen
4a75e32f1d
Merge "Remove interfaceChain from IServiceManager::add()"
2017-03-09 08:33:04 +00:00
Hugo Benichi
ec88fd6708
CaptivePortalLoginActivity correctly gets UserAgent
...
Change I33cbcdab9809c712d998da6d925bdd4e3093f8ff added to the intent
passed from NetworkMonitor to the CaptivePortalLoginActivity an extra
argument to set the UserAgent header of probes done by the
CaptivePortalLoginActivity.
However that extra String argument is not correctly retrieved from the
Intent and instead a null pointer is returned by getParcelableExtra().
Consequently the UserAgent header field is never set.
This patch fixes this bug and replace getParcelableExtra() with
getStringExtra().
It also adds logging of the request header and response header for every
network probes sent by CaptivePortalLoginActivity.
Bug: 35937367, 32369183
Test: manually tested
Change-Id: If5c463023474ffb0401f3cda5875ccd9fc6f79f9
2017-03-09 17:02:34 +09:00
Brad Ebinger
2fca3afd4b
Merge "Return generic Binder on onBind" am: c6613f7206
...
am: 2a71bd5150
2017-03-08 20:06:26 +00:00
Brad Ebinger
2a71bd5150
Merge "Return generic Binder on onBind"
...
am: c6613f7206
2017-03-08 20:02:03 +00:00
Brad Ebinger
c6613f7206
Merge "Return generic Binder on onBind"
2017-03-08 19:53:26 +00:00
Jakub Pawlowski
c162879c6a
Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8
...
am: fc3c9d0e9e
2017-03-08 19:28:54 +00:00
Jakub Pawlowski
3730cd9608
Merge "Bluetooth 5 PHY selection API" am: 104eeedb42
...
am: 4f6034160c
2017-03-08 19:27:38 +00:00
Jakub Pawlowski
600a67a8c8
Merge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8
...
am: 8acd7391bd
2017-03-08 19:22:59 +00:00
Jakub Pawlowski
fc3c9d0e9e
Merge "Bluetooth 5 Advertising API"
...
am: 1bb08c25b8
2017-03-08 19:21:03 +00:00
Jakub Pawlowski
f64a341eb7
Merge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a
...
am: 71760b71fd
2017-03-08 19:21:00 +00:00
Jakub Pawlowski
4f6034160c
Merge "Bluetooth 5 PHY selection API"
...
am: 104eeedb42
2017-03-08 19:18:50 +00:00
Jakub Pawlowski
0798f31c34
Merge "Bluetooth 5 feature check API (1/2)" am: a06a0dfdb7
...
am: e9bd9be3cb
2017-03-08 19:17:08 +00:00
Jakub Pawlowski
8acd7391bd
Merge "Bluetooth 5 periodc scan API (1/2)"
...
am: f1d76a71c8
2017-03-08 19:14:22 +00:00
Jakub Pawlowski
71760b71fd
Merge "Bluetooth 5 enhanced scanning API"
...
am: bed6fb3f5a
2017-03-08 19:12:08 +00:00
Jakub Pawlowski
e9bd9be3cb
Merge "Bluetooth 5 feature check API (1/2)"
...
am: a06a0dfdb7
2017-03-08 19:09:43 +00:00
Jakub Pawlowski
1bb08c25b8
Merge "Bluetooth 5 Advertising API"
2017-03-08 19:05:12 +00:00
Jakub Pawlowski
a9d1a32e5e
Bluetooth 5 Advertising API
...
Test: manual
Bug: 30622771
Change-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c
(cherry picked from commit 5324a14cf4
2017-03-08 19:04:49 +00:00
Jakub Pawlowski
104eeedb42
Merge "Bluetooth 5 PHY selection API"
2017-03-08 19:04:31 +00:00
Jakub Pawlowski
409cee69b2
Bluetooth 5 PHY selection API
...
Bug: 30622771
Test: manual
Change-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d
(cherry picked from commit db5a87d50d
2017-03-08 19:04:06 +00:00
Jakub Pawlowski
f1d76a71c8
Merge "Bluetooth 5 periodc scan API (1/2)"
2017-03-08 19:03:47 +00:00
Jakub Pawlowski
ac7fcfa361
Bluetooth 5 periodc scan API (1/2)
...
Bug: 30622771
Test: manual
Change-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c
(cherry picked from commit a48e03745b
2017-03-08 19:03:12 +00:00
Jakub Pawlowski
bed6fb3f5a
Merge "Bluetooth 5 enhanced scanning API"
2017-03-08 19:02:58 +00:00
Jakub Pawlowski
3aca933861
Bluetooth 5 enhanced scanning API
...
Bug: 30622771
Test: manual
Change-Id: I2c8065fbcedf48777ce18c7d8fe621e568b3fd75
(cherry picked from commit 9de522c6e4
2017-03-08 19:02:25 +00:00
Jakub Pawlowski
a06a0dfdb7
Merge "Bluetooth 5 feature check API (1/2)"
2017-03-08 19:02:11 +00:00
Jakub Pawlowski
48091bbd78
Bluetooth 5 feature check API (1/2)
...
Bug: 30622771
Test: manual
Change-Id: I90e2efe989745c07c2f2fb8f4ea5bc3b718382f6
(cherry picked from commit 79d66495c3
2017-03-08 18:20:03 +00:00
Joachim Sauer
d06f548226
Merge "Renaming Czech Republic to Czechia." am: 33bade08de
...
am: 260b81aaf2
2017-03-08 17:45:02 +00:00
Joachim Sauer
260b81aaf2
Merge "Renaming Czech Republic to Czechia."
...
am: 33bade08de
2017-03-08 17:40:13 +00:00
Joachim Sauer
33bade08de
Merge "Renaming Czech Republic to Czechia."
2017-03-08 17:31:27 +00:00
Etan Cohen
08e9d52817
Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881
...
am: 0501c50040
2017-03-08 15:10:18 +00:00
Etan Cohen
0501c50040
Merge "[AWARE] Add data-path security configuration (Passphrase)"
...
am: 769fa0c881
2017-03-08 15:05:18 +00:00
Paul Duffin
48a78f4852
Merge "Replace usages of littlemock with mockito" am: 0a11c83016
...
am: b29311bbba
2017-03-08 15:04:06 +00:00
Paul Duffin
b29311bbba
Merge "Replace usages of littlemock with mockito"
...
am: 0a11c83016
2017-03-08 14:59:26 +00:00
Etan Cohen
769fa0c881
Merge "[AWARE] Add data-path security configuration (Passphrase)"
2017-03-08 14:55:05 +00:00
Paul Duffin
0a11c83016
Merge "Replace usages of littlemock with mockito"
2017-03-08 14:36:18 +00:00
