Commit Graph

342277 Commits

Author SHA1 Message Date
TreeHugger Robot
c083f81cd0 Merge "Quiet keymap validation." 2017-09-05 18:16:54 +00:00
Bryce Lee
9840ea9ab9 Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev am: 32b477db15
am: e6a5f1c9d6

Change-Id: I12e71687671c86137e6e0a33ecfde4cb9582a510
2017-09-05 17:35:14 +00:00
Bryce Lee
e6a5f1c9d6 Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev
am: 32b477db15

Change-Id: I615181873ab71e8526556967ae62730633c9f003
2017-09-05 17:17:20 +00:00
Todd Kennedy
bdb4bc4fc0 Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev am: 8bb58a145c
am: ad64df2bac

Change-Id: I7fab82efe230dea393fa4b12c9c7ea71c44243fe
2017-09-05 17:00:43 +00:00
TreeHugger Robot
32b477db15 Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev 2017-09-05 17:00:06 +00:00
Abodunrinwa Toki
7c5df649d7 Merge "Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs." into oc-mr1-dev am: f28b8a8de3
am: 48063322b4

Change-Id: I23f8204732f1f166aacf10d5d147bd3f21025c6b
2017-09-05 16:51:19 +00:00
Todd Kennedy
ad64df2bac Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev
am: 8bb58a145c

Change-Id: Ic64dde3af1d7edcc75513b76c86ce8d8b8f083de
2017-09-05 16:43:19 +00:00
Mathieu Chartier
7f4bfc3980 Merge "Move to using a profile for boot image" into oc-mr1-dev am: 4c1ad8fce4
am: b75b5b10b6

Change-Id: I4bcc321959070ad7d8dea242a11d83afeeb7fac6
2017-09-05 16:36:27 +00:00
Abodunrinwa Toki
48063322b4 Merge "Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs." into oc-mr1-dev
am: f28b8a8de3

Change-Id: I9d9f590d9c1e133ca895c830525f118adccfe92a
2017-09-05 16:35:07 +00:00
TreeHugger Robot
8bb58a145c Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev 2017-09-05 16:28:13 +00:00
Mathieu Chartier
b75b5b10b6 Merge "Move to using a profile for boot image" into oc-mr1-dev
am: 4c1ad8fce4

Change-Id: I66135de97d98775972d50b74e8221d953763182e
2017-09-05 16:19:12 +00:00
Adrian Roos
27631fabde Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev am: 14506c8806
am: 69ce71a11c

Change-Id: I81246205a12c9edb059a8a7926dfeef8e6a78125
2017-09-05 16:17:05 +00:00
TreeHugger Robot
f28b8a8de3 Merge "Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs." into oc-mr1-dev 2017-09-05 16:14:13 +00:00
Adrian Roos
69ce71a11c Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev
am: 14506c8806

Change-Id: Ia7c5e551741107b04b4214a4a5e33fe982a68941
2017-09-05 15:59:16 +00:00
Mathieu Chartier
4c1ad8fce4 Merge "Move to using a profile for boot image" into oc-mr1-dev 2017-09-05 15:55:52 +00:00
Adrian Roos
14506c8806 Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev 2017-09-05 15:39:17 +00:00
Hugo Benichi
dc168546df Merge "ConnectivityService: improve wakelock logging" am: d8f298365a am: 07f66ed517 am: 2cc55fb4f7 -s ours
am: 27805ce0b1  -s ours

Change-Id: Ied1abbaceeae30a5006b17c77969d3c08872ff12
2017-09-05 14:56:11 +00:00
Hugo Benichi
27805ce0b1 Merge "ConnectivityService: improve wakelock logging" am: d8f298365a am: 07f66ed517
am: 2cc55fb4f7  -s ours

Change-Id: Iffd07eab1b85603aa935c4253c526fa4dc2ff745
2017-09-05 14:38:29 +00:00
Mike Reed
563297979f Merge "Switch default renderer to back to Skia's OpenGL pipeline once more." 2017-09-05 14:25:48 +00:00
Hugo Benichi
2cc55fb4f7 Merge "ConnectivityService: improve wakelock logging" am: d8f298365a
am: 07f66ed517

Change-Id: I780d4d8b622935fe1b356e823333199c0212fb5d
2017-09-05 14:19:49 +00:00
Hugo Benichi
07f66ed517 Merge "ConnectivityService: improve wakelock logging"
am: d8f298365a

Change-Id: I85f8b34008416c920f85e1e5d923dd324dd89e5e
2017-09-05 14:01:20 +00:00
Treehugger Robot
d8f298365a Merge "ConnectivityService: improve wakelock logging" 2017-09-05 13:46:53 +00:00
Hugo Benichi
7674fcecaf Merge "Nat464Xlat: correct racefree teardown" am: e6793f2795 am: a1af47b6ad am: e92029d894
am: f6c74c5362

Change-Id: Id0194eddfd99bb6287b599d22a031c60085521f7
2017-09-05 13:24:43 +00:00
Abodunrinwa Toki
fadd4288df Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs.
This field is now being used for new smart selection logging.
See: Icc9d5b542140bdb01b2ad4211048bd83eae2ce83

Bug: 64914512
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit CtsAccessibilityServiceTestCases:android.accessibilityservice.cts.AccessibilityTextTraversalTest
Change-Id: If1ce8ca038b089500cd7adb9a146330abe909407
2017-09-05 14:19:52 +01:00
Derek Sollenberger
04f1f01139 Switch default renderer to back to Skia's OpenGL pipeline once more.
Bug: 63910712
Test: CtsGraphicsTestCases, CtsUiRenderingTestCases, CtsViewTestCases
Change-Id: Idb862a0dece6b13dc7a105f6a47e4e33911ecc4a
2017-09-05 13:12:19 +00:00
Hugo Benichi
f6c74c5362 Merge "Nat464Xlat: correct racefree teardown" am: e6793f2795 am: a1af47b6ad
am: e92029d894

Change-Id: Ibafea69224e832a6316c17dbb9b2d62a233088ac
2017-09-05 13:06:59 +00:00
Hugo Benichi
e92029d894 Merge "Nat464Xlat: correct racefree teardown" am: e6793f2795
am: a1af47b6ad

Change-Id: Icb2dc8229b5ea45e319233b588f2dbe39ea40d4c
2017-09-05 12:48:04 +00:00
Hugo Benichi
c3318aa3dd ConnectivityService: improve wakelock logging
This patch adds the following wakelock related counters to connectivity
service dumps included in bug reports:
 - total number of wakelok acquisitions and releases
 - total cumulative wakelock duration
 - longest time the lock was held

Bug: 65085354
Test: runtest frameworks-net, also manually dumped connectivity service
      and check new logging

Merged-In: I8f67750c2eea73abf3d44f7f6df484427a8ea3f9
Merged-In: I93c0eb7c8add966378647400e11e33765d952345
Merged-In: Iabe99993001e069b8a8077533bca1fa7fb2f59ba

(cherry picked from commit 26bcfa19d0)

Change-Id: I4d6bb43110916b440819813b478523546ac5570e
2017-09-05 21:34:03 +09:00
Hugo Benichi
a1af47b6ad Merge "Nat464Xlat: correct racefree teardown"
am: e6793f2795

Change-Id: I8612db5e5050690db8cf41dd04944b4c22da340c
2017-09-05 12:30:08 +00:00
Hugo Benichi
e6793f2795 Merge "Nat464Xlat: correct racefree teardown" 2017-09-05 12:12:02 +00:00
Abodunrinwa Toki
ac1d112c4b Merge "TextView text selection interaction logging." into oc-mr1-dev am: 563a5637d7
am: d0470d7ebd  -s ours

Change-Id: I72ee3925ace66684dde8925e67d9352d36bdd82f
2017-09-05 11:05:01 +00:00
Abodunrinwa Toki
d0470d7ebd Merge "TextView text selection interaction logging." into oc-mr1-dev
am: 563a5637d7

Change-Id: Ie9a211b657d9fa370db699d9c11ad553ab5f22d6
2017-09-05 10:50:14 +00:00
TreeHugger Robot
563a5637d7 Merge "TextView text selection interaction logging." into oc-mr1-dev 2017-09-05 10:33:18 +00:00
TreeHugger Robot
1b6f93c10c Merge "TextView text selection interaction logging." 2017-09-05 10:28:35 +00:00
Lorenzo Colitti
581067a32a Merge "Switch tethering stats from the unix socket to binder." am: cbe8f09817 am: 6c05f1a03d am: d8a037ad5e
am: 6620b3c55b

Change-Id: Ic377053f7fb527b59931c14cd7e2247445716865
2017-09-05 10:21:06 +00:00
Lorenzo Colitti
6620b3c55b Merge "Switch tethering stats from the unix socket to binder." am: cbe8f09817 am: 6c05f1a03d
am: d8a037ad5e

Change-Id: I4308d9d73974d784999521c36c8ead26de3f7b8b
2017-09-05 10:03:34 +00:00
Lorenzo Colitti
d8a037ad5e Merge "Switch tethering stats from the unix socket to binder." am: cbe8f09817
am: 6c05f1a03d

Change-Id: Idc67abffd19db1cd03568918084b7ef86e17f801
2017-09-05 09:49:28 +00:00
Lorenzo Colitti
6c05f1a03d Merge "Switch tethering stats from the unix socket to binder."
am: cbe8f09817

Change-Id: If1c8db9447cd066c9800b68c8255ee248125b536
2017-09-05 09:26:26 +00:00
Treehugger Robot
cbe8f09817 Merge "Switch tethering stats from the unix socket to binder." 2017-09-05 09:17:46 +00:00
Adrian Roos
c21891284b AOD Policy: Fix pausing timeout to use minutes instead of seconds
Bug: 65010918
Change-Id: I2a5f3a2109a38d7093fd0ea84fbb1026eb6c1215
Test: On AOD cover prox for 10s. Verify screen turns off.
2017-09-05 09:15:27 +00:00
Hugo Benichi
5e31a263f1 Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev am: 2dac2cce5a
am: 74803645af

Change-Id: Iabe99993001e069b8a8077533bca1fa7fb2f59ba
2017-09-05 08:39:54 +00:00
Hugo Benichi
74803645af Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev
am: 2dac2cce5a

Change-Id: I93c0eb7c8add966378647400e11e33765d952345
2017-09-05 08:16:21 +00:00
TreeHugger Robot
2dac2cce5a Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev 2017-09-05 07:57:00 +00:00
Hugo Benichi
ef502887ec Nat464Xlat: correct racefree teardown
This patch relays the NetworkBaseObserver notifications about nat
464xlat stacked interfaces onto the ConnectivityService handler.

This allows to process interface up and down notifications in the
same thread context and eliminates several races:

  - NPE risk due to race between fixupLinkProperties called on
    ConnectivityService thread and interfaceRemoved called on
    NetworkManagementService thread.
  - stale LinkProperties pointer reads in both NetworkBaseObserver
    callbacks not called on ConnectivityService handler.
  - removes the race between stop() and interfaceRemoved().
  - removes superfluous LinkProperties notifications when stop() is
    called before the stacked interface goes up.

The teardown procedure logic common to stop() and interfaceRemoved() is
put into enterStoppedState() and enterIdleState().

This allows to distinguish and correctly handle the following teardown
scenarios:
 - an IPv4 appears -> ConnectivityService calls Nat464Xlat#stop()
                   -> Nat464Xlat calls stopClatd
                   -> clatd stops
                   -> if the stacked interface was up, it is removed
                   -> Nat464Xlat#interfaceRemoved() is triggered and
                      a LinkProperties update is sent.

 - network disconnects -> ConnectivityService calls Nat464Xlat#stop()
                       -> Nat464Xlat calls stopClatd
                       -> clatd stops
                       -> if the stacked interface was up, it is removed
                       -> Nat464Xlat#interfaceRemoved() is triggered and
                          a LinkProperties update is sent.

 - clatd crashes or exit -> Nat464Xlat#interfaceRemoved() is triggered
                         -> Nat464Xlat unregisters itself as a network
                            observer
                         -> ConnectivityService is updated about the
                            stacked interface missing, and restarts
                            Nat464Xlat if needed.

Note that the first two scenarios have two cases: stop() can be called
before the notification for the stacked interface going up (STARTED), or
after (RUNNING). In the first case, Nat464Xlat must unregister
immediately as a network observer to avoid leaks.

This patch also:
  - removes/simplifies comments related to the threading model which
    are no obsolete.
  - extract clatd management logic from ConnectivityService into
    NetworkAgentInfo
  - add new unit tests where there was none before.

Bug: 62918393
Bug: 62997041
Bug: 64571917
Bug: 65225023
Test: runtest frameworks-net
Change-Id: I27221a8a60fd9760b567ed322cc79228df877e56
2017-09-05 15:33:55 +09:00
Bryce Lee
9f6affdde2 Do not consider overlays when finding task to reuse.
An overlay should not be considered the top activity in a task when
considering a task when launching an activity. Doing so will alter
the behavior of launch modes, such as singleTop and singleTask. In
these cases, the developer has chosen such mode with the expectation
that their task will not have activities from other tasks placed on
top, which is the case for features such as locking a work profile.

This changelist addresses the issue by not considering an overlay to
be the top activity when finding a task based on ActivityRecord.

Fixes: 64839155
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests#testFindTaskWithOverlay
Change-Id: I2684baf6929e5af321404e2eef597f456ff87ee8
2017-09-04 22:32:26 -07:00
Hugo Benichi
26bcfa19d0 ConnectivityService: improve wakelock logging
This patch adds the following wakelock related counters to connectivity
service dumps included in bug reports:
 - total number of wakelok acquisitions and releases
 - total cumulative wakelock duration
 - longest time the lock was held

Bug: 65085354
Test: runtest frameworks-net, also manually dumped connectivity service
      and check new logging

Change-Id: I8f67750c2eea73abf3d44f7f6df484427a8ea3f9
2017-09-05 14:24:13 +09:00
Erik Kline
6bbeeb92e2 Merge "Refactor interface IP code into InterfaceController" am: 9465abf8af am: 6a718fc858 am: 6fa8caab73
am: 4d4ff340af

Change-Id: I49886d9a40a5348353f026b4293813c6f3d66187
2017-09-05 02:27:42 +00:00
Erik Kline
4d4ff340af Merge "Refactor interface IP code into InterfaceController" am: 9465abf8af am: 6a718fc858
am: 6fa8caab73

Change-Id: I1882be43dce90cac8a2a6fcf34dc534c64bd4e7d
2017-09-05 02:09:06 +00:00
Lorenzo Colitti
563dc45581 Switch tethering stats from the unix socket to binder.
Bug: 32163131
Bug: 64995262
Test: builds
Change-Id: I673d76a8b0981302b5f6a14e97999cd7676d83ed
2017-09-05 10:52:47 +09:00
Erik Kline
6fa8caab73 Merge "Refactor interface IP code into InterfaceController" am: 9465abf8af
am: 6a718fc858

Change-Id: Ief793ba94226d007c53601fe081e483622148b77
2017-09-05 01:50:30 +00:00