28949 Commits

Author SHA1 Message Date
Christopher Tate
b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev
am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11
2017-04-14 19:09:27 +00:00
TreeHugger Robot
28dab313ee Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev 2017-04-14 19:04:35 +00:00
Julia Reynolds
00ac29e3dd Merge "Synchronize access to ranking helper records." into oc-dev
am: bf777d46f2

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be
2017-04-14 18:56:18 +00:00
TreeHugger Robot
bf777d46f2 Merge "Synchronize access to ranking helper records." into oc-dev 2017-04-14 18:52:40 +00:00
Julia Reynolds
7e0a00e387 Merge "Lock access to managed services." into oc-dev
am: 8ac1452288

Change-Id: I425a6ee8a3f89149e87ce8269d679acc27363793
2017-04-14 18:34:01 +00:00
TreeHugger Robot
8ac1452288 Merge "Lock access to managed services." into oc-dev 2017-04-14 18:28:38 +00:00
Tsukasa Hashimoto
4ae323995d Merge "Add PID info into ANR crash log header" am: 2fe972c822 am: 5d57502c89
am: 5dbe26f0f1

Change-Id: I692162bdee8a93d49cd41967939aaab9f4c33224
2017-04-14 18:19:22 +00:00
Tsukasa Hashimoto
5dbe26f0f1 Merge "Add PID info into ANR crash log header" am: 2fe972c822
am: 5d57502c89

Change-Id: I5fc92088c55fed713716ea516a3b22e7cf00fcb0
2017-04-14 18:13:50 +00:00
Treehugger Robot
2fe972c822 Merge "Add PID info into ANR crash log header" 2017-04-14 18:03:12 +00:00
Wale Ogunwale
7654775b8a Merge "Move stack to front in-sync with task reparenting" into oc-dev
am: c4555784be

Change-Id: Ia9ea6523bb84c8ca4fbdd02da888a3ffef8dc543
2017-04-14 17:41:52 +00:00
Wale Ogunwale
c4555784be Merge "Move stack to front in-sync with task reparenting" into oc-dev 2017-04-14 17:33:03 +00:00
Daniel Nishi
33f74edaa4 Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c
2017-04-14 17:18:40 +00:00
Daniel Nishi
864d53d6fc Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev 2017-04-14 17:11:30 +00:00
Julia Reynolds
4401196798 Synchronize access to ranking helper records.
Fixes: 36282438
Test: fix is mostly hypothetical. did try clearing data
on a lot of apps while a backup was in process.

Change-Id: I58977a972d187bce2c013d55a95298b23bc0eda8
2017-04-14 17:06:03 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
2017-04-14 17:04:19 +00:00
Julia Reynolds
00314d97e9 Lock access to managed services.
Fixes: 35873807
Test: manual, set a notification to enqueue once a second for a few
minutes while also repeatedly granting and denying notification listener
access to a couple of apps in Settings and verifying
that nothing crashes and log is clean.

Change-Id: I15f429d61bf5f9ad639e524a94288a6d2db2cb56
2017-04-14 12:59:47 -04:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Wale Ogunwale
2719cc134e Move stack to front in-sync with task reparenting
When reparenting a task to another stack have window manager move the
destination stack to the front at the same time it is reparenting the
task if REPARENT_MOVE_STACK_TO_FRONT is set to avoid jank.

Test: manual
Bug: 37299899
Change-Id: I45678e742188a4871f93a11178f7ab2b60c7bcc3
2017-04-14 09:45:27 -07:00
Alan Viverette
51efddbd3b Remove unnecessary casts on calls to findViewById
Just frameworks/ this time. More paths to come.

Bug: 24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
2017-04-14 11:15:50 -04:00
Hugo Benichi
a622b24d3a Merge "Captive portal: rotate fallback urls" into oc-dev 2017-04-14 12:28:42 +00:00
Jorim Jaggi
27af670d9a Merge "Implement new splash screen API" into oc-dev
am: 46ae660bf2

Change-Id: I2f12289fcf82754a46365d0342997ae7bf59a2f8
2017-04-14 12:02:08 +00:00
TreeHugger Robot
46ae660bf2 Merge "Implement new splash screen API" into oc-dev 2017-04-14 11:54:47 +00:00
Andrew Scull
d4be031c76 Merge "Service for OEM lock management." into oc-dev
am: e52a1bfede

Change-Id: I074e29147417d6a358fd97e7e60cd4cfbed5c4df
2017-04-14 11:43:03 +00:00
Andrew Scull
e52a1bfede Merge "Service for OEM lock management." into oc-dev 2017-04-14 11:31:06 +00:00
Hugo Benichi
35025da669 Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Merged-In: I3c010bfee5b99db03a500776fbf47959a29d0578

(cherry picked from commit eef918a66c984ac7bb1f541665f4dc9bb88ea7ac)

Change-Id: If4d9a091c3a04a33895032d9b0d05c1dc66968e7
2017-04-14 08:16:37 +00:00
Hugo Benichi
43cdbc943d Merge "Captive portal: rotate fallback urls" am: 76b3537dfd am: 605eafe0a5
am: 4479901ff3

Change-Id: I7d20b9f247a30920df1938b680e63bc1739e1fa9
2017-04-14 07:07:46 +00:00
Hugo Benichi
4479901ff3 Merge "Captive portal: rotate fallback urls" am: 76b3537dfd
am: 605eafe0a5

Change-Id: I456d8a2af20dc2fa1553e0e27ec0280380ae6f38
2017-04-14 07:00:41 +00:00
Winson Chung
3a32d35723 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev
am: 2e86be7653

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14
2017-04-14 05:22:04 +00:00
Winson Chung
2e86be7653 Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev 2017-04-14 05:12:54 +00:00
Winson Chung
7031cdda50 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev
am: 4191d99614

Change-Id: I257467c0f950af3a1b27bbff21e466323babe513
2017-04-14 04:50:03 +00:00
TreeHugger Robot
4191d99614 Merge changes I789945c1,I532b0928,I62c6df8b,Ib2bd81ad into oc-dev
* changes:
  Fixing missing movement bounds notification to SystemUI.
  Fixing animating bounds regression.
  Tightening up rotation behavior for PIP (2/3)
  Tightening up rotation behavior for PIP (1/3)
2017-04-14 04:39:01 +00:00
Dmitry Dementyev
11e1805ab3 Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
am: 2a30085e5c

Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
2017-04-14 04:33:27 +00:00
Hugo Benichi
ed1e91e4f4 Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
am: 0e8090b10e

Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc
2017-04-14 04:32:17 +00:00
Christopher Tate
637c5b11a3 Merge "Turn down dynamic toggle for background restriction policy" into oc-dev
am: 59047acea7

Change-Id: Ibd345b735d1743f2c253bc0d0937a44573343dd0
2017-04-14 04:28:31 +00:00
Andreas Huber
71a840befa Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
am: 9b2ed2b7c4

Change-Id: Ibc670da31571add92a312b7673be376be67f9072
2017-04-14 04:17:37 +00:00
TreeHugger Robot
2a30085e5c Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev 2017-04-14 03:53:52 +00:00
TreeHugger Robot
0e8090b10e Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
* changes:
  Connectivity metrics: add transports to connect stats
  Connectivity metrics: log DnsEvents in-band
2017-04-14 03:43:02 +00:00
TreeHugger Robot
59047acea7 Merge "Turn down dynamic toggle for background restriction policy" into oc-dev 2017-04-14 03:00:24 +00:00
Jorim Jaggi
7d0d102752 Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests

Bug: 37252694
Change-Id: Ie2aec4764d958086897296ed0fc3c39c55c4d8aa
Merged-In: I9a5bc19b8f63312e682e536500411e4ff4639f88
2017-04-13 19:43:45 -07:00
Lorenzo Colitti
d6af00f5e4 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
2017-04-14 11:37:12 +09:00
Winson Chung
32c566fe6e Fixing missing movement bounds notification to SystemUI.
- When WM updates from a configuration change, ensure that we update the
  pinned stack controller even if there is currently no pinned stack.
- Also finish the menu activity once an activity is unpinned.

Bug: 36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I789945c1783693cf4b4e3d6663548c8669784001
2017-04-13 19:27:31 -07:00
TreeHugger Robot
9b2ed2b7c4 Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 2017-04-14 02:13:27 +00:00
Hugo Benichi
5eb9053c4e Connectivity metrics: add transports to connect stats
This patch groups connect() events per netId. It adds netid and
transport information to serialized ConnectStatistics events.

Test: updated NetdEventListenerServiceTest
      updated IpConnectivityMetricsTest
      $ runtest frameworks-net passes
Bug: 34901696
Change-Id: Id0d536ff723ded5c26eafe0bb138ba75ba2856c5
Merged-In: I4769496383943e714a1d350c298e093c2ed57477

(cherry picked from commit dfc2cc5857199345e08f07977b79b20292f964a2)
2017-04-14 01:44:52 +00:00
Hugo Benichi
2a5cfb9738 Connectivity metrics: log DnsEvents in-band
This patch changes how DnsEvents are logged in IpConnectivityMetrics.
The following changes are made:
 - DnsEventBatch are not logged after 100 queries on the same network
    - this allows to merge DnsEvent and DnsEventBatch into one class
 - DnsEventBatch are not logged after a network disconnect
    - this allows to remove the NetworkCallback
 - DnsEvent are now logged similarly to ConnectStats when statistics are
   flushed, in a direct call from IpConnectivityMetrics into
   NetdEventListenerService, in a direct call from IpConnectivityMetrics
   into NetdEventListenerService.
    - this allows to remove the Parcelable implementation of DnsEvent
 - transports information is added to DnsEvent.

Test: - simplified NetdEventListenerServiceTest covering dns logging
      - updated IpConnectivityEventBuilderTest
      - updated IpConnectivityMetricsTest
      - $ runtest frameworks-net passes
      - manually verified $ adb shell dumpsys connmetrics list proto
Bug: 34901696
Change-Id: I4fcd0ad7a7b85d587647f471a90c1e53a18fc95a
Merged-In: Ia4b33fd4212741152662a2adbb0533bd1b4902ee

(cherry picked from commit 0699cf98042a64e41ee076c464eb115a6579be08)
2017-04-14 01:41:48 +00:00
Jorim Jaggi
054a99d029 Merge "Don't consider app as top app if alpha = 0" into oc-dev
am: 4a2be133d4

Change-Id: Ibd7f89a49154bbf0bf89a5baa301e7912cf8db89
2017-04-14 01:14:18 +00:00
TreeHugger Robot
4db137b059 Merge "Connectivity metrics: add transports pretty printing" into oc-dev 2017-04-14 01:08:54 +00:00
Winson Chung
40a5f935ac Fixing animating bounds regression.
- Prior to ag/1954388, we used getAnimatingBounds() to get the final target
  bounds if animating or the current otherwise, but since we needed the
  target bounds to calculate the window scale even after the animation
  completes, the clearing of mBoundsAnimationTarget was removed.

  This inadvertently broke the check in getAnimatingBounds() from ever
  returning the current bounds (as it's never empty)!  This CL fixes the
  issue, and renames the related methods to better reflect what they are
  doing going forward.

  This caused a regression when calculating and notifying SysUI of the
  movement bounds, which was never the current bounds, but the default
  bounds.  Leading the IME change to trigger the PIP to move down.

Bug: 37242422
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: Source hint rect animation still works

Change-Id: I532b0928ebfeaf95e9754a0254306af6fbb35833
2017-04-13 18:07:55 -07:00
TreeHugger Robot
4a2be133d4 Merge "Don't consider app as top app if alpha = 0" into oc-dev 2017-04-14 01:06:52 +00:00
Winson Chung
19953caad3 Tightening up rotation behavior for PIP (2/3)
- Change BoundsAnimationController to be more consistent:
  1) Ensure that on animation end is always called even when cancelled to
     ensure animation start/end parity in the callbacks
  2) Ensure that setPinnedStackSize() is only called between start/end
  3) Prevent calling setPinnedStackSize() to the final bounds if the
     animation is cancelled
- With that, we add a flag to cancel the current bounds animation when a
  rotation happens while the bounds are animating.  In addition, we also
  add a check from AM to WM before applying the resize during the animation
  in the case where WM sends the bounds to AM, but AM lock is held while
  updating the exact stack bounds (once that finishes the old stale bounds
  would have been applied)
- In addition, we can then move the handling of the of the rotation to the
  config change update in WM, if we handle it before the other checks.

Bug: 36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I62c6df8b349971cc82a7898ae8b26834723faec5
2017-04-13 17:36:41 -07:00
Winson Chung
3a68287c6c Tightening up rotation behavior for PIP (1/3)
- Defer getting the default bounds until after the task has been reparented
  to the pinned stack
- Also move pinned stack-related methods into pinned stack window
  controller and listener

Bug: 36879891
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: Ib2bd81ad9e2a3829b556177010f39c7512ba35bf
2017-04-13 17:35:33 -07:00