drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283,939 Commits 1 Branch 0 Tags
Commit Graph

283939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
17e5a2d851 Merge "Refactor code incompatible with Mockito 2.7.13" 
am: 2a3a4f81f9

Change-Id: I259dc2116f1ba7d409729d739404dca501f4a5e8
 2017-03-10 20:43:07 +00:00
Paul Duffin
2a3a4f81f9 Merge "Refactor code incompatible with Mockito 2.7.13" 2017-03-10 20:33:21 +00:00
Etan Cohen
652aa82d7e Merge "[AWARE] Update network API: make open/encrypted explicit" 
am: 3dee29581e

Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690
 2017-03-10 17:13:42 +00:00
Etan Cohen
3dee29581e Merge "[AWARE] Update network API: make open/encrypted explicit" 2017-03-10 17:03:21 +00:00
Paul Duffin
26e81d2a47 Refactor code incompatible with Mockito 2.7.13 
Bug: 32912773
Test: make checkbuild
Merged-In: I96e3da967fad731fc8f39bde9db95f50ab7353fb
Change-Id: I445b32432eea8a1ccb2060a73460a882a9ebe76f
 2017-03-10 14:19:18 +00:00
fionaxu
64e0d4553b Merge "polish the notification of the default carrier app" 
am: b224b318a0

Change-Id: I4bb9f08d155def15a79a4960f05650cb5d7615fd
 2017-03-10 09:52:22 +00:00
Treehugger Robot
b224b318a0 Merge "polish the notification of the default carrier app" 2017-03-10 09:44:02 +00:00
fionaxu
1fdd29d799 Merge "decouple carrierdefaultapp from phone process" 
am: e32fc81c5d

Change-Id: I3b03e57609ab649f01a45a6b70edca1402f80b3e
 2017-03-10 09:40:59 +00:00
Treehugger Robot
e32fc81c5d Merge "decouple carrierdefaultapp from phone process" 2017-03-10 09:33:08 +00:00
fionaxu
91009327d2 decouple carrierdefaultapp from phone process 
Bug: 36114351
Test: Manual
Change-Id: I679d97bd9854fe478499d1fac6225c3f954ecdbc
 2017-03-09 23:59:15 -08:00
Brad Ebinger
d31314d550 Merge "Disable a phone number log for user build" 
am: 59a40691a5

Change-Id: I9b2a14b29fe5e096b734b6e3f1d4b65806753646
 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
db889edb1d Merge changes from topic 'USAGE_IO_INPUT' 
am: 70fac233fa

Change-Id: I3f8db9b25a8ccee8ddb596baf5e54a268747de9f
 2017-03-09 20:51:50 +00:00
Miao Wang
483a424903 [RenderScript] Use ANativeWindow_fromSurface to get ANativeWindow from Java Surface. 
am: 33287e8a89

Change-Id: Iffd2de04c50f07806063543abe9cd359ce48b6df
 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
Hugo Benichi
43961ee6ae Merge "CaptivePortalLoginActivity correctly gets UserAgent" 
am: 4903487fd9

Change-Id: Iea24e914cab4128464f8866a4b9ae47c7c5325bf
 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
7665332a7a Merge "Remove interfaceChain from IServiceManager::add()" 
am: 4a75e32f1d

Change-Id: I9443e22ed730c44abc6fd6f697f8b3f04b667f37
 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
2a71bd5150 Merge "Return generic Binder on onBind" 
am: c6613f7206

Change-Id: Ibc8cce3c63b93820f6bdd842e6a751233240874d
 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
fc3c9d0e9e Merge "Bluetooth 5 Advertising API" 
am: 1bb08c25b8

Change-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd
 2017-03-08 19:21:03 +00:00
Jakub Pawlowski
4f6034160c Merge "Bluetooth 5 PHY selection API" 
am: 104eeedb42

Change-Id: I0ee2daaf0771b405c8a14598a70459879d31c953
 2017-03-08 19:18:50 +00:00
Jakub Pawlowski
8acd7391bd Merge "Bluetooth 5 periodc scan API (1/2)" 
am: f1d76a71c8

Change-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16
 2017-03-08 19:14:22 +00:00
Jakub Pawlowski
71760b71fd Merge "Bluetooth 5 enhanced scanning API" 
am: bed6fb3f5a

Change-Id: I27d61ec7446c36143dcd5a94158451e1be9a5411
 2017-03-08 19:12:08 +00:00
Jakub Pawlowski
e9bd9be3cb Merge "Bluetooth 5 feature check API (1/2)" 
am: a06a0dfdb7

Change-Id: I59cf0e8f496e6a1201a3a6ec832c33cd1c8972df
 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 5324a14cf490656269ef862d7f8f6b139a21c0e6)
 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 db5a87d50db9d4b3d642603f6c329b83ee5851f6)
 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 a48e03745becc96181c676dc3d194d0572f11c10)
 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 9de522c6e48497028d36a1f8ad8f8adf4b7b1ae6)
 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 79d66495c32996a5b532328571bf6ceecca70ca5)
 2017-03-08 18:20:03 +00:00
Joachim Sauer
260b81aaf2 Merge "Renaming Czech Republic to Czechia." 
am: 33bade08de

Change-Id: Ie76ebb1bd53eb4993f0d01c7d3b5ba7dae9c6504
 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
3a764c19d1 [AWARE] Update network API: make open/encrypted explicit 
Replace the older (implicitly) open network with 3 network
creation APIs:
- Open
- Passphrase-based
- PMK (SystemApi only)

Bug: 26564544
Bug: 35702875
Test: unit tests and integration (sl4a) tests
Change-Id: I29a1d668d245853755cd2dfaaa6c65fbb43989f7
 2017-03-08 09:11:21 -08:00
Etan Cohen
0501c50040 Merge "[AWARE] Add data-path security configuration (Passphrase)" 
am: 769fa0c881

Change-Id: If38fa15ce7c6606f081b86dad1ecbe0cac453ed5
 2017-03-08 15:05:18 +00:00
Paul Duffin
b29311bbba Merge "Replace usages of littlemock with mockito" 
am: 0a11c83016

Change-Id: I1456ae3d07d396080a817de01796eefc71230981
 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
Etan Cohen
62a2f9f6ab [AWARE] Add data-path security configuration (Passphrase) 
Add API to optionally provide a passphrase to
configure security on a data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: Ie011345348a3918a412957e38610cabe147c35fa
 2017-03-07 19:07:14 -08:00
Hemant Gupta
12358b4057 Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" 
am: 79eb213a98

Change-Id: I5f82a0c40c64fca0701abba44693b2892209acf3
 2017-03-08 00:38:14 +00:00
Treehugger Robot
79eb213a98 Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" 2017-03-08 00:28:31 +00:00
Hall Liu
033972b5b2 Merge "Add further Connection-side APIs for RTT (part 2)" 
am: 6bb5110f2c

Change-Id: Idfe092393301fb47e6a635eb150103cb928a2696
 2017-03-07 21:52:52 +00:00
Hall Liu
6bb5110f2c Merge "Add further Connection-side APIs for RTT (part 2)" 2017-03-07 21:44:43 +00:00
Calin Juravle
b1818b8a36 Merge "PackageManager: Clean up code related to foreign dex use" 
am: eef66fd0c7

Change-Id: I443f001c15daddd63a17685c2e82fc9a619c45ee
 2017-03-07 21:23:03 +00:00