Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
284,030 Commits 3 Branches 0 Tags
600a67a8c8b5af6ae48510b929b31b45e234e7bb
Commit Graph

284030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawlowski
600a67a8c8 Merge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8 
am: 8acd7391bd

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

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

Change-Id: I462d459638f2b41f8806b877a6b307e21e6e30d3
 2017-03-08 19:17:08 +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
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

Change-Id: Idbbf0592f4066e11269987b66fbfe575e2add0a2
 2017-03-08 17:45:02 +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
08e9d52817 Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881 
am: 0501c50040

Change-Id: Id7d33f9fc01e30e62dd765ceedd929506a9cd5b5
 2017-03-08 15:10:18 +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
48a78f4852 Merge "Replace usages of littlemock with mockito" am: 0a11c83016 
am: b29311bbba

Change-Id: I94c0ab304eb1ac8b68b897e6b74f737df2c2bff8
 2017-03-08 15:04:06 +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
31428b1e6d Merge "Bluetooth: Expose L2CAP API to support OPP 1.2" am: 79eb213a98 
am: 12358b4057

Change-Id: Iab52bbff82ee0189d2d8ba1458a3d844e399864c
 2017-03-08 00:43:12 +00: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
3a2c5f3f06 Merge "Add further Connection-side APIs for RTT (part 2)" am: 6bb5110f2c 
am: 033972b5b2

Change-Id: If2e4cd4eb08e15750886454102adf0b807852509
 2017-03-07 21:57:15 +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
d89f0f7c44 Merge "PackageManager: Clean up code related to foreign dex use" am: eef66fd0c7 
am: b1818b8a36

Change-Id: I41008c4e95cef971702120be285c2a8821168591
 2017-03-07 21:27:14 +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 74f0a3450c)

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

Change-Id: I0b19a98ca157d87c41a3a305b9ae59bb65a9cffe
 2017-03-07 17:03:51 +00: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
Etan Cohen
ac879cbcaf Merge "[CM] Allow timeout in request network" am: 8328f27a87 
am: 645b48c8af

Change-Id: Ie3438ba967887ab7776eefaf05a6cf915e866f82
 2017-03-07 16:55:59 +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
6779441da0 Merge "Track: ICU TimeZone: publish TIMEZONE_* constants" am: aa4877e295 
am: b96d428e40

Change-Id: Ie91a466fa5e774cb5cb64361f00bb29643805cf0
 2017-03-07 16:49:38 +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
bb54baba04 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 75dfc5bd91 
am: 0f901af920

Change-Id: I891abf2a1a4138b9d80b8544ac6d09deda8d3d62
 2017-03-07 13:38:07 +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
b48eb4f71a Merge "Handle null NetworkState updates" am: ae758b2c7f 
am: 4cf8f7a8cd

Change-Id: I47cdb040baed8c4c700ff7412a01d79f8edccbd2
 2017-03-07 06:36:13 +00: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
3765538bab Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9 
am: e0a62a4398

Change-Id: Ie9bd779526e967790cbc51de52a64bbf7cd493a5
 2017-03-07 06:04:13 +00:00