Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
326,040 Commits 3 Branches 0 Tags
70cb08326eaa1edfd47d260753f260ddbbc93cbc
Commit Graph

4140 Commits

Author SHA1 Message Date
Erik Kline
f3a08b44ed Add additional mocking for Context innards 
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Merged-In: I2695841bfc31280060754132e589af1ca95911da
Merged-In: I9a05f34035a15b233a44d517f2b2426481679974
Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
(cherry picked from commit ec37275ec9)
 2017-06-11 18:19:22 +09:00
Erik Kline
6e9a10104c Convert IControlsTethering from interface into callback 
Additionally:
    - add updateLinkProperties() method to new callback
    - skeletally connect LinkProperties updates through
      to OffloadController

TODOs liberally sprinkled through out.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Merged-In: I178130e65db4fef26d62ea7eaa9a52f7e8103432
Merged-In: I832d77747de7517513c22d36fff4a2fa2bb95154
Change-Id: I631d17b26be153534551a1615931fc98b598b953
(cherry picked from commit ab6439b0f8)
 2017-06-11 18:08:03 +09:00
Erik Kline
e7d7699381 Delete legacy "wifi interface name guessing" behaviour 
am: 9e22554068

Change-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646
 2017-06-08 13:32:57 +00:00
Erik Kline
9e22554068 Delete legacy "wifi interface name guessing" behaviour 
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).

Test: as follows
    - built
    - flashed
    - booted
    - TetheringTest passes
Bug: 32163131
Bug: 62343300

Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
 2017-06-08 18:51:33 +09:00
Erik Kline
f40e6bcd2e Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b am: e2018a407a 
am: 6ce08f623c

Change-Id: Ia290ef28f466d6a5c3f7208b1bc078bd7a2c204a
 2017-06-06 16:06:43 +00:00
Aurimas Liutikas
7918670379 Remove usages of ActionBarActivity. 
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.

Bug: 35253513
Test: None
Change-Id: Ica46ccbc2b29a6a3399f7deed6045c1f7e1cd429
(cherry picked from commit 19bda3d917)
 2017-06-06 15:16:44 +00:00
Erik Kline
6ce08f623c Merge "Support setting upstream parameters." am: faf8d67749 am: 4e5024131b 
am: e2018a407a

Change-Id: I8e0f7188ff29b2fd7c34fd2a340c8b4abaac2be7
 2017-06-06 05:16:27 +00:00
Erik Kline
4e5024131b Merge "Support setting upstream parameters." 
am: faf8d67749

Change-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97
 2017-06-06 04:54:04 +00:00
Erik Kline
7990aef63b Support setting upstream parameters. 
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e
 2017-06-06 12:02:13 +09:00
Erik Kline
1454ee750e Handle Wi-Fi passing explicit interface name and AP/IP mode 
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 31466854
Bug: 32163131
Bug: 62018531
Bug: 62076211
Merged-In: I599813c4b4d866623344df56f62ed6a40b4025d6
Merged-In: I8f1d172a3514e4fb9230af9e09aeaf638f03091c
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe
(cherry picked from commit 2efb827f61)
 2017-06-02 22:43:34 +09:00
TreeHugger Robot
d47fa266e6 Merge "Use TotalTime instead of ThisTime in app launch test" 2017-06-02 06:13:34 +00:00
gopinath
fb9272c637 Use TotalTime instead of ThisTime in app launch test 
Bug: 62272543

Test: Tested with calculator and facebook messenger launch

Change-Id: Ide4e844e54428edcb7e3356cb3d0492392f6bde3
 2017-06-01 23:08:04 -07:00
Erik Kline
619de4a6eb Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e am: 1536453059 am: 00956c4f7c 
am: 729c31c2e9

Change-Id: I8f1d172a3514e4fb9230af9e09aeaf638f03091c
 2017-06-02 05:46:47 +00:00
Erik Kline
729c31c2e9 Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" am: 3478ff8c9e am: 1536453059 
am: 00956c4f7c

Change-Id: I599813c4b4d866623344df56f62ed6a40b4025d6
 2017-06-02 05:39:23 +00:00
Erik Kline
1536453059 Merge "Handle Wi-Fi passing explicit interface name and AP/IP mode" 
am: 3478ff8c9e

Change-Id: I489f7e6b8ca4af584879a4c9e8f00570da6e400c
 2017-06-02 05:26:49 +00:00
Erik Kline
2efb827f61 Handle Wi-Fi passing explicit interface name and AP/IP mode 
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 31466854
Bug: 32163131
Bug: 62076211
Change-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe
 2017-06-02 12:21:15 +09:00
Hugo Benichi
1cab777ae4 Merge "Fix ApfTest" 2017-06-01 23:13:36 +00:00
Jason Monk
5070e5b4b3 Merge "Add checks against incorrect context use in sysui tests" into oc-dev am: 227e65d818 
am: b629460f33

Change-Id: I5695d4b2361bdf4ec9abe054418780572e660d2a
 2017-06-01 20:22:03 +00:00
Jason Monk
b629460f33 Merge "Add checks against incorrect context use in sysui tests" into oc-dev 
am: 227e65d818

Change-Id: I3fad5f17321adf92f5f80c8ec04fc8fc1e4128e2
 2017-06-01 19:54:22 +00:00
Jason Monk
893f0bdcb7 Add checks against incorrect context use in sysui tests 
Fix incorrect usages found by this check.

Test: runtest systemui
Bug: 62251903
Change-Id: I45a762f96838e617833c1cbe003e583087bb8176
 2017-06-01 11:21:14 -04:00
Erik Kline
726fd9085c Merge "Add a tethering offload settings kill switch" am: 7cf3086f37 am: 503a6952b2 am: 03941982dc 
am: 9d2abb4b40

Change-Id: Ibeddc103a63702096972fa505071dcad4bb47a28
 2017-06-01 08:18:25 +00:00
Erik Kline
9d2abb4b40 Merge "Add a tethering offload settings kill switch" am: 7cf3086f37 am: 503a6952b2 
am: 03941982dc

Change-Id: I7e15919817c59579ff6e7b28e858f13c3090ee5c
 2017-06-01 08:10:51 +00:00
Erik Kline
503a6952b2 Merge "Add a tethering offload settings kill switch" 
am: 7cf3086f37

Change-Id: I13264b4ae23c8754b61ff46cafbb1b5f31bd14a3
 2017-06-01 07:59:11 +00:00
Treehugger Robot
7cf3086f37 Merge "Add a tethering offload settings kill switch" 2017-06-01 07:50:35 +00:00
Hugo Benichi
9a2041ee83 Fix ApfTest 
libutils is now depending on libvndksupport. So any client that
statically links to libutils needs to link against libvndksupport as
well.

Bug: 32561414
Test: ApfTest works
Change-Id: Id99792baa1c0a7a61c4056f83f33d25e0bea143e
 2017-06-01 15:54:59 +09:00
Hugo Benichi
68fce9e97d Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6 
am: 871e6759ac

Change-Id: Ia9237e9be9db7447985726be06a3d9020ab72087
 2017-05-31 13:34:20 +00:00
Hugo Benichi
871e6759ac Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 
am: ba82d646a6

Change-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69
 2017-05-31 13:25:53 +00:00
Hugo Benichi
2dfb494827 Merge "Fix race condition in NsdManagerTest" 
am: f2383db747

Change-Id: Ifd731767608e738a271bd5793a462675c2a93123
 2017-05-31 13:08:37 +00:00
Erik Kline
92c4db04e5 Add a tethering offload settings kill switch 
Check for tether_offload_disabled (defaulting to false if not present)
before starting the OffloadController.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Bug: 34361337
Change-Id: Ifcc0eb1a41f09ad9e717c9252d2d55e69789669b
 2017-05-31 20:33:05 +09:00
Hugo Benichi
22143956cf Fix race condition in NsdManagerTest 
NsdManagerTest relies on the lastMessage variable to assert the
connection of a client to the service. The asserts in test are done on a
different thread, although the variable was not qualified volatile,
which creates the chance to read a stale value. This patch fixes this
race by marking the variable volatile.

Bug: 32561414
Bug: 62044295
Test: NsdManagerTest works
Change-Id: I0bc2cd8059c6ff8b78a2dda0ba8d6bc7e13ef951
 2017-05-31 15:35:54 +09:00
Hugo Benichi
990bb6e876 Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5 am: 5f046cb614 am: 7bbdfcd8eb 
am: 913d39aafe

Change-Id: I78cfc9306ae8c240f10e991a5de51d09237257af
 2017-05-31 04:20:16 +00:00
Hugo Benichi
913d39aafe Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" am: 76efbb30f5 am: 5f046cb614 
am: 7bbdfcd8eb

Change-Id: I96c39ca1899768d039a108426fb04655aaf8d55f
 2017-05-31 04:10:03 +00:00
Hugo Benichi
5f046cb614 Merge "ConnectivityServiceTest: more tweaks to testRequestBenchmark" 
am: 76efbb30f5

Change-Id: I2c7e714af44c31a101fd58be6ebcc540fffd65a1
 2017-05-31 03:52:05 +00:00
Hugo Benichi
02f8f9c830 ConnectivityServiceTest: more tweaks to testRequestBenchmark 
Recent continuous testing runs indicates that commit 849b81b7 did not
completely fixed the issue with testRequestBenchmark.

This patch changes the name of the test to not include "test" and
removes @SmallTest annotation, which should do the job of @Ignore while
ConnectivityServiceTest still extends AndroidTestCase.

In addition timeouts are adjusted to take into account recent failures
observed.

This is the last pending action before turning on FrameworksNetTests on
presubmits.

Bug: 32561414
Test: no functional change
Change-Id: I56ef334e19e99e5a3483418330e5f0ccd6eb31bb
 2017-05-31 10:23:42 +09:00
Erik Kline
5d6548189e Merge "Minor improvement in logging in TetheringConfiguration" am: 39ce589f0b am: 8211c36db9 am: 1315903420 
am: 3f5f551042

Change-Id: Iccfbc1a3d0bc55c4fb2188a06a31ec3eaf584547
 2017-05-30 14:02:50 +00:00
Erik Kline
3f5f551042 Merge "Minor improvement in logging in TetheringConfiguration" am: 39ce589f0b am: 8211c36db9 
am: 1315903420

Change-Id: I77b4db07f2a43a576146537ae2ab72d2d0ebdde6
 2017-05-28 11:31:32 +00:00
Erik Kline
8211c36db9 Merge "Minor improvement in logging in TetheringConfiguration" 
am: 39ce589f0b

Change-Id: I1d61308cf21f3c4ebcc37f78bdd102f96a676462
 2017-05-28 11:16:32 +00:00
Erik Kline
6bd7453206 Minor improvement in logging in TetheringConfiguration 
Test: as follows
    - built
    - booted
    - flashed
    - runtest frameworks-net passes
    - dumpsys connectivity shows expected output
Bug: 32163131
Bug: 36504926
Bug: 36988090
Bug: 38152109
Bug: 38186915
Bug: 38218697
Change-Id: I4a2129d780dfec7bca693486a100ea3c78465430
 2017-05-28 18:05:23 +09:00
Sudheer Shanka
aa3c30dfa2 Add a way to clear cached provider for tests in Settings class. 
Bug: 38437704
Bug: 38433611
Test: manual
Change-Id: Id2803359644bd68a158294b6d801fc9cd316fc9f
 2017-05-26 18:53:06 +00:00
Erik Kline
0e2747929b Merge "Support registration of offload control callbacks." am: 7ee96625c2 am: 66cc06c2c7 am: 96c6d201f4 
am: aa75fc4ec9

Change-Id: I38ed30ae4fb8f850f65283b43420c6e625677ca8
 2017-05-26 10:35:34 +00:00
Erik Kline
aa75fc4ec9 Merge "Support registration of offload control callbacks." am: 7ee96625c2 am: 66cc06c2c7 
am: 96c6d201f4

Change-Id: Ie3c4b0929ccf311b4f02fffe0908571cbbb7d772
 2017-05-26 10:29:13 +00:00
Erik Kline
66cc06c2c7 Merge "Support registration of offload control callbacks." 
am: 7ee96625c2

Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae
 2017-05-26 10:16:26 +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
7f0542b41b Merge changes If4deb106,Ib25d7658 am: 0388f0e47b am: 41a57af66a am: ae278410f5 
am: 6923028613

Change-Id: Id592d287a92c89320a682d660792b9b6c67e7563
 2017-05-26 01:04:44 +00:00
Hugo Benichi
6923028613 Merge changes If4deb106,Ib25d7658 am: 0388f0e47b am: 41a57af66a 
am: ae278410f5

Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
 2017-05-26 00:58:27 +00:00
Hugo Benichi
41a57af66a Merge changes If4deb106,Ib25d7658 
am: 0388f0e47b

Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
 2017-05-26 00:43:06 +00: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
John Reck
89618d7feb Merge "Creating HW bitmaps from RenderNode" into oc-dev am: d63b77c627 
am: df26122880

Change-Id: I7af81dd30eac562d50540bfb0ac60ffe4270530d
 2017-05-25 19:09:23 +00:00
John Reck
df26122880 Merge "Creating HW bitmaps from RenderNode" into oc-dev 
am: d63b77c627

Change-Id: Ia95a9f190c36999f70fdadbe45e1774beab80988
 2017-05-25 19:01:10 +00:00
TreeHugger Robot
d63b77c627 Merge "Creating HW bitmaps from RenderNode" into oc-dev 2017-05-25 18:48:22 +00:00