Commit Graph

8037 Commits

Author SHA1 Message Date
Android Build Merger (Role)
bf1ecab901 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
2018-02-07 08:19:03 +00:00
Android Build Merger (Role)
469065ccb7 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
2018-02-07 08:18:57 +00:00
Android Build Merger (Role)
f097744926 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
2018-02-07 08:18:50 +00:00
Android Build Merger (Role)
4af59f1c97 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
2018-02-07 08:18:44 +00:00
Android Build Merger (Role)
ab36ba8483 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
2018-02-07 08:18:37 +00:00
Android Build Merger (Role)
b3012285e2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
2018-02-07 08:18:22 +00:00
Android Build Merger (Role)
4405b0ced2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
2018-02-07 08:18:15 +00:00
Android Build Merger (Role)
83cb35453f [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
2018-02-07 08:18:09 +00:00
Android Build Merger (Role)
0231bc4d6d [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
2018-02-07 08:18:02 +00:00
Rubin Xu
54813e9888 Fix VerifyCredentialResponse parcelling code
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
2018-02-07 08:17:06 +00:00
Michael Plass
02d802e71e DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result
Bug: 62866191
Bug: 63074860
Bug: 65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
(cherry picked from commit 9c1d56576e)
2017-09-01 09:42:27 -07:00
Baligh Uddin
230c78cec5 DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev"
Bug: 64864568

This reverts commit fd35d7c0a2, reversing
changes made to 07a21754f4.
2017-08-19 15:49:05 -07:00
Michael Plass
9c1d56576e [AsyncChannel] Fix race in handling of sync result
Bug: 62866191
Bug: 63074860
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
2017-07-26 21:44:31 +00:00
Andrew Solovay
9a1cdbd2a8 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am: 040b774928

Change-Id: I62888852d4bec175188560748fb76bca70472af3
2017-07-06 18:58:11 +00:00
Andrew Solovay
7bd357143e docs: Removing com.android.internal.* packages from Javadoc build
Several com.android.internal packages were being included in the
Javadoc build, even though they have no public APIs. Added a
package.html with the @hide tag to each of those packages, to
exclude them from the doc build.

Updated doc is staged to: http://go/dac-stage/reference/ ; verified
that the packages are now *not* in
http://go/dac-stage/reference/packages.html , and that package
summary files are not being generated for those packages.

Test: make ds-docs
Bug: 63166900
Change-Id: I7f96abb3e57d005c290cce6eda58f9368159a34e
2017-06-30 17:11:52 -07:00
Sujith Ramakrishnan
89f7afbf27 Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am: 564d0bf1be

Change-Id: Ibb1e4d6ab641f6f500e60967e611cd08e55abf60
2017-06-29 18:59:05 +00:00
TreeHugger Robot
564d0bf1be Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 2017-06-29 18:50:08 +00:00
Sujith Ramakrishnan
0390fff82c Prevent unwanted keypress actions during TV Setup.
- Prevent Search or long-press Home actions
      while TV setup is being completed based
      on flag TV_USER_SETUP_COMPLETE.

Test: Manual - Reset device, ran Setup, tried keys.
Test: Manual - Rebooted device after Setup, tried keys.

Bug: 62419382
Change-Id: Ic8fb0f10943ab7c39a7d9857f62e6ab292231b40
2017-06-28 14:38:30 -07:00
Selim Cinek
0124a4f90c Merge "Fixed an issue in the contrast calculation" into oc-dev
am: 9bf5c0c3e1

Change-Id: I0989afc46b82f5dad45ee3f2fa8c32ab55f9cb71
2017-06-24 00:55:44 +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
Michael Kwan
10efdc0abf Add isSmallBatteryDevice flag to ActivityManager.
Bug: 37351903
Change-Id: I6fed08c35474b10987388070eafb7b16e6944638
(cherry picked from commit 15eb998e65)
2017-06-22 00:12:23 +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
TreeHugger Robot
c041c7a34e Merge "Support associating with an already-paired device" into oc-dev 2017-06-14 00:03:53 +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
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
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
Sudheer Shanka
6d8dcec872 Update KernelUidCpuFreqTimeReader to handle uid removals.
Bug: 34133340
Test: manual
Change-Id: Iaad2061671d83e1ff6d2797e166ae903f6faec13
2017-06-06 15:31:51 -07: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
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
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
TreeHugger Robot
dd273de09e Merge "Notify keyguard of when power button is pressed." into oc-dev 2017-06-02 21:54:15 +00:00
Sudheer Shanka
ab17493ef3 Merge "Avoid excessive logging when the necessary proc file is unavailable." into oc-dev 2017-06-02 21:10:39 +00:00
Manu Cornet
8493543ce3 Merge "Use a PopupWindow to show tooltips" into oc-dev 2017-06-02 20:02:49 +00:00
Andrew Zeng
b4045d3791 Notify keyguard of when power button is pressed.
This is done on wear power button doesn't turn off the screen,
when the device wakes from keyguard UI isn't visible yet, so
it needs to react to power press in some way.

Bug: 35147955
Change-Id: I22619ea446770d09b53370e9244215646b60a9db
2017-06-02 12:51:13 -07:00
Sudheer Shanka
acd7f2c783 Avoid excessive logging when the necessary proc file is unavailable.
Bug: 34133340
Test: manual
Change-Id: Ic00e58a5b7bb7f92a0467df1cab8df5cab7dffda
2017-06-02 11:41:50 -07:00
Christine Franks
bd75ee0015 Merge "Fix night display activation behavior after reboot" into oc-dev 2017-06-02 15:07:25 +00:00
Manu Cornet
77e539775b Use a PopupWindow to show tooltips
This allows tooltips to work even in a context where they don't belong
in any activity (and therefore no window token to use). It also
simplifies a tiny bit the logic of how to get the view to show up.

Test: Checked tooltip behavior in and outside an app
Bug: 62065980
Change-Id: I6c02009c4fdd6d4bc4fa2cf8019955360506f0ee
2017-06-01 14:54:36 -07:00
Christine Franks
1454eae75d Fix night display activation behavior after reboot
Bug: 38469190
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services

Change-Id: Ida17ba9c9389781b892bbe37f0a9eeec030baf1e
2017-05-31 18:34:40 -07:00
Adam Lesinski
ceb24e88cb Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev 2017-05-31 22:37:09 +00:00
Joe Onorato
1dfd194f7d Merge "Track Partial wakelock time in background" into oc-dev 2017-05-31 19:26:59 +00:00
Joe Onorato
413b135244 Merge "Fix batterystat Counter misreporting when charging" into oc-dev 2017-05-31 19:26:59 +00:00