Commit Graph

262872 Commits

Author SHA1 Message Date
Christopher Wiley
2ea4166c74 Remove dead code from TetherInterfaceSM
Because no code outside of unittests ever issued these commands
to TetherInterfaceSM, we never executed any of the removed codepaths.

Change-Id: Id54f6e4eaeff8b3486cd78ddcc8c2a31011e6436
Test: Compiles.  Unittests continue to pass.
Bug: 28798823
2016-05-20 17:57:54 -07:00
Christopher Wiley
79e7fde00d Remove transient StartingState from TetherInterfaceSM
This state immediately switched into the TetheredState.
We can safely remove it at only the expense of a misleading state
broadcast.

Bug: 28798823
Test: runtest frameworks-services -c
    com.android.server.connectivity.tethering.TetherInterfaceSMTest

Change-Id: I295d830dbdb11717d6e05161d97787ffe871beb3
2016-05-20 17:43:33 -07:00
Christopher Wiley
1b3830a2af Expand test coverage of TetherInterfaceSM
Add tests for most normal case operations:
  - State machine startup.
  - Entering a tethered state (as USB interface and not)
  - Handling the first notification of an upstream interface
  - Handle changes in upstream interface
  - Handle unrequested teardown correctly

Bug: 28833951
Test: These tests pass

Change-Id: I2c0c9141bab9eaa92faec8de10fa653fb6236a74
2016-05-20 17:36:46 -07:00
Christopher Wiley
1cc6ffd2b3 Add demonstration unittest for TetherInterfaceSM
Prove that the concept works by writing a trivial test.

Bug: 28833951
Test: `runtest frameworks-services -c
  com.android.server.connectivity.tethering.TetherInterfaceSMTest`

Change-Id: I51911cef7f0d5165221845070befd085497c21a6
2016-05-20 15:56:31 -07:00
Christopher Wiley
e3f93b02bd Extract TetherInterfaceSM to its own class.
Attempt to keep all existing logic in place, except:

 + Marked a constructor as public, rather than default visible.
 + Added TAG, DBG, VDBG, and decoder ringer statics.
 + Moved static constants related to USB IPs into TetherInterfaceSM.

Bug: 28833951
Test: WiFi Tethering works on angler.

Change-Id: Id961220a9045832354cfe7381e5e9c0d8f54bf90
2016-05-20 15:56:25 -07:00
Christopher Wiley
9a509ca728 Make Tethering.TetherInterfaceSM more self contained
Remove references from the class into the containing class:
  - Move functionality to bring up a USB interface into the class itself.
  - Extract an interface to wrap methods where TetherInterfaceSM was
    calling into other private classes of Tethering
  - Inject necessary dependendencies into TetherInterfaceSM instances.

Bug: 28833951
Test: Compiles.

Change-Id: Ic96947417cf8734072d027b0f1cba8a1a1be7a74
2016-05-20 15:56:13 -07:00
Jason Monk
a255e7834a Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 5a2b96a8c5" into nyc-mr1-dev-plus-aosp
am: f778cf773c

* commit 'f778cf773c8617f49fe76f5446234e240c4e3db3':

Change-Id: I0fe69ff792057443ede1ffbdfe44234e3cbd226c
2016-05-20 20:09:01 +00:00
Jason Monk
b0cb35493d Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 395e0f6cff" into nyc-mr1-dev-plus-aosp
am: 7a470f88f3

* commit '7a470f88f30cfe5438a1bb677ce7355270127812':
  QS: Fix RTL animation

Change-Id: I1ff68614800469f5d45a540560c382d326690bd3
2016-05-20 20:08:54 +00:00
Roozbeh Pournader
a6c2db28f8 Merge "Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 5ac2c3b4a0" into nyc-mr1-dev-plus-aosp
am: 9835c0c1f3

* commit '9835c0c1f390e6399b3a1bb9ba778f3a234e13db':

Change-Id: I1794c2b9dc35006e80a8fb362b9447286c26251f
2016-05-20 20:08:48 +00:00
Seigo Nonaka
0696b9ae90 Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 18bf0e2ad2
am: 461e71472d

* commit '461e71472df1942936c27fb65f46b72c3eb4ab1b':
  Clear locales without changing layout direction.

Change-Id: I0db0a2e72765632803a17dce56857207ffc146e9
2016-05-20 20:08:39 +00:00
Android Build Merger (Role)
f778cf773c Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 5a2b96a8c5" into nyc-mr1-dev-plus-aosp 2016-05-20 20:01:32 +00:00
Android Build Merger (Role)
7a470f88f3 Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 395e0f6cff" into nyc-mr1-dev-plus-aosp 2016-05-20 20:01:29 +00:00
Android Build Merger (Role)
9835c0c1f3 Merge "Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 5ac2c3b4a0" into nyc-mr1-dev-plus-aosp 2016-05-20 20:01:21 +00:00
Jason Monk
ba7b1de84b Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8
am: 5a2b96a8c5

* commit '5a2b96a8c5d0f6a96964016ebad823766f18cc45':
  QS: Fix RTL animation

Change-Id: I6b71bd01e6ac97ed244e0b2ac2ed59e4e7215c71
2016-05-20 20:00:51 +00:00
Roozbeh Pournader
a3496000ad Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2
am: 5ac2c3b4a0

* commit '5ac2c3b4a0e646884b6998fbccf538145cf70e7a':
  Clear locales without changing layout direction.

Change-Id: I06ee22dda58c9e6f83a0e829992ff8d3ddf96928
2016-05-20 20:00:43 +00:00
Jason Monk
fad6a9fcd5 Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8
am: 395e0f6cff

* commit '395e0f6cffa54c9dea1d42696e59c2ae50e30297':
  QS: Fix RTL animation

Change-Id: Ia81571da61db1533e8af77b80c8642383172c1e1
2016-05-20 20:00:42 +00:00
Roozbeh Pournader
461e71472d Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
2016-05-20 20:00:39 +00:00
Jason Monk
395e0f6cff Merge "QS: Fix RTL animation" into nyc-dev
am: d1df86dbb8

* commit 'd1df86dbb8a86c607d7fc1e0a89c7a10fe9899fa':
  QS: Fix RTL animation

Change-Id: Id61eb8c61845ab5a7edbcd20444cc0df4a5074c8
2016-05-20 19:52:59 +00:00
Jason Monk
5a2b96a8c5 Merge "QS: Fix RTL animation" into nyc-dev
am: d1df86dbb8

* commit 'd1df86dbb8a86c607d7fc1e0a89c7a10fe9899fa':
  QS: Fix RTL animation

Change-Id: I4e7592dc1363984d40050e75aea4b605d0fb6b39
2016-05-20 19:52:57 +00:00
Seigo Nonaka
18bf0e2ad2 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
2016-05-20 19:52:55 +00:00
Seigo Nonaka
5ac2c3b4a0 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
2016-05-20 19:52:54 +00:00
Jason Monk
d1df86dbb8 Merge "QS: Fix RTL animation" into nyc-dev 2016-05-20 19:42:40 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Vincent Palatin
4ce04238bb Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c am: 59c27e95a1
am: 28983b4cf2

* commit '28983b4cf27b0e18a7d4be91dd37eee82c3c48a6':

Change-Id: I3485fc6c847af39b00fb31ba00f00ed244625336
2016-05-20 18:56:04 +00:00
Vincent Palatin
09eec50526 Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c am: 9c3086ceff
am: 1ceb78302d

* commit '1ceb78302dd3d0e24a9d58f01d5e5ae76285477b':
  Fix notifications for USB PD enabled devices

Change-Id: If734e5d4e40aea923b6b93ca2c80fee0757e37ed
2016-05-20 18:52:25 +00:00
Vincent Palatin
28983b4cf2 Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c
am: 59c27e95a1

* commit '59c27e95a1d7db4431e476d42c5f8e1e6090e0f7':

Change-Id: I94356193ceb727d145ffdbe45b619e0159722355
2016-05-20 18:52:15 +00:00
Vincent Palatin
1ceb78302d Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c
am: 9c3086ceff

* commit '9c3086ceffebcb74560c9651710976eda893b1f0':
  Fix notifications for USB PD enabled devices

Change-Id: I53f1b392cbc80c4e1db2017dade8015ea216986a
2016-05-20 18:48:27 +00:00
Vincent Palatin
59c27e95a1 Merge "Fix notifications for USB PD enabled devices" into nyc-dev
am: 73722c4b0c

* commit '73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
  Fix notifications for USB PD enabled devices

Change-Id: I77b56a1811cc3b7580bfe3ebae295c05b0b6918e
2016-05-20 18:44:42 +00:00
Vincent Palatin
9c3086ceff Merge "Fix notifications for USB PD enabled devices" into nyc-dev
am: 73722c4b0c

* commit '73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
  Fix notifications for USB PD enabled devices

Change-Id: I9944f705b6a2de59216c2f81613a53546c5f1b50
2016-05-20 18:44:41 +00:00
Jason Monk
61d118d650 QS: Fix RTL animation
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes: 28674500
2016-05-20 14:44:16 -04:00
TreeHugger Robot
cbbe160fcc Merge "WifiManager: add WIFI_MODE_NO_LOCKS_HELD" 2016-05-20 18:36:23 +00:00
TreeHugger Robot
73722c4b0c Merge "Fix notifications for USB PD enabled devices" into nyc-dev 2016-05-20 18:32:10 +00:00
Siyamed Sinir
9cf4cdbea4 Merge "Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 214ebfb532" into nyc-mr1-dev-plus-aosp
am: 15b0a456be

* commit '15b0a456be70dc66e73c74ffa92dc465fe18e2d7':

Change-Id: I03a3dbc5cefd6d8b6f5e0b65f306e2f9f4f3d116
2016-05-20 18:07:11 +00:00
Siyamed Sinir
0923b063c4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 8ae06f6f3a
am: 68d3077e9a

* commit '68d3077e9a11c96d118834563fa283b3ead4f1a7':
  setTransformationMethod should reset mTextDir

Change-Id: I46a1f5e356992bd08ba440fce0e15b952541d547
2016-05-20 18:07:06 +00:00
Android Build Merger (Role)
15b0a456be Merge "Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 214ebfb532" into nyc-mr1-dev-plus-aosp 2016-05-20 18:03:04 +00:00
Siyamed Sinir
bc13415ef4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c
am: 214ebfb532

* commit '214ebfb5323d0339b34343b04323e26e650e521a':
  setTransformationMethod should reset mTextDir

Change-Id: Ia717c63a312a0cd5729fd1038c7f53313b9b848d
2016-05-20 18:02:41 +00:00
Siyamed Sinir
68d3077e9a Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c
am: 8ae06f6f3a

* commit '8ae06f6f3a4fa787ddab9859bc680e63b38686aa':
  setTransformationMethod should reset mTextDir

Change-Id: Ib0c29292f24c049acb3c61baf68ae3df970610c1
2016-05-20 18:02:39 +00:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
2016-05-20 17:59:35 +00:00
Paul Stewart
7c1d2da39e Merge "Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712 am: bced7c5fb6" into nyc-mr1-dev-plus-aosp
am: c6df6628ef

* commit 'c6df6628efa9c927d65e9ba3729c3b3b4e56f805':

Change-Id: I69eac223355aa80e53bc0631e498cdb9f9723beb
2016-05-20 17:54:44 +00:00
Paul Stewart
25e87ed3be Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712 am: 7ca542fa99
am: 131b976fe4

* commit '131b976fe4188e38b16a1494a77497c6830c3213':
  Don't remove existing EAP configurations

Change-Id: I329220c073c9ec186082dec253c16882960b258a
2016-05-20 17:54:29 +00:00
Siyamed Sinir
8ae06f6f3a Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I47699dc6e8c8fdddd91db2c4590a5244403c5f5c
2016-05-20 17:53:50 +00:00
Siyamed Sinir
214ebfb532 Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
2016-05-20 17:53:44 +00:00
Android Build Merger (Role)
c6df6628ef Merge "Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712 am: bced7c5fb6" into nyc-mr1-dev-plus-aosp 2016-05-20 17:50:10 +00:00
Paul Stewart
c00e3fbf50 Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712
am: bced7c5fb6

* commit 'bced7c5fb691d6e45a2ecb6c9c5a0e550e2abdd1':
  Don't remove existing EAP configurations

Change-Id: Ic14d6c57c5736bfbef22f27f77fee08a7ee39913
2016-05-20 17:49:47 +00:00
Paul Stewart
131b976fe4 Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712
am: 7ca542fa99

* commit '7ca542fa99362f15da8d3f57b4916d87c1f67eb3':
  Don't remove existing EAP configurations

Change-Id: I9808325df8d34bb2d08f99b384ff5ad07b6a2273
2016-05-20 17:49:10 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Paul Stewart
bced7c5fb6 Merge "Don\'t remove existing EAP configurations" into nyc-dev
am: c7ad1ac712

* commit 'c7ad1ac712f09c5bc116c66a54a860000b53fa38':
  Don't remove existing EAP configurations

Change-Id: I2678831ad384368a322af859aeadc42fcd2aeda7
2016-05-20 17:45:21 +00:00
Paul Stewart
7ca542fa99 Merge "Don\'t remove existing EAP configurations" into nyc-dev
am: c7ad1ac712

* commit 'c7ad1ac712f09c5bc116c66a54a860000b53fa38':
  Don't remove existing EAP configurations

Change-Id: I743d4b0291b7d0c864d30cb04acd7811428419d0
2016-05-20 17:45:20 +00:00
Adam Lesinski
8593809134 Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: fea0c3af7a
am: bc9e59d1a7

* commit 'bc9e59d1a7f52d41ecca65c0ea20868ea586b753':

Change-Id: I1defba8bde695f4bab94764d765b51956bf8afe7
2016-05-20 17:43:53 +00:00
Adam Lesinski
6028e28986 Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp
am: 768542e38d

* commit '768542e38d356bd18cb567dacc89c504d128ccd4':
  Fix parsing of kernel wakelocks

Change-Id: Ic5b48697830e96528cd87a579f0ee8a5ab665bf9
2016-05-20 17:43:40 +00:00