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

283916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Calin Juravle
eef66fd0c7 Merge "PackageManager: Clean up code related to foreign dex use" 2017-03-07 21:13:15 +00:00
Calin Juravle
4c06f55f14 PackageManager: Clean up code related to foreign dex use 
We simplified the way we track whether or not a dex file is used by
other apps. DexManager in the framework keeps track of the data and we
no longer need file markers on disk.

Test: device boots, foreign dex markers are not created anymore

Bug: 32871170

(cherry picked from commit 74f0a3450cd598f52b2c68c43531b1a27fb4e1ce)

Change-Id: I2a9daca15e5120518852584fa17aa94012af8f1a
Merged-In: I3660e2f3913a73904181449c2d910af0a0477950
 2017-03-07 11:39:24 -08:00
Andreas Gampe
838851364b Merge "Framework: Ensure image heap string literals for Patterns" 
am: d0f092af84

Change-Id: I69886924b3aca6c050239069c00e166142e2e522
 2017-03-07 16:59:12 +00:00
Treehugger Robot
d0f092af84 Merge "Framework: Ensure image heap string literals for Patterns" 2017-03-07 16:50:59 +00:00
Etan Cohen
645b48c8af Merge "[CM] Allow timeout in request network" 
am: 8328f27a87

Change-Id: Ic7a3da0a5292be5e13abca9c98c422bc2f50f3a0
 2017-03-07 16:49:53 +00:00
Tobias Thierer
b96d428e40 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 
am: aa4877e295

Change-Id: I94edc483a5d9dfeabb19d0eb687c10ba2df6eac9
 2017-03-07 16:43:16 +00:00
Etan Cohen
8328f27a87 Merge "[CM] Allow timeout in request network" 2017-03-07 16:40:27 +00:00
Tobias Thierer
aa4877e295 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" 2017-03-07 16:35:17 +00:00
Paul Duffin
9df5d4f715 Replace usages of littlemock with mockito 
Littlemock appears to have been created as an alternative to
Mockito that would work on Android. Given that Mockito does
now work on Android and Littlemock has had no activity since
Aug 2012 it seems prudent to switch over to use Mockito instead.

https://code.google.com/archive/p/littlemock/

This is being done as part of the work to upgrade Mockito.

Bug: 32912773
Test: Build and install affected APKs, test using am instrument
Change-Id: Id0e57880ea66c5681b664bbfb534c96410544665
 2017-03-07 13:55:52 +00:00
Erik Kline
0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 
am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8
 2017-03-07 13:33:29 +00:00
Treehugger Robot
75dfc5bd91 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" 2017-03-07 13:27:11 +00:00
Erik Kline
465c46d555 request{LinkProperties,NetworkCapabilities} no longer needed 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering toggling between WiFi and mobile
Bug: 32163131
Change-Id: I57edf5114b6361f320577c7870e40f8b3cdf74ce
 2017-03-07 17:18:06 +09:00
Erik Kline
4cf8f7a8cd Merge "Handle null NetworkState updates" 
am: ae758b2c7f

Change-Id: I9d8d5c176804344a40f6646acf65d2d8a5cd976f
 2017-03-07 06:31:48 +00:00
Treehugger Robot
ae758b2c7f Merge "Handle null NetworkState updates" 2017-03-07 06:24:17 +00:00
Erik Kline
e0a62a4398 Merge "Always send all available state when calling onAvailable()." 
am: affbb8b6a9

Change-Id: I81e70fecf060a4103b51084a60a32c78f6219f6b
 2017-03-07 06:00:09 +00:00
Treehugger Robot
affbb8b6a9 Merge "Always send all available state when calling onAvailable()." 2017-03-07 05:51:41 +00:00
Erik Kline
34baa3da4e Handle null NetworkState updates 
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual USB tethering to WiFi and mobile switching works
Bug: 32163131
Change-Id: I2d4ef7c135ae6eb50cc31236f2fd20080536ea6a
 2017-03-07 13:17:53 +09:00
Erik Kline
c75d4fad22 Always send all available state when calling onAvailable(). 
The state that needs to be transferred includes:
    - NetworkCapabilities
    - LinkProperties
    - whether the network is currently suspended

Additionally:
    - Rename notifyNetworkCallback() to notifyNetworkAvailable()
      in order to clarify its real function.
    - fix previous copy/paste error in unittest

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
    - USB tethering with mobile and Wi-Fi upstream toggling
Bug: 32163131
Change-Id: Ib4460bcd5d08863a9feac9e8ab41a238897bb3ea
 2017-03-07 12:57:26 +09:00
Tyler Gunn
dd4bc7c69c Merge "API review cleanups/changes." 
am: 9324d6513b

Change-Id: Iaeb4bbb5e551bf4206ea2ab4372d1ba0533c4709
 2017-03-07 02:49:54 +00:00