314704 Commits

Author SHA1 Message Date
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
Svet Ganov
3a74243ae4 Check for non-null parent before delegating to it
Test: manual

bug:37289681

Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
2017-04-14 02:31:53 +00: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
TreeHugger Robot
1ad7ff32b1 Merge "Add Adlam font to fonts.xml" into oc-dev 2017-04-14 02:04:36 +00:00
TreeHugger Robot
c223d70e64 Merge "Add Java API for libvintf." into oc-dev 2017-04-14 02:02:08 +00:00
Jeff Sharkey
e5e2569a1f Relax enforcement of GET_USAGE_STATS permission.
This matches the logic used in all other places where we check for
this app-op.

Test: builds, boots
Bug: 37315351
Change-Id: I1fef7d30709d24c3f8978d33271a15b37b2ccc26
2017-04-13 19:54:51 -06: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
TreeHugger Robot
ad989b1711 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 2017-04-14 01:44:06 +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
Jesse Hall
e20f42b8a9 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev
am: 8cafe5d9b4

Change-Id: I024b5cf450aa2832bdd2638bd83b6d5048b80a7f
2017-04-14 01:10:49 +00:00
Adam Lesinski
48d5b68815 Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev
am: b97d51a0d2

Change-Id: I25ee394a6950ca6cc85d66727847c32041a8a65b
2017-04-14 01:09:40 +00:00
TreeHugger Robot
4db137b059 Merge "Connectivity metrics: add transports pretty printing" into oc-dev 2017-04-14 01:08:54 +00:00
Dianne Hackborn
9596d71664 Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev
am: 676bd21542

Change-Id: I0e806e12b361b90eb4f349a7624d5f5ce4c91a9b
2017-04-14 01:08:26 +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
Daniel Nishi
f110127aef Merge "Don't crash in background after app uninstall." into oc-dev
am: 74037d1287

Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931
2017-04-14 01:07:18 +00: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
Yifan Hong
becc56d7ea Add Java API for libvintf.
android.os.VintfObject has two methods:

- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
          compatible.

Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Bug: 36814503

Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
2017-04-13 18:04:05 -07:00
TreeHugger Robot
8cafe5d9b4 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev 2017-04-14 01:00:46 +00:00
TreeHugger Robot
b97d51a0d2 Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev 2017-04-14 00:58:08 +00:00
Dianne Hackborn
676bd21542 Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev 2017-04-14 00:56:39 +00:00
Daniel Nishi
74037d1287 Merge "Don't crash in background after app uninstall." into oc-dev 2017-04-14 00:56:19 +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
Christopher Tate
e62c211fab Turn down dynamic toggle for background restriction policy
Bug 35248677
Test: manual

Change-Id: Ib2a85df27a0de7f205783506bd3d2afe2da92baf
2017-04-13 17:34:15 -07:00
Mady Mellor
b91efb8b36 Visual changes to PIP drag to dismiss UI
Updated gradient asset, spacing, and added shadow to text

Test: Manual: have a PIP, move it around, observe drag to dismiss UI
Bug: 35358628
Change-Id: I8614468edfc14d0337d69184a7bbab5419f22ec3
2017-04-13 17:20:15 -07:00
Jeff Tinker
a29ecc1a1c Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev
am: 92fc8bdd51

Change-Id: I14d1dae73008df0244c1435c1ab634d573208d50
2017-04-14 00:18:41 +00:00
TreeHugger Robot
92fc8bdd51 Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev 2017-04-14 00:09:42 +00:00
jiabin
4f499a0a17 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev
am: 2ec7decaa5

Change-Id: Ic648086244bcc0df6b35cf8b8439d0bc200917d7
2017-04-13 23:48:18 +00:00
Romain Guy
1f1667122a Merge "Range check transfer params in float domain" into oc-dev
am: 819740cc73

Change-Id: I51c15e9a81e8af04c2a4061ed0ac3b98272c1c44
2017-04-13 23:45:32 +00:00
TreeHugger Robot
2ec7decaa5 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev 2017-04-13 23:39:13 +00:00
Romain Guy
819740cc73 Merge "Range check transfer params in float domain" into oc-dev 2017-04-13 23:35:27 +00:00
Peng Xu
70004dd19c Merge "Address review suggestions for sensor direct report related APIs" into oc-dev
am: 5ebb159a92

Change-Id: I39838189ba70cd74e726d4332e1c2adfb5b269d6
2017-04-13 23:33:43 +00:00
TreeHugger Robot
5ebb159a92 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev 2017-04-13 23:24:42 +00:00
Hugo Benichi
eef918a66c 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.

(not like commit 0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b, this patch
uses a comma to separate fallback urls, which works as expected with
Java's String.split())

Test: built, flashed, tested manually with various portal networks.
Bug: 36532213
Change-Id: I3c010bfee5b99db03a500776fbf47959a29d0578
2017-04-14 08:19:39 +09:00
Makoto Onuki
efda6390c9 Merge "Actually remove the chooser APIs" into oc-dev
am: fbadd6dac9

Change-Id: Ibb59269e2da0698ebc7140c08de8265059be8033
2017-04-13 23:17:21 +00:00
Evan Rosky
d6072f2900 Merge "Improve rect-level focus ordering" into oc-dev
am: 197052d6cb

Change-Id: I3e155776f9ccffb6f0a2d19b73ec73f0b8bf829b
2017-04-13 23:14:53 +00:00
TreeHugger Robot
fbadd6dac9 Merge "Actually remove the chooser APIs" into oc-dev 2017-04-13 23:08:55 +00:00
Adam Lesinski
2fc8adc5fc Merge "AAPT2: Fix order-of-destruction crash" into oc-dev
am: 62b713ed73

Change-Id: I1e32861bec801645e11e36663d57d3e36bf3f133
2017-04-13 23:08:34 +00:00
Adam Lesinski
db091577ff AAPT2: Allow the ';' separator on Windows for split args
Bug: 36870463
Test: manual (wine)
Change-Id: I8a38545a3cac9354b41858e1840b197b60925c03
2017-04-13 16:07:35 -07:00
Evan Rosky
197052d6cb Merge "Improve rect-level focus ordering" into oc-dev 2017-04-13 23:06:18 +00:00
Roozbeh Pournader
d6e9a6028a Add Adlam font to fonts.xml
Change-Id: If6b4b9138b9b761360cfdd3c1ba9659739af6402
Fixes: 37156487
Test: not needed
2017-04-13 16:04:47 -07:00
Selim Cinek
f1f29ca50b Merge changes Icc9c36f7,I723474e2 into oc-dev
am: 07525d4f25

Change-Id: I84d476d21e920fdd28e8e1f7c18d54d3eaf1e23b
2017-04-13 23:02:41 +00:00
Adam Lesinski
62b713ed73 Merge "AAPT2: Fix order-of-destruction crash" into oc-dev 2017-04-13 22:54:02 +00:00
Jesse Hall
5d911fe6bb Allow disabling GL preload even if gfxdriver isn't updatable
Bug: 34611670
Test: set ro.zygote.disable_gl_preload=1, shell start,
      confirm GL driver isn't loaded in zygote process
      by checking /proc/<pid>/maps

Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf
2017-04-13 15:53:28 -07:00
Selim Cinek
07525d4f25 Merge changes Icc9c36f7,I723474e2 into oc-dev
* changes:
  Fixed a crash when expanding
  Fixed the visual appearance on heads-up notifications
2017-04-13 22:52:16 +00:00
Andreas Huber
f13eb2e0c7 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: Ica91a6813956f4ea99001c5f427be94865e48fde
Merged-In: I2d8912dc752f904188457c3e6dac10da1afd287a
2017-04-13 15:21:31 -07:00
Hugo Benichi
a365bace7a Connectivity metrics: add transports pretty printing
This patch also
  - partially reverts commit f927f0c52e7df5b057e7d28888c3cfed164d241a
    that exposed a getTransports method on NetworkCapabilities.
  - moves enumerateBits to BitUtils (as unpackBits), and adds the
    reverse packBit method.

Bug: 34901696
Test: manually looked at $ adb shell dumpsys connmetrics list
Change-Id: I1650daf8fc9c1b6e0d986d2285f81e888be8847f
Merged-In: Id04f9080e7f75608deeb49306aec34941e71794c

(cherry picked from commit df456e13a1127e3c8594b1d22ea4a9b3dca67a4b)
2017-04-13 22:17:50 +00:00
Lei Yu
24638307c2 Merge "Refine BatteryInfo and battery drawable" into oc-dev
am: 57af565fb7

Change-Id: Ie9fce326b23293e9f66d71f4be4b166aae310eb0
2017-04-13 21:52:40 +00:00