drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,521 Commits 1 Branch 0 Tags
Commit Graph

246521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Wiley
7b61d71760 Expand test coverage of TetherInterfaceSM 
( cherry-pick of 1b3830a2afab565a38572ac5c3238a171b2d56d4 )

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-06-07 09:28:41 -07:00
Christopher Wiley
1ff75bde48 Add demonstration unittest for TetherInterfaceSM 
( cherry-pick of 1cc6ffd2b32846996520fdf43125da3ec2bbdf49 )

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-06-07 09:28:13 -07:00
Christopher Wiley
d289666924 Extract TetherInterfaceSM to its own class. 
( cherry-pick of e3f93b02bdfde6fffd2bcbb2e1dc0785ce9f8d5a )

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-06-07 09:21:45 -07:00
Christopher Wiley
e03fb4459c Make Tethering.TetherInterfaceSM more self contained 
( cherry-pick of 9a509ca728fbe264e1a5a6ccd5b39ffc0b5eceb4 )

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-06-07 09:14:59 -07:00
Christopher Wiley
b9cb7742ca Clean up class members in Tethering.TetherInterfaceSM 
( cherry-pick of 7b30e548a58ac96a23033db43c7aac79c86e938c )

Mark final fields as such.
Group mutex protected fields together with the mutex that protects them.
Always access mutex protected fields under the mutex.

Bug: 28798823
Change-Id: I96cdd5e063babb73e9f124107c5576c47801f34b
Test: Compiles, Wifi tethering continues to work on angler.
 2016-06-07 09:11:00 -07:00
Christopher Wiley
499a57ad11 Fix trivial warnings in Tethering.java 
( cherry-pick of 6d475970a200f162ba6845d25bb2a777bcaa611c )

Add some missing @Override annotations.
Use template arguments to avoid explicit casting.
Ignore unclosed IndentingPrintWriter in dump().

Bug: 28798823
Test: Compiles.

Change-Id: I2cb6eb384ca23057c8059f4842b1c0d8248d03f8
 2016-06-07 09:03:59 -07:00
Bill Yi
0118fbd3ef Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 2b92ce7aaa  -s ours

* commit '2b92ce7aaa5a0f22a742cd688488c8b8b05ce82b':
  Import translations. DO NOT MERGE

Change-Id: Iec4e17778428bdda04d9ea34010abbdfcfede9c5
 2016-06-07 03:21:09 +00:00
Andreas Gampe
ae702d305f Frameworks/base: Update compiled-classes-phone 
am: e16dc04bd8

* commit 'e16dc04bd82464a289eb00f807293c1da33c179c':
  Frameworks/base: Update compiled-classes-phone

Change-Id: I6a02ffbf03e5dc22b21c54cc24268f4e6b54459c
 2016-06-07 03:21:06 +00:00
Andreas Gampe
270657c8e7 Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 
am: ba94385e5f

* commit 'ba94385e5f8af1556755a7fa5c8e9c3bcb3e5fb0':
  Frameworks/base: Update preloaded-classes

Change-Id: Iaf5270f03ef6214b9d3064f19aa0219b422687c5
 2016-06-07 03:17:03 +00:00
TreeHugger Robot
2b92ce7aaa Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 03:13:22 +00:00
TreeHugger Robot
4ce8e19231 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 03:12:33 +00:00
Andreas Gampe
e16dc04bd8 Frameworks/base: Update compiled-classes-phone 
Another update.

Bug: 27248115
Change-Id: Ia208b37e9b9b649215ad1024ba0438627bc89f8a
 2016-06-07 03:12:03 +00:00
TreeHugger Robot
ba94385e5f Merge "Frameworks/base: Update preloaded-classes" into nyc-dev 2016-06-07 03:09:55 +00:00
Bill Yi
90c64f02f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f3d2c06146  -s ours

* commit 'f3d2c06146535052a6b901ac3707b0cab9b4dedd':
  Import translations. DO NOT MERGE

Change-Id: Ie6bc9da984bc94b51d091bf3a3b4c035ff83aba6
 2016-06-07 02:27:37 +00:00
Bill Yi
e4872d1849 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 93e807485e  -s ours

* commit '93e807485edc5de8b549b7d5a5ce7e52f5315094':
  Import translations. DO NOT MERGE

Change-Id: Ic44082939456434a33682a1f5c2cee4a0f4b3d9d
 2016-06-07 02:27:32 +00:00
TreeHugger Robot
c52adeb73f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 02:22:18 +00:00
TreeHugger Robot
f3d2c06146 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 02:22:01 +00:00
TreeHugger Robot
93e807485e Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 02:21:45 +00:00
TreeHugger Robot
ffe7746437 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 02:21:06 +00:00
Bill Yi
ac8ac265df Import translations. DO NOT MERGE 
Change-Id: I27585cc106f05b6718346375dc8231fc59409dfd
Auto-generated-cl: translation import
 2016-06-06 18:43:36 -07:00
Bill Yi
f0807602e7 Import translations. DO NOT MERGE 
Change-Id: I439834e3adbbd35aa0094caaf66776cf03e84276
Auto-generated-cl: translation import
 2016-06-06 18:38:01 -07:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Bill Yi
47f986f6c4 Import translations. DO NOT MERGE 
Change-Id: Ie4d854df968366efde752e7ebe89afbe5aa8183a
Auto-generated-cl: translation import
 2016-06-06 16:10:00 -07:00
Bill Yi
5ff0bd5c92 Import translations. DO NOT MERGE 
Change-Id: I53a52ba5b590a502a7e2dcdef540cd2e4baaffbe
Auto-generated-cl: translation import
 2016-06-06 16:00:06 -07:00
Bill Yi
2b92bcbdf2 Import translations. DO NOT MERGE 
Change-Id: I435f426fc53cd54df412c159c7016eb5cfe934a7
Auto-generated-cl: translation import
 2016-06-06 15:47:45 -07:00
Bill Yi
f6620acbe0 Import translations. DO NOT MERGE 
Change-Id: Ia47328b8bfe256eb0fe17b869b8bbcce19ff2cd2
Auto-generated-cl: translation import
 2016-06-06 15:28:06 -07:00
Joe Fernandez
ecc2b7ac26 docs: Update Android Dashboard for June 2016 am: ab59c24004 am: b3ad0e05a8 
am: 91131f459c

* commit '91131f459c490d735ccc57392c6e4ccac667826e':
  docs: Update Android Dashboard for June 2016

Change-Id: I12062a187d6aa0bfd0d005b7fe22c190b7a06f56
 2016-06-06 22:18:17 +00:00
Joe Fernandez
91131f459c docs: Update Android Dashboard for June 2016 am: ab59c24004 
am: b3ad0e05a8

* commit 'b3ad0e05a82cb53678a0fdbbcd45ed09b0cfdeed':
  docs: Update Android Dashboard for June 2016

Change-Id: I81e5cf24ecb6616ac4d6f89a160dfba0c5fba7a0
 2016-06-06 22:13:10 +00:00
Joe Fernandez
b3ad0e05a8 docs: Update Android Dashboard for June 2016 
am: ab59c24004

* commit 'ab59c240040448a51b3cb3b3cd8ec97e96cf6d80':
  docs: Update Android Dashboard for June 2016

Change-Id: If7daf8d73b8653b02f6f3f682c136947f25bec80
 2016-06-06 22:08:01 +00:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant." 
This reverts commit 04073dc5be4c8faad41f549617ed1c3ef999d6b2.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
 2016-06-06 22:04:54 +00:00
Andreas Gampe
cbcb9e3ec6 Frameworks/base: Update preloaded-classes 
Another update.

Bug: 27248115
Change-Id: Ie0c3b8624a0f43c400a71759c176c02c56d270af
 2016-06-06 14:58:44 -07:00
Joe Fernandez
ab59c24004 docs: Update Android Dashboard for June 2016 
Change-Id: Iec84a33d5bc456e5feaf7dcee0880035c9b7c559
 2016-06-06 14:56:23 -07:00
TreeHugger Robot
56760c65df Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev 2016-06-06 20:11:52 +00:00
Jae Seo
6cb63622e3 Merge "TIF: Set the surface secure" into nyc-dev 
am: 9675f16bba

* commit '9675f16bba6837840038aea92e9db5893cecd33e':
  TIF: Set the surface secure

Change-Id: Iae2496a4b761b7635c49272b0611bec7db4b9040
 2016-06-06 19:58:30 +00:00
smain@google.com
8730f3a1d1 add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe am: 78483fdc3d 
am: 894e7b6f78

* commit '894e7b6f78cf9f336242d3b75c99a448e232f4da':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I0b1956c103ff0f6a843891c415b179103220e6e2
 2016-06-06 19:55:40 +00:00
Jae Seo
9675f16bba Merge "TIF: Set the surface secure" into nyc-dev 2016-06-06 19:55:29 +00:00
smain@google.com
894e7b6f78 add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 am: 7573c42dbe 
am: 78483fdc3d

* commit '78483fdc3d624401f32f9574d1800a6ccbf09428':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: Ia027c9e91353b781f0a8334527bed4e6528e7c35
 2016-06-06 19:51:08 +00:00
smain@google.com
78483fdc3d add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576 
am: 7573c42dbe

* commit '7573c42dbed65334ef3d86a06dd861a01f6d0ed4':
  add redirect for removed dupe logcat page per: https://critique.corp.google.com/#review/122118806 bug: 29122576

Change-Id: I8c81af0e1aab745ed10dbc8916edd22e7d3dd1a9
 2016-06-06 19:45:55 +00:00
smain@google.com
7573c42dbe add redirect for removed dupe logcat page 
per: https://critique.corp.google.com/#review/122118806
bug: 29122576

Change-Id: Icf4f559bb7d246d4f340c15a55580e9248806cee
 2016-06-06 12:40:51 -07:00
Adarsh Fernando
8a95c3d6d3 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev 
am: 90eece4a77

* commit '90eece4a7765c6574c9e5b21b258bff69e32fa4b':
  DOCS: Updated Java 8 language support list with Type Annotations.

Change-Id: If4927acde9ecabc934306c8ab001ed7eec4795d5
 2016-06-06 19:35:45 +00:00
Adarsh Fernando
90eece4a77 Merge "DOCS: Updated Java 8 language support list with Type Annotations." into nyc-dev 2016-06-06 19:30:53 +00:00
Guang Zhu
217e152229 Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 
am: 56cf05291e

* commit '56cf05291e1ffb54025a47ccb046f44c2d05ef14':
  migrate documents UI tests to use AndroidJUnitRunner

Change-Id: If5e573f0fdb7d9ff8e70f4172fb0adf38c2b552a
 2016-06-06 19:27:52 +00:00
Guang Zhu
56cf05291e Merge "migrate documents UI tests to use AndroidJUnitRunner" into nyc-dev 2016-06-06 19:22:32 +00:00
Ben Lin
8454626813 Merge "Adding docsui prefix to access metric tags." into nyc-dev 
am: de862e1cc8

* commit 'de862e1cc82d96d22394201cb8867b643e4f2e93':
  Adding docsui prefix to access metric tags.

Change-Id: Id3dc690e4f753af51acb406565c643d2fdc01ec1
 2016-06-06 18:08:07 +00:00
Ben Lin
de862e1cc8 Merge "Adding docsui prefix to access metric tags." into nyc-dev 2016-06-06 18:04:12 +00:00
Stuart Scott
9abc2735fa Add carrier config key for carrier setup app. 
bug:28374700
bug:28374253
Change-Id: Icf56d4d2a89e32a062f3b8cc624f17e06c994599
 2016-06-06 10:42:18 -07:00
Todd Kennedy
f1e788dfce Merge "New non-priv prebuilt" into nyc-dev 
am: 262ff10eb2

* commit '262ff10eb2d373e95677d2c9bead794dc4a43805':
  New non-priv prebuilt

Change-Id: Ifc6f3b0292b9919d24f79d8cd8193845c72aa1ff
 2016-06-06 16:45:57 +00:00
Todd Kennedy
262ff10eb2 Merge "New non-priv prebuilt" into nyc-dev 2016-06-06 16:42:32 +00:00
Todd Kennedy
317d352de3 New non-priv prebuilt 
Need to target API 24 and not 'N'

Bug: 29116156
Change-Id: Iec215f41147ca13e955b02dc57eaabee89589cf0
 2016-06-06 09:38:49 -07:00
Narayan Kamath
23dca60005 PackageManager: Rename foreign use markers on app installation. 
am: 110a12dff1

* commit '110a12dff13276baa12e8587449a1a7f3a318451':
  PackageManager: Rename foreign use markers on app installation.

Change-Id: I9b3450fe63781dff6c7b36053019a98e135ca71d
 2016-06-06 16:11:51 +00:00