Commit Graph

309172 Commits

Author SHA1 Message Date
Erik Kline
ea7e8f7352 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db
am: 663ec79cb2

Change-Id: Ib726fe85b816eccbc0beab555873b77f3454bc64
2017-02-14 06:25:47 +00:00
Erik Kline
663ec79cb2 Merge "Cleanup in the face of upstream error" am: ed6d75d5f3
am: 76e6f790db

Change-Id: I097318f3edc5257288d582a0f17744e1f984856c
2017-02-14 06:21:44 +00:00
Erik Kline
76e6f790db Merge "Cleanup in the face of upstream error"
am: ed6d75d5f3

Change-Id: If8dbf882bd8c4a8d53ae026d8f83a00a52590830
2017-02-14 06:17:38 +00:00
Gopinath Elanchezhian
027d72ebe6 Merge "Add Simulate maitanance mode in app startup test cases." 2017-02-14 06:17:36 +00:00
Erik Kline
ed6d75d5f3 Merge "Cleanup in the face of upstream error" 2017-02-14 06:09:22 +00:00
TreeHugger Robot
a4fad13438 Merge "Add missing final and @GuardedBy" 2017-02-14 06:03:02 +00:00
Svet Ganov
782043caf8 Refactor auto-fill
* Fix a layering issue where auto-fill manager which is in view
  depended on activity which is in app

* Moved auto-fill classes to view or service based on their
  purpose and removed dependecy on the classes in view to the
  classes in service

* Push state to local auto-fill manager whether auto-fill is
  enabled to avoid making IPC for every focus transition if
  the user did not enable the feature

* Remove unnecessary offload to messages when handling calls
  to auto-fill manager service as these are made over a oneway
  interface and in general they do almost no work and typically
  we do these on the binder thread

* Removed id from data set and fill response as the provider
  can embed everything it needs to id them in the auth pending
  intent

* Enforce the auth UI to be only an activity as this will work
  with multi-window, recents, and back and also does not require
  draw on top of other app special permission

* Authentication also no longer requires passing a remotable
  callback to the auth activity but the activity handles the
  request as if called for a result

* Handling stopping of a user to clean up in-memory state as
  well as handling when a user gets unlocked as a provider may
  be non-direct boot aware

* User the correct context when creating an auto-fill manager

* Move the receiver that listens for requests to hide system
  windows to the manager service as the UI is a singleton and
  no need every per-user state to register its own

* Removed extras from dataset as the only case a provider needs
  to associate state with a dataset is for auth and the provider
  can embed this data in the auth pending intent

Test: manual and CTS

Change-Id: I4bc54c13cf779d7f6fdb3ab894637f9fac73f603
2017-02-13 21:31:37 -08:00
Svetoslav Ganov
fc582f046b Merge "I will reimplement this correctly later - it conflicts with the CL with API changes and the deadline is tomorrow and I would like to avoid staying until midnight again." 2017-02-14 05:25:09 +00:00
Svetoslav Ganov
1e4dff2fa4 I will reimplement this correctly later - it conflicts with the CL with API changes and the deadline is tomorrow and I would like to avoid staying until midnight again.
Change-Id: I1ec11eee2bfbca5e833140136ca22768130c6c43
2017-02-14 05:22:29 +00:00
Philip Quinn
c4cc308c85 Add Secure setting for the assist gesture.
Test: make
Change-Id: I21c88c0b91043db3de46830044c434a21a0e6cc0
2017-02-13 20:18:16 -08:00
Badhri Jagan Sridharan
fa207eb889 Merge changes from topic 'pixel-c' into nyc-mr2-dev
am: dee514fae3

Change-Id: I4038d1fbd429fcedc4a379d764b5ef5c59dcce1d
2017-02-14 03:40:33 +00:00
TreeHugger Robot
dee514fae3 Merge changes from topic 'pixel-c' into nyc-mr2-dev
* changes:
  Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
  Fix handling usb dialog for wall chargers. [DO NOT MERGE]
2017-02-14 03:34:51 +00:00
Erik Kline
8ea45483fc Cleanup in the face of upstream error
If either enableNat() or startInterfaceForwarding() fail, be sure
to cleanup any commands that might have succeeded.

Most of this change is a refactoring of cleanupUpstreamIface() into
two methods, one of which (cleanupUpstreamInterface()) is reused
in error handling scenarios.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest -x .../tethering/TetherInterfaceStateMachineTest.java passes
Bug: 32031803
Bug: 32163131

Change-Id: Ia4d56e03beeab1908d8b8c2202e94992f1aa58a4
2017-02-14 12:20:39 +09:00
TreeHugger Robot
f4de7400fd Merge "Use floating bar to show authentication sign-in request." 2017-02-14 03:17:40 +00:00
TreeHugger Robot
858a5d9958 Merge "Ensure network connectivity on app start." 2017-02-14 03:09:36 +00:00
TreeHugger Robot
d7fd4aff66 Merge "Add metrics for settings" 2017-02-14 03:01:31 +00:00
TreeHugger Robot
c2b2d8ee9b Merge "Camera: Update doc to allow unchanged configs in finalizeOutputConfigs" 2017-02-14 02:33:17 +00:00
Ningyuan Wang
58e6fe321f Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586 am: 9d1be09462
am: c2c718b717

Change-Id: I82b27a1b4f0891d1153efdfb0058fe10b533316c
2017-02-14 02:32:04 +00:00
Yohei Yukawa
b37d8bddc9 Add missing final and @GuardedBy
This is a follow up CL to my previous CL [1], where I forgot to add
final and @GuardedBy to InputMethodManagerService#mStartInputMap.

 [1]: I9921b381e02106dbffff5e0b3d13f0a1245ce807
      6db3bfe33d

Test: Compile
Bug: 35079353
Change-Id: I29897752e16573a27bf700b1d822889789c35292
2017-02-13 18:29:05 -08:00
Ningyuan Wang
c2c718b717 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586
am: 9d1be09462

Change-Id: If221ae36424377501677f70a3601509328268604
2017-02-14 02:28:30 +00:00
Ningyuan Wang
9d1be09462 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1
am: 18b3a7f586

Change-Id: Iea1e8282f0a9d2b58d48ab67dd856fafce95daf0
2017-02-14 02:24:30 +00:00
Ningyuan Wang
18b3a7f586 Merge "Create createFromByteArray() for WifiSsid"
am: fb19d8d7c1

Change-Id: I8b88c2259950b81b452452a2b56fd0ceaf2b7180
2017-02-14 02:20:23 +00:00
TreeHugger Robot
722ba4c751 Merge "Update display contents when metrics change" 2017-02-14 02:16:35 +00:00
Ningyuan Wang
fb19d8d7c1 Merge "Create createFromByteArray() for WifiSsid" 2017-02-14 02:13:34 +00:00
Android Build Merger (Role)
2d9a5ce004 Merge "Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382 am: 60ca278b7f am: b4f9ceb912 -s ours" 2017-02-14 01:58:41 +00:00
Chen Xu
be49b2080f Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382 am: 60ca278b7f
am: b4f9ceb912  -s ours

Change-Id: I2064449244f285bd707e18582d1830a286a729b3
2017-02-14 01:57:10 +00:00
TreeHugger Robot
29f341a2bb Merge "Deprecate openTile method." 2017-02-14 01:55:52 +00:00
Chen Xu
b4f9ceb912 Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382
am: 60ca278b7f

Change-Id: I13a38eb6094899e396d079e13e07e15d1cb5ca98
2017-02-14 01:46:33 +00:00
Badhri Jagan Sridharan
e8b0e11371 Introduce debounce to filter rapidly toggling type-c ports [DO NOT MERGE]
Type-c ports can quickly toggle between connected/disconnected
states. Introduce debounce to prevent sending spurious notifications.

Bug: 34972898
Test: notification should not be queued for a pixel-c charger not connected
to the power outlet.
Change-Id: I4aa19f9f864fe5b77e65f6a07a3184d8aba1f5fc
2017-02-13 17:44:11 -08:00
Badhri Jagan Sridharan
8b0807c789 Fix handling usb dialog for wall chargers. [DO NOT MERGE]
UsbPort.POWER_ROLE_SINK is orthogonal to the type of the charger
attached. POWER_ROLE_SINK would be the case for AC charging and
USB charging. Therefore query BatteryManager for the charger
type.

Bug: 34972898
Test: Charging notification should not show for pixel-c chargers.
Change-Id: I8dddcd7727b6af973bd173d2c6e325aa4be2ca3a
2017-02-13 17:44:05 -08:00
Chen Xu
60ca278b7f Merge "Add simActivationState to PhoneStateListener" am: 132842efc9
am: b206f5b382

Change-Id: I3feca80a72ee4a7ef3fe1583aa563451b91a68f4
2017-02-14 01:42:00 +00:00
Andy Hung
27b35add5c Merge "VolumeShaper: Initial implementation" 2017-02-14 01:39:00 +00:00
TreeHugger Robot
3400795aec Merge "Propagate setImeWindowStatus() to WMS" 2017-02-14 01:38:07 +00:00
Chen Xu
b206f5b382 Merge "Add simActivationState to PhoneStateListener"
am: 132842efc9

Change-Id: I0b35d7d8f5b6237ff55aaab0cab0b86d75699a7a
2017-02-14 01:34:02 +00:00
Sergey Vasilinets
2eaae562fe Merge "DeferredLayerUpdater: clean up Layer lifecycle" 2017-02-14 01:28:26 +00:00
Chen Xu
132842efc9 Merge "Add simActivationState to PhoneStateListener" 2017-02-14 01:26:19 +00:00
TreeHugger Robot
171ef98df6 Merge "Fix interaction w/ work profile & last chosen" 2017-02-14 01:24:19 +00:00
Sudheer Shanka
27e6931583 Ensure network connectivity on app start.
Bug: 27803922
Test: cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests
Change-Id: Ifd7a52924cd6bbc809c9a3f92d52fe2df09b7fe2
2017-02-13 17:17:41 -08:00
Amith Yamasani
b916301d80 Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: ee37330dff" into nyc-mr2-dev-plus-aosp
am: b8aac6758b  -s ours

Change-Id: I0c9b341f62533e895c104c2f14ed911476b58eef
2017-02-14 01:13:53 +00:00
Amith Yamasani
985fefd012 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: 67dbaa8a14
am: 669d6694e1  -s ours

Change-Id: I29ab0714044a68b1faac50ae12398bf86bfd3a88
2017-02-14 01:12:55 +00:00
Android Build Merger (Role)
b8aac6758b Merge "Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18 am: ee37330dff" into nyc-mr2-dev-plus-aosp 2017-02-14 01:10:31 +00:00
TreeHugger Robot
69c26226e1 Merge "Follow-up to I61640146 Remove duplicate check." 2017-02-14 01:09:44 +00:00
Amith Yamasani
05d24ccdb5 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18
am: ee37330dff

Change-Id: I9f75a9309a91de3a6145861189534c8ab10ca6f3
2017-02-14 01:09:39 +00:00
Amith Yamasani
669d6694e1 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5 am: c510e19d18
am: 67dbaa8a14

Change-Id: Ie554aec3a777468b8dc7da731337ffbdb2851846
2017-02-14 01:07:53 +00:00
Michael Kwan
ae786f548a Merge "Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 am: d56887f8fa" into nyc-mr2-dev-plus-aosp
am: a0dff34532

Change-Id: I461d442072c42aa4feac58c68dac068f6bb61d67
2017-02-14 01:07:12 +00:00
Michael Kwan
321ceda49f Merge "Only modify window layout params when necessary." into cw-f-dev am: 9fbd981f23 am: a26e371c9b
am: 49fa0405b1

Change-Id: Iadf40b31d57157bc1303102b6afc38d23afc3996
2017-02-14 01:06:03 +00:00
Mady Mellor
434180ce51 Fix notification shelf icon showing on top of snooze leave behind
Also fixes an issue where the guts closed listener would always call
onHeightChanged because the notification isn’t marked as removed
until after the listener gets called.

Fixes: 34866027
Test: Manual - have one notification, snooze it
Change-Id: Ic67bdb353b8bb5df8bdaaf6d3e71ade7da05ee46
2017-02-13 17:04:27 -08:00
Amith Yamasani
67dbaa8a14 Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5
am: c510e19d18

Change-Id: I532b675a10ae9e21f28f3aa38d0f2e85ac080faa
2017-02-14 01:02:54 +00:00
Amith Yamasani
ee37330dff Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5
am: c510e19d18

Change-Id: I367d15ea4ab849ee16e58d08793dc7971304740f
2017-02-14 01:02:53 +00:00
TreeHugger Robot
ccb258d001 Merge "Added more logging on BugreportProgressService." 2017-02-14 01:01:31 +00:00