Commit Graph

8126 Commits

Author SHA1 Message Date
Andreas Gampe
d795bbcdcc Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
am: 81f66ce5ab

Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237
2017-07-25 00:18:19 +00:00
Treehugger Robot
81f66ce5ab Merge "Zygote: Increase wrap-pid timeout to thirty seconds" 2017-07-25 00:06:02 +00:00
Shubham Ajmera
52c8620c19 Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf932)

Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa
2017-07-24 15:21:04 -07:00
Andreas Gampe
27497c6dfc Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.

Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.

Bug: 63904739
Bug: 63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
2017-07-24 10:14:03 -07:00
Shubham Ajmera
d4185538dc Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf932)

Change-Id: If90690d6234dc8727df2b2fb485f0c8d50970a92
2017-07-21 15:48:40 -07:00
Andreas Gampe
6078facf1f Merge "Zygote: Poll with timeout for pid"
am: 89d119abe6

Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
2017-07-20 05:36:42 +00:00
Andreas Gampe
3fbde346ad Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.

(cherry picked from commit cbc4214061)

Bug: 63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
2017-07-19 19:45:55 -07:00
Mark Salyzyn
e7715b35ea Merge "BootReceiver: check console-ramoops-0"
am: a09784ac75

Change-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de
2017-07-17 22:34:23 +00:00
Mark Salyzyn
18c139c57f BootReceiver: check console-ramoops-0
On later kernels /sys/fs/pstore/console-ramoops becomes
/sys/fs/pstore/console-ramoops-0

Test: none
Bug: 63058217
Change-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f
2017-07-17 20:33:40 +00:00
Hugo Benichi
531cae76fd Merge "Add first OWNERS files for core networking"
am: 4066930a36

Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112
2017-07-12 03:54:57 +00:00
Hugo Benichi
357b58cdab Add first OWNERS files for core networking
Covering
  core/java/android/net/
  core/java/com/android/server/net/
  packages/CaptivePortalLogin/
  services/core/java/com/android/server/
    ConnectivityService.java
    NsdServic.java
    NetworkManagementService.java
  services/core/java/com/android/server/connectivity/
  services/net/
  tests/net/

Android core networking files not covered:
  services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
  services/core/proto/ipconnectivity.proto (path unique to aosp)

Bug: 63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
2017-07-12 09:25:15 +09:00
ShuJie Wang
7999f4bc2f ProcessStats: fix uss average value offset
Test: make framework -j8

Change-Id: If8f9c46293bb36fbbd2ebde5eace2d45cc6d4a12
Signed-off-by: ShuJie Wang <wangshujie@xiaomi.com>
2017-06-30 18:03:39 +08:00
Selim Cinek
12a2a7d0f1 Merge "Fixed an issue in the contrast calculation" into oc-dev
am: 9bf5c0c3e1

Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
2017-06-24 00:55:48 +00:00
Selim Cinek
9bf5c0c3e1 Merge "Fixed an issue in the contrast calculation" into oc-dev 2017-06-24 00:44:13 +00:00
Selim Cinek
4c80791919 Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.

Test: manual inspection
Fixes: 62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
2017-06-23 17:29:50 -07:00
Christopher Ferris
1d10ce12ff Merge "Add a common call when wrapping an app." am: 12e0975963
am: bb6cf84a40

Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd
2017-06-22 18:40:30 +00:00
Christopher Ferris
76de39e5eb Add a common call when wrapping an app.
When an application is wrapped using setprop wrap.<application>, it
doesn't set the special zygote flag, or make the mallopt call. This
means that a wrapped application will behave differently, and not
be able to track zygote native allocations versus app native allocations.

This CL adds a nativePreApplicationInit call that is used after the
Zygote is forked, and when a wrapped application is called.

Bug: 62068500

Test: Booted sailfish system. Verified that the zygote has not called
Test: the new function. Verified the function is called when a wrapper
Test: is used. Verified the function is called when the Zygote forks
Test: a process.
Change-Id: I392e1b5429be77def63f7815b072d68e9408cc7f
(cherry picked from commit 2980de4a59)
2017-06-21 17:19:45 -07:00
Vladislav Kaznacheev
3fd4215760 Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449
2017-06-19 21:12:41 +00:00
Vladislav Kaznacheev
dd469d171d Do not update currently open tooltip.
Currently if View.setTooltipText is called while
the tooltip is being shown for that view, it will
update the displayed text. The tooltip then will
resize to wrap around the new text, but not change
its position. This looks confusing if the new text
is significantly shorter or longer.

Removing this functionality until proper
re-positioning is implemented.

Bug: 38491655
Test: android.view.cts.TooltipTest passes
Change-Id: I79689288185888854b992b89e19fe381d3ac50e4
2017-06-16 11:31:23 -07:00
Eugene Susla
c26f789ae2 Merge "Support associating with an already-paired device" into oc-dev
am: c041c7a34e

Change-Id: I31ab12934cd18aace7aece30fd5551e20e02216e
2017-06-14 00:17:25 +00:00
TreeHugger Robot
c041c7a34e Merge "Support associating with an already-paired device" into oc-dev 2017-06-14 00:03:53 +00:00
Wale Ogunwale
90159a2492 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev
am: e1e0db8ca9

Change-Id: Ie70addce27b9551323d7c9d8f9576aa118b98114
2017-06-13 00:02:11 +00:00
Wale Ogunwale
e1e0db8ca9 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev 2017-06-12 23:51:19 +00:00
Eugene Susla
0c4a926626 Support associating with an already-paired device
This is required for migration scenario, where device(s) are already
paired(and thus no longer discoverable) but didn't go through companion
flow.
This also fixes a bug with filtering by mac address, which is also relevant to
the use-case of associating a specific device

Test: Pair with a device first, and call associate with a filter with its MAC
address and single device requested. Ensure the device is found.
Ensure only that device is ever returned when filtering by MAC address.
Bug: 62487084
Change-Id: Ic7cc6affc0648ad85b15620e8c3aba4b9fc91aa1
2017-06-12 16:21:51 -07:00
Vladislav Kaznacheev
7e21054200 Merge changes from topic 'sysui-tooltip' into oc-dev
am: 3fbcec5b86

Change-Id: I9ff9e36b3fa7c0e3c0bd4cd2048f9d0ce510399c
2017-06-12 21:51:10 +00:00
Vladislav Kaznacheev
d85915f786 Pass window token when creating a tooltip popup
This allows using tooltips in System UI.

Bug: 62065980
Test: android.view.cts.TooltipTest passes
Change-Id: If0a76d0806aa92efa4be57204c4517242b0ebb99
2017-06-12 12:10:49 -07:00
Vladislav Kaznacheev
7410170ddc Revert "Use a PopupWindow to show tooltips"
This reverts commit 77e539775b.

Change-Id: Ic4054e0d507ce95ab93282d4da002dd804aeb26d
2017-06-12 12:02:11 -07:00
Winson Chung
4a526c1245 Ensure that we use SF Vsync Choreographer for the PiP transition.
- Move the bounds animation onto the animation thread
- Remove existing code referencing the old sf-vsync choreographer
- Add ability for ValueAnimator subclasses to reference a different
  AnimationHandler, which uses a different FrameCallbackProvider with the
  sf-vsync choreographer in the animations that require it
- Ensure that PiP touch events are batched and sent aligned with the
  sf-vsync
- Move GC onto its own thread to not block other BackgroundThread calls

Bug: 36371375
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: go/wm-smoke

Change-Id: I6a41b35a4e4d4d6dbea82c2673452825fe3ffa58
2017-06-12 10:08:58 -07:00
Siyamed Sinir
c1801c9a8d Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev
am: bc626c6358

Change-Id: I8688bda33124a78d439f1cbcf23926a0672b0735
2017-06-09 21:37:17 +00:00
jackqdyulei
5047d7bf7f Copy smearing method to BatteryStatsHelper
am: 5dad8068e2

Change-Id: I1a99fc38a665c3219999b464c1549dd707832f3d
2017-06-09 21:15:56 +00:00
Siyamed Sinir
bc626c6358 Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev 2017-06-09 20:58:36 +00:00
Lei Yu
883db32859 Merge changes from topic 'battery_smear_move' into oc-dev
* changes:
  Batterystats logs smeared power model values
  Copy smearing method to BatteryStatsHelper
2017-06-09 20:50:47 +00:00
Siyamed Sinir
484c2e2fbe Force Autofill in FloatingToolbar overflow menu
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
bit CtsWidgetTestCases:android.widget.cts.EditTextTest

Bug: 62271937
Change-Id: Ib3447281f3bd1abc811a25fc55ad55e34e155bbb
2017-06-08 17:16:26 -07:00
jackqdyulei
5dad8068e2 Copy smearing method to BatteryStatsHelper
This cl adds the following data in BatterySipper
1. screenPowerMah: power smeared by screen
2. proportionalSmearMah: power need to smeared proportionally
3. displayPowerMah: smeared power usage

This cl also copies bunch of methods from BatteryUtils to
BatteryStatsHelper with minor changes, so we could log smearing
logic in BatteryStatsHelper

Bug: 62300864
Test: runtest -x BatteryStatsHelperTest
Change-Id: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
Merged-In: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
2017-06-08 15:10:34 -07:00
Jesse Hall
9cf8c281d2 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" 2017-06-08 15:34:44 +00:00
TreeHugger Robot
837f1167ca Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp 2017-06-08 01:08:24 +00:00
Sudheer Shanka
736cb0e33a Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e

Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c
2017-06-08 00:15:23 +00:00
Andreas Gampe
dc7f65ac64 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

(cherry picked from commit d52cad2cc9)

Bug: 37272346
Test: m
Test: Device boots
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 20:08:44 +00:00
Andreas Gampe
5085ef71e9 Framework: Remove SamplingProfiler
Remove the very old and unsupported SamplingProfilerIntegration. This
CL removes the code parts.

Bug: 37272346
Test: m
Test: Device boots
Merged-In: I64d77244b5816ef1f605d19530b96be38f5c1bc6
Change-Id: I64d77244b5816ef1f605d19530b96be38f5c1bc6
2017-06-07 11:26:15 -07:00
Sudheer Shanka
6d8dcec872 Update KernelUidCpuFreqTimeReader to handle uid removals.
Bug: 34133340
Test: manual
Change-Id: Iaad2061671d83e1ff6d2797e166ae903f6faec13
2017-06-06 15:31:51 -07:00
Jesse Hall
f20fdb9320 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
(cherry picked from commit 5d911fe6bb)
2017-06-06 11:41:46 -07:00
Sudheer Shanka
cefa28dc8a Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev
am: 057bad9c9d

Change-Id: I536deea7b77c202b788f6d985574a9629d9bd1f1
2017-06-05 21:31:19 +00:00
Sudheer Shanka
057bad9c9d Merge "Ignore entries for isolated uids if there's no mapping for them." into oc-dev 2017-06-05 21:22:39 +00:00
Daniel Sandler
7574fbee46 Merge changes from topic 'dungeon' into oc-dev
am: 36a673a7d7

Change-Id: Idcad938ed14dac66e6b701cefd9dc79c499eb645
2017-06-05 19:15:12 +00:00
Sudheer Shanka
ea87a4bca0 Ignore entries for isolated uids if there's no mapping for them.
Bug: 25195548
Test: manual
Change-Id: If5aa7e194f4d43f2a7068899b9aa6584bfb2b7cc
2017-06-05 10:40:11 -07:00
Dan Sandler
2f36ab88d7 Updates to Dianne's Dungeon.
- new EKG icon
 - set the notification timestamp to the oldest service
   start time, so you have some idea how long things have been
   this way
 - minor text fixes

Bug: 36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I99db280cde8ca3ecd7205cd44fac159d8f652ca2
2017-06-05 11:18:59 -04:00
Winson Chung
d288ca8d2d Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev
am: c3504d4f33

Change-Id: I07ff4ce93022c681b327b1dbb8a03893471b752e
2017-06-03 20:50:49 +00:00
TreeHugger Robot
c3504d4f33 Merge "Workaround to ensure that PIP activities have a visible shadow." into oc-dev 2017-06-03 20:41:18 +00:00
Winson Chung
4d8681ff6a Workaround to ensure that PIP activities have a visible shadow.
- When the window for the activity enters PIP, update the outline provider
  to override the alpha of the shadow (to be opaque) to ensure that is is
  visible.  Only applies to the task root activity.

Bug: 36741700
Test: Launch YT, ensure that there is a shadow when after it enters PIP
Test: go/wm-smoke
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: If089dae84e4916d3d0e7bbeb316215b46e522e05
2017-06-02 16:02:50 -07:00
Andrew Zeng
3793a4ee3a Merge "Notify keyguard of when power button is pressed." into oc-dev
am: dd273de09e

Change-Id: I2e8061b695e1823ea9ab7b46c8fdb78111601ced
2017-06-02 22:03:30 +00:00