Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
285,977 Commits 3 Branches 0 Tags
138f75bbc8cf4e15b2f614ccf71af5fa394598a7
Commit Graph

285977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawlowski
138f75bbc8 Merge "Add 32 and 128 bit Service Data parsing." am: 725e212de3 
am: 2acc8e28dd

Change-Id: I54a5717690a43e03b2390e1413e06e9c35554e28
 2017-05-26 23:09:23 +00:00
Jakub Pawlowski
2acc8e28dd Merge "Add 32 and 128 bit Service Data parsing." 
am: 725e212de3

Change-Id: I5a5010651b07f2a9c5d1fb25f55602ed5e741d56
 2017-05-26 23:02:45 +00:00
Treehugger Robot
725e212de3 Merge "Add 32 and 128 bit Service Data parsing." 2017-05-26 22:53:29 +00:00
Ruchi Kandoi
3377e1fc91 Merge "Make NFC AIDL callbacks oneway" am: 99c805b319 
am: a50b393781

Change-Id: I510c06bb3c3fc74ec31baa6b5d3e3c2888067da6
 2017-05-26 22:37:26 +00:00
Ruchi Kandoi
a50b393781 Merge "Make NFC AIDL callbacks oneway" 
am: 99c805b319

Change-Id: I964420fc36c67b9f96e286e1a8b9b54eda074189
 2017-05-26 22:30:16 +00:00
Yuka Anami
269cb38bb9 Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 
am: 0d9dfc4314

Change-Id: I8e3caa6df525879b820f0611ec751d18df3eb94f
 2017-05-26 22:23:53 +00:00
Treehugger Robot
99c805b319 Merge "Make NFC AIDL callbacks oneway" 2017-05-26 22:20:58 +00:00
Yuka Anami
0d9dfc4314 Merge "Add ID_LENGTH field for Empty type record" 
am: b1f0bb6f83

Change-Id: Ib63ba83f912f2047ec5bd795b57da423c1e78f59
 2017-05-26 22:17:15 +00:00
Treehugger Robot
b1f0bb6f83 Merge "Add ID_LENGTH field for Empty type record" 2017-05-26 22:07:39 +00:00
Jakub Pawlowski
45033a7e57 Add 32 and 128 bit Service Data parsing. 
Bug: 62078132
Change-Id: I79ff75cd5ccbe346dca79693b074ff3cd09112dd
 2017-05-26 21:11:24 +00:00
Ruchi Kandoi
5dc487d588 Make NFC AIDL callbacks oneway 
Test: Read NFC tags, Android Beam
Bug: 32288773
Change-Id: I6294ec29be2af8feb578e9bfd5e0770ad9c09cc0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2017-05-26 21:06:25 +00:00
Yuka Anami
dd0c9bbbb2 Add ID_LENGTH field for Empty type record 
If ID_LENGTH field is omitted from Empty Type record, it cannot be
detected as Ndef since the data is strictly checked by e3fc7d9954.
But it is not possible to create raw bytes of Empty Type record
which can meet this condition by using NdefRecord/NdefMessage.
To fix this issue, added ID_LENGTH field to Empty type record.

Bug: 38299566
Test: Write and read NDEF tag with empty type record
Change-Id: Idb58c80cf8562a8b314f4ddeccdc627dc0c6f5b4
 2017-05-26 20:53:10 +00:00
Rebecca Silberstein
ca2cec4754 Merge "WifiManager: add iface name and mode labels" am: 21cc4bcd01 
am: 78deb691cc

Change-Id: Ie5364ed53119969bd8750a86cb3d5be244ed591d
 2017-05-26 16:45:19 +00:00
Rebecca Silberstein
78deb691cc Merge "WifiManager: add iface name and mode labels" 
am: 21cc4bcd01

Change-Id: Ia715be047c0e1c3ef5ea5d38d013276cf5a3eacc
 2017-05-26 16:37:21 +00:00
Treehugger Robot
21cc4bcd01 Merge "WifiManager: add iface name and mode labels" 2017-05-26 16:26:38 +00:00
Erik Kline
96c6d201f4 Merge "Support registration of offload control callbacks." am: 7ee96625c2 
am: 66cc06c2c7

Change-Id: Ieab0ae324ccf8ddfea02adfe647407df6c12b945
 2017-05-26 10:22:33 +00:00
Rebecca Silberstein
dc5abdd80d WifiManager: add iface name and mode labels 
Connectivity service needs to get the interface name and intended ip
configuration mode for softap.
This CL adds the interface name and softap target mode variables to
use to insert the extra info into the wifi ap state change broadcast.

Note: additional CLs are needed to verify the iface name and mode.  The
mode tracking is still in progress.

Bug: 62076211
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified the name in the broadcast
Merged-In: I67f82525b5c0fa5b81235311988c9b186d16077a
Merged-In: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158
Change-Id: I64e1d13a9e422945fe9c4c268c206da365d0a3eb
(cherry picked from commit 4ac2cab8fd)
 2017-05-26 19:16:43 +09:00
Erik Kline
66cc06c2c7 Merge "Support registration of offload control callbacks." 
am: 7ee96625c2

Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae
 2017-05-26 10:16:26 +00:00
Treehugger Robot
7ee96625c2 Merge "Support registration of offload control callbacks." 2017-05-26 10:07:27 +00:00
Nicolas Geoffray
255b69aca0 Merge "Pass bootComplete to dexopt." am: 18c3201986 
am: 1e35b7b5bc

Change-Id: Id4633d3729c8532d901b33bb6720d8f34df1e6e9
 2017-05-26 08:13:49 +00:00
Nicolas Geoffray
1e35b7b5bc Merge "Pass bootComplete to dexopt." 
am: 18c3201986

Change-Id: I5d73692a887ef8f3fff888c310f9969d79ada970
 2017-05-26 08:07:58 +00:00
Nicolas Geoffray
18c3201986 Merge "Pass bootComplete to dexopt." 2017-05-26 08:00:45 +00:00
Erik Kline
f4b6e34fc0 Support registration of offload control callbacks. 
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: I054cdf6a277c77e4cbf5c81145446a9be1c5fe39
 2017-05-26 16:47:04 +09:00
Hugo Benichi
ae278410f5 Merge changes If4deb106,Ib25d7658 am: 0388f0e47b 
am: 41a57af66a

Change-Id: Ieea1398319d8235e823464239d233bf6f528126d
 2017-05-26 00:51:23 +00:00
Hugo Benichi
41a57af66a Merge changes If4deb106,Ib25d7658 
am: 0388f0e47b

Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
 2017-05-26 00:43:06 +00:00
Hugo Benichi
0388f0e47b Merge changes If4deb106,Ib25d7658 
* changes:
  NsdService: do not use ContentResolver directly
  @Ignore ConnectivityServiceTest#testRequestBenchmark
 2017-05-26 00:34:05 +00:00
Brad Ebinger
689edc736f Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c 
am: be34238840

Change-Id: Ie399093e992c7b15c72927080b5c20d378738785
 2017-05-25 23:00:29 +00:00
Brad Ebinger
be34238840 Merge "Add IMEI_NOT_ACCEPTED error code for IMS" 
am: 25ce41cf4c

Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb
 2017-05-25 22:51:11 +00:00
Brad Ebinger
25ce41cf4c Merge "Add IMEI_NOT_ACCEPTED error code for IMS" 2017-05-25 22:31:53 +00:00
Hugo Benichi
03f6e1d18a NsdService: do not use ContentResolver directly 
This patch changes NsdService to call registerContentObserver in the
ContentResolver class indirectly through NsdSettings.

This allows to easily intercept it and mock it in unit tests, and solves
test failures on the internal master branch where
registerContentObserver uses final or static methods that cannot be
worked around.

Bug: 32561414
Bug: 62044295
Test: runtest -x frameworks/base/tests/net/../NsdServiceTest.java
Change-Id: If4deb106de551746babb70196b20f21ece478850
 2017-05-26 07:18:15 +09:00
Hugo Benichi
849b81b7ab @Ignore ConnectivityServiceTest#testRequestBenchmark 
Ignore the last remaining test in ConnectivityServiceTest with spurious
failures. testRequestBenchmark has some intrinsic chances of failure due
to the fact it attempts to assert elapsed time durations against a
reference target.

Bug: 32561414
Test: no functional change
Change-Id: Ib25d76581b47997b2ef84df3e6a9fd9224b85d92
 2017-05-26 07:18:15 +09:00
Steven Moreland
5b33f9b441 Merge "HIDL: C++ Java parity" am: 475d9b283c 
am: 101aa88ad6

Change-Id: If341009ba5c22ec0e83170e856e83b23d8a925ce
 2017-05-25 16:39:40 +00:00
Steven Moreland
101aa88ad6 Merge "HIDL: C++ Java parity" 
am: 475d9b283c

Change-Id: I8195a0a4de291f26c637f5cd6802d6bbaf0d17a3
 2017-05-25 16:34:21 +00:00
Treehugger Robot
475d9b283c Merge "HIDL: C++ Java parity" 2017-05-25 16:28:43 +00:00
Nicolas Geoffray
3b4359a06c Pass bootComplete to dexopt. 
bug: 37165062
Test: After OTA, check bootComplete=false on package updates
Change-Id: I6fc00216020bb16d8ed4f6e839b5e1df0e942700
 2017-05-25 13:56:00 +01:00
Neil Fuller
4e9c135a5a Merge "Remove time_zones_by_country.xml file" am: 3436fd4833 
am: 1541ef3712

Change-Id: Iba095c44c332658f7eea448dcf653b46bce5d8e8
 2017-05-25 10:54:07 +00:00
Neil Fuller
1541ef3712 Merge "Remove time_zones_by_country.xml file" 
am: 3436fd4833

Change-Id: I75cf86290b0dcc5aa99b9d0ebacbc5aa07269aab
 2017-05-25 10:46:41 +00:00
Neil Fuller
3436fd4833 Merge "Remove time_zones_by_country.xml file" 2017-05-25 10:39:15 +00:00
Hugo Benichi
e8c2700519 Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5 
am: 1b0f4bf606

Change-Id: I2c27790f23d1ecc7b42dbbe28313f0533a1bab53
 2017-05-25 01:06:48 +00:00
Hugo Benichi
1b0f4bf606 Merge "NsdServiceInfo: move test to tests/net" 
am: 48859e01d5

Change-Id: I3e864d744b956eff62512419018dd7cd5f692333
 2017-05-25 01:01:15 +00:00
Hugo Benichi
48859e01d5 Merge "NsdServiceInfo: move test to tests/net" 2017-05-25 00:50:27 +00:00
Joel Scherpelz
ef0bd781b1 Merge "Ignore flow label when comparing RAs in APF" am: 81fda77884 
am: 6ccdb3fe19

Change-Id: I8a463109f896fe91f391c26f4b341e0e0c417d8a
 2017-05-25 00:12:22 +00:00
Joel Scherpelz
6ccdb3fe19 Merge "Ignore flow label when comparing RAs in APF" 
am: 81fda77884

Change-Id: Id1a51e03e5065cabb4645d1e05f5e22ab4e98c0a
 2017-05-25 00:04:12 +00:00
Joel Scherpelz
81fda77884 Merge "Ignore flow label when comparing RAs in APF" 2017-05-24 23:54:24 +00:00
Tyler Gunn
a1c225936a Merge "Add ability to dump events in a timeline view." am: 255a171c5d 
am: 3b27d69612

Change-Id: I5363916199a33e795fcfb8497815687cda91f6ef
 2017-05-24 22:52:40 +00:00
Tyler Gunn
3b27d69612 Merge "Add ability to dump events in a timeline view." 
am: 255a171c5d

Change-Id: I7bb01946685f4e9c5b60fd0e8e2be4b071fd1a6f
 2017-05-24 22:45:55 +00:00
Tyler Gunn
255a171c5d Merge "Add ability to dump events in a timeline view." 2017-05-24 22:36:44 +00:00
Brad Ebinger
ddd73513e6 Merge "Support RRO for emergency number conversion map" am: 671680e504 
am: 8498a6cffd

Change-Id: I4b90f44a5ccf42ab1586ae8867f63c0a2e362d97
 2017-05-24 20:33:26 +00:00
Brad Ebinger
8498a6cffd Merge "Support RRO for emergency number conversion map" 
am: 671680e504

Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82
 2017-05-24 20:27:48 +00:00
Brad Ebinger
671680e504 Merge "Support RRO for emergency number conversion map" 2017-05-24 20:19:32 +00:00