309812 Commits

Author SHA1 Message Date
TreeHugger Robot
eb47ae261a Merge "TextClassifier: Introduce LocaleList in the API." 2017-03-08 19:50:20 +00:00
TreeHugger Robot
d11fbe34bd Merge "Add new constants to track successful contact queries Bug: 35803126,35873712 Test: No need to add any tests for this" 2017-03-08 19:49:41 +00:00
Jakub Pawlowski
6f45188e87 Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8 am: fc3c9d0e9e
am: c162879c6a

Change-Id: I61382d466f28311b8ba5dd4ab120747eb0708501
2017-03-08 19:45:37 +00:00
Jakub Pawlowski
2ad15fd129 Merge "Bluetooth 5 PHY selection API" am: 104eeedb42 am: 4f6034160c
am: 3730cd9608  -s ours

Change-Id: I5d0dfea7068f123e544686d0522d06a3a1bbf095
2017-03-08 19:44:04 +00:00
Jakub Pawlowski
65ded7fc07 Merge "Bluetooth 5 periodc scan API (1/2)" am: f1d76a71c8 am: 8acd7391bd
am: 600a67a8c8  -s ours

Change-Id: Ibc1fc04aa569bb641a006b490ebf8450480b00ed
2017-03-08 19:35:27 +00:00
Jakub Pawlowski
c162879c6a Merge "Bluetooth 5 Advertising API" am: 1bb08c25b8
am: fc3c9d0e9e

Change-Id: Ib8e53386754ccfec27314bc1d29aaabde0cb7976
2017-03-08 19:28:54 +00:00
Jakub Pawlowski
3730cd9608 Merge "Bluetooth 5 PHY selection API" am: 104eeedb42
am: 4f6034160c

Change-Id: I3183ead1802d166aae903c180be46f19ea8291ee
2017-03-08 19:27:38 +00:00
Jakub Pawlowski
86559f7ce6 Merge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a am: 71760b71fd
am: f64a341eb7

Change-Id: I309e654e65001d9b97c457a272601761e54f9a73
2017-03-08 19:27:32 +00:00
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
db45efccbd Merge "Bluetooth 5 feature check API (1/2)" am: a06a0dfdb7 am: e9bd9be3cb
am: 0798f31c34

Change-Id: I871c18d414ce5a7517eba911c7e4ee441377f14c
2017-03-08 19:22:05 +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
f64a341eb7 Merge "Bluetooth 5 enhanced scanning API" am: bed6fb3f5a
am: 71760b71fd

Change-Id: I6a5de71a10fb1e326e57f3a9bd665229535a6571
2017-03-08 19:21:00 +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
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
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
Selim Cinek
f72baf17fc Merge changes I6823a613,I7763b473
* changes:
  Fixed a bug where the low-priority header wasn't cleared
  Fixes an issue where the notification header could be invisible
2017-03-08 19:04:19 +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
Santos Cordon
9c2886ba5d Merge "Map STATE_VR to STATE_ON for Battery Stats." 2017-03-08 18:40:27 +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
TreeHugger Robot
cf8a98af48 Merge "Grumble, nobody likes kibibytes." 2017-03-08 18:16:42 +00:00
mariagpuyol
0f5512eeec Add new constants to track successful contact queries
Bug: 35803126,35873712
Test: No need to add any tests for this

Change-Id: Ib902c28ebabb1bf17b4b2b80f70e08ab2571e75f
2017-03-08 09:52:52 -08:00
TreeHugger Robot
63976669f5 Merge "Store alphaChar as lower case in MenuItem's implementations" 2017-03-08 17:52:40 +00:00
Joachim Sauer
40034ccac1 Merge "Renaming Czech Republic to Czechia." am: 33bade08de am: 260b81aaf2
am: d06f548226

Change-Id: Ie7c7c3415738623c184e2e9e96d85cbe05cbfee7
2017-03-08 17:50:44 +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
Jerome Gaillard
b6f8556cb4 Merge "Ignore native color spaces following Change I0164a18f" 2017-03-08 17:44:39 +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
Philip P. Moltmann
ed8b4c7a09 Merge "Issue a warning if SharedPreferences are corrupted" 2017-03-08 17:23:17 +00:00
Philip P. Moltmann
ef98cead57 Merge "Log histogram of fsync times of sharedPreferences" 2017-03-08 17:13:28 +00:00
Etan Cohen
9fbff5b5d9 Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881 am: 0501c50040
am: 08e9d52817

Change-Id: I9e2cae82179316a6768fa43a7f313c32470fd40a
2017-03-08 15:15:48 +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
Paul Duffin
631ea26c49 Merge "Replace usages of littlemock with mockito" am: 0a11c83016 am: b29311bbba
am: 48a78f4852

Change-Id: I826f98625ce3fbc57f71d72bc0bfdabd3ff92b06
2017-03-08 15:09:13 +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
Jerome Gaillard
80447d42f0 Ignore native color spaces following Change I0164a18f
Test: layoutlib tests
Change-Id: I2fc2f13621524142d00fb86c45e75ecdb250479a
2017-03-08 14:15:51 +00:00
Gustav Sennton
e8288804a1 Merge "Update WebView.getCurrentWebViewPackage documentation." 2017-03-08 13:47:36 +00:00
Tobias Thierer
137b460e5f Merge "Don't allow MapCollections to iterate past the end." 2017-03-08 12:18:28 +00:00