OSDN Git Service
Jeff Sharkey [Tue, 1 May 2018 19:09:28 +0000 (13:09 -0600)]
Avoid redundant getAllocatableBytes() calls.
Shuffle around the ordering of resolveInstallVolume() so that we
determine the fitsOnInternal value while doing a drive-by of all
possible target volumes. This way we only call getAllocatableBytes()
internal storage once.
Bug:
70985520
Test: atest android.content.pm.PackageHelperTests
Change-Id: I8273c239af4a13b1db17f320e15ee0ef2dc89186
android-build-team Robot [Mon, 30 Apr 2018 15:42:41 +0000 (15:42 +0000)]
Merge "Fix incorrect width of right most action button in notification" into pi-dev
Selim Cinek [Mon, 30 Apr 2018 15:05:20 +0000 (15:05 +0000)]
Merge "Fix showing a cut off notification when QS is expanded" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 14:15:27 +0000 (14:15 +0000)]
Merge "PIP: Partial fix to wrong insets during bounds animation" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 11:52:41 +0000 (11:52 +0000)]
Merge "Use the @Nullable annotations for choosePrivateKeyAlias." into pi-dev
Jorim Jaggi [Mon, 30 Apr 2018 11:47:40 +0000 (11:47 +0000)]
Merge "Fix another issue with constructing SafeActivityOptions" into pi-dev
android-build-team Robot [Mon, 30 Apr 2018 11:29:56 +0000 (11:29 +0000)]
Merge "Keyguard: Fix threading issues in KeyguardUpdateMonitor" into pi-dev
Adrian Roos [Mon, 30 Apr 2018 10:42:36 +0000 (12:42 +0200)]
PIP: Partial fix to wrong insets during bounds animation
Partially fixes an issue where the bounds animation when
expanding / collapsing the PIP menu would case the insets
to get wrongly applied.
The same thing still happens when animating from collapsed
to fullscreen, which requires a larger fix.
Bug:
77802617
Test: Enable cutout, enter PIP, tap on PIP window, verify transition is not jumpy.
Change-Id: I3edb4f8dec10ed85963853fa7e69812dfb198273
Mike Harris [Thu, 26 Apr 2018 22:20:10 +0000 (15:20 -0700)]
Use the @Nullable annotations for choosePrivateKeyAlias.
Both the code and docstring support this, but the parameters weren't
annotated.
Test: it builds locally
Change-Id: I16beddcd74a86047ce9aaf37007d96f3e8e0d4e0
Merged-In: I16beddcd74a86047ce9aaf37007d96f3e8e0d4e0
Fix:
78868934
(cherry picked from commit
b7c5eddc53c3872b661222ae30270d95cfe63b4e)
timhypeng [Thu, 29 Mar 2018 06:23:21 +0000 (14:23 +0800)]
Update connected device summary
* Add dispatchAudioModeChanged() in CachedBluetoothDeviceManager for notify
CacheBluetoothDevice to update their summary
* Add 5 combination that used to show the summary of CacheBluetoothDevice
case 1: device battery not unknown and is a active device
ex: show summary as "Active, 100% battery"
case 2: device battery unkonwn and is a active device
ex: show summary as "Active"
case 3: device battery not unknown and not a active device
ex: show summary as "100% battery"
case 4: device battery unkonwn and not a active device
ex: not show the summary
case 5: device is in bonding state
ex: show summary as "Pairing..."
Bug:
78318415
Test: make -j50 RunSettingsLibRoboTests
Change-Id: I70bf5386ff045ef4f07fb86fbdc8b943befc634c
timhypeng [Mon, 23 Apr 2018 10:08:47 +0000 (18:08 +0800)]
Add isAudioModeOngoingCall function to check call status
*return true if it is in ringing/call/communication(VoIP) status
Bug:
78318415
Test: make -j50 RunSettingsLibRoboTests
Change-Id: Ifb84da386fcd5bf03eaccf78fc264fbad86a9707
android-build-team Robot [Mon, 30 Apr 2018 05:19:57 +0000 (05:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
shawnlin [Thu, 12 Apr 2018 10:47:24 +0000 (18:47 +0800)]
Fix showing a cut off notification when QS is expanded
Collapse Notification shade to shelf size when QS is expanded
Test: runtest systemui
Test: go/sysui-stackscroll-test
Change-Id: I5fe0f4d615488f528d17388174915c0a0f5a2917
Fixes:
62202313
shawnlin [Fri, 27 Apr 2018 10:23:13 +0000 (18:23 +0800)]
Fix incorrect width of right most action button in notification
Measure the last action view normally instead of measuring it full width.
Test: enable show layout bounds and check the bounds of it.
Change-Id: I38f234928f7214baf2b532ecae63c3f4514b3247
Fixes:
78032480
Bill Yi [Sat, 28 Apr 2018 22:01:05 +0000 (15:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I81f44608957ac56ad790ce277c26fbe0f69791de
android-build-team Robot [Sat, 28 Apr 2018 19:44:34 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 19:41:05 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 19:39:42 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 19:27:39 +0000 (19:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 19:19:06 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 18:56:00 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 28 Apr 2018 17:09:35 +0000 (10:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I93c1f5a7bcdb05be8123310c32667809f1dfac42
Bill Yi [Sat, 28 Apr 2018 17:02:21 +0000 (10:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie0ca8213849a52e208752532b0efd886d4e96192
Selim Cinek [Sat, 28 Apr 2018 16:24:48 +0000 (16:24 +0000)]
Merge "FalsingManager: Only use for touchscreen input" into pi-dev
Bill Yi [Sat, 28 Apr 2018 15:18:48 +0000 (08:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1c78c4dfe25ed25844f66e04ed962551f253fd3b
Bill Yi [Sat, 28 Apr 2018 15:12:10 +0000 (08:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I25f803bf3c2167073862922fb50cf3098d4d14a0
android-build-team Robot [Sat, 28 Apr 2018 14:56:58 +0000 (14:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 14:49:27 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 14:41:41 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sat, 28 Apr 2018 13:46:09 +0000 (06:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I7018c0d3019b33617f99b73ff26c568f68fb684b
Bill Yi [Sat, 28 Apr 2018 13:39:12 +0000 (06:39 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5667995328f5af50be5272b6e5de1b35b8060905
Bill Yi [Sat, 28 Apr 2018 13:18:51 +0000 (06:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibb89bafbc3b3232359ac3d7847a883e2f3a608cf
Bill Yi [Sat, 28 Apr 2018 13:05:01 +0000 (06:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I272fb01200f73c6a0f79cae9e4521d3b52133e41
Bill Yi [Sat, 28 Apr 2018 12:57:43 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie4bfaa1bf8b251d49a0ed6cbdd17cc70b11c191a
Lucas Dupin [Sat, 28 Apr 2018 08:53:37 +0000 (08:53 +0000)]
Merge "AOD clock and notification animation" into pi-dev
android-build-team Robot [Sat, 28 Apr 2018 07:03:22 +0000 (07:03 +0000)]
Merge "Log audio recording and dynamic policy registration history" into pi-dev
Lucas Dupin [Tue, 3 Apr 2018 04:19:23 +0000 (21:19 -0700)]
AOD clock and notification animation
Better transitions for pulsing notifications and other keyguard
messages.
Fixes:
77601057
Fixes:
67641732
Test: visual
Test: atest packages/SystemUI/tests/src/com/android/keyguard/KeyguardSliceViewTest.java
Test: atest packages/SystemUI/tests/src/com/android/systemui/util/wakelock/KeepAwakeAnimationListenerTest.java
Merged-In: I3e3ec844834bf7f5d9ab341f308e78a002248a87
Change-Id: I1e6d95c62dc7463e8084a64f04c6dee3173967a6
Roshan Pius [Sat, 28 Apr 2018 00:09:03 +0000 (00:09 +0000)]
Merge "Revert "Revert "WifiManager: Return status from startScan()""" into pi-dev
Ajay Panicker [Sat, 28 Apr 2018 00:01:22 +0000 (00:01 +0000)]
Merge "Don't set Bluetooth volume when the Bluetooth stream changes" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 23:46:07 +0000 (23:46 +0000)]
Merge "Fix documentation bug that breaks generation" into pi-dev
Amith Yamasani [Fri, 27 Apr 2018 22:50:42 +0000 (22:50 +0000)]
Merge "Don't exit doze-light on motion event" into pi-dev
Hyunyoung Song [Fri, 27 Apr 2018 21:48:39 +0000 (21:48 +0000)]
Merge "Expose MetricLogger to support AOSP logging in Launcher Bug:
77920179 Test: builds. This is also only a library that is yet used anywhere" into pi-dev
Marco Nelissen [Fri, 27 Apr 2018 21:35:33 +0000 (21:35 +0000)]
Merge "Don't treat failed scans as valid media files" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 20:18:36 +0000 (20:18 +0000)]
Merge "Support arrow down animation" into pi-dev
Hyunyoung Song [Thu, 26 Apr 2018 18:26:22 +0000 (11:26 -0700)]
Expose MetricLogger to support AOSP logging in Launcher
Bug:
77920179
Test: builds. This is also only a library that is yet used anywhere
Change-Id: Ia4aec76eb31236081b16d6ec59db1d11ce7fde7b
Abodunrinwa Toki [Fri, 27 Apr 2018 19:46:10 +0000 (19:46 +0000)]
Merge "FloatingActionMode.setOutsideTouchable" into pi-dev
Abodunrinwa Toki [Fri, 27 Apr 2018 19:44:48 +0000 (19:44 +0000)]
Merge "TC: Fix null PendingIntent being passed to RemoteAction" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 19:35:14 +0000 (19:35 +0000)]
Merge "Fix issue with swipe up canceling recents animation." into pi-dev
Roshan Pius [Thu, 26 Apr 2018 23:28:35 +0000 (23:28 +0000)]
Revert "Revert "WifiManager: Return status from startScan()""
This reverts commit
4c36c2903d85a829efcc0ecaf2a67d0d05fcb967.
Reason for revert: Compilation failure in Arc++ fixed.
Bug:
77297012
Change-Id: Ic707f7256e8d7430c28e58085c6c2208f88042f2
Stanley Tng [Fri, 27 Apr 2018 18:27:38 +0000 (18:27 +0000)]
Merge "Disable Hearing Aid Profile for all platforms except Pixels" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 18:24:00 +0000 (18:24 +0000)]
Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev
Winson Chung [Fri, 27 Apr 2018 18:07:35 +0000 (11:07 -0700)]
Fix issue with swipe up canceling recents animation.
- Only cancel the animation if handling the button, in that case,
FLAG_CANCELED is not set (we were previously also only falling into this
block to cancel the animatino in KeyButtonView)
Bug:
78660363
Test: Swipe up over back button, ensure we still enter quickstep
Change-Id: I038adcbd6c4b4ffda28dd86151c855eed04f5e0d
Andrii Kulian [Fri, 27 Apr 2018 18:04:10 +0000 (18:04 +0000)]
Merge "Defer ensuring visibility on enter/exit split-screen" into pi-dev
Rob Carr [Fri, 27 Apr 2018 18:00:09 +0000 (18:00 +0000)]
Merge "Assign relative layer respecting cache." into pi-dev
Amith Yamasani [Fri, 27 Apr 2018 17:02:57 +0000 (10:02 -0700)]
Don't exit doze-light on motion event
This fixes an unintended exit from doze-light when a motion
event occurs. This happens when the device is sensing for
motion when waiting to enter doze-full.
The fix avoids exiting doze-light on a motion event, but
does continue to reset the doze-full state.
Bug:
78454609
Test: cmd deviceidle step light (once or twice to get to IDLE)
cmd deviceidle step
cmd deviceidle motion
Check batterystats history for device_idle. Should
stay in "light"
Change-Id: If4daca349f48d54482d679b2854184e5a6780647
Alison Cichowlas [Fri, 27 Apr 2018 17:25:06 +0000 (17:25 +0000)]
Merge "Lockdown icon tint should adapt to light/dark theme." into pi-dev
Evan Rosky [Fri, 27 Apr 2018 17:16:36 +0000 (17:16 +0000)]
Merge "Use correct windowingMode when computing override config" into pi-dev
Bernie Innocenti [Fri, 27 Apr 2018 17:01:40 +0000 (17:01 +0000)]
Merge "apf: Add counters for dropped / passed packets" into pi-dev
Chia-I Wu [Fri, 27 Apr 2018 15:47:41 +0000 (15:47 +0000)]
Merge "Add COLOR_MODE_AUTOMATIC" into pi-dev
Lucas Dupin [Fri, 27 Apr 2018 15:37:11 +0000 (15:37 +0000)]
Merge "Hide low-power mode black frame" into pi-dev
Alison Cichowlas [Fri, 27 Apr 2018 15:26:41 +0000 (11:26 -0400)]
Lockdown icon tint should adapt to light/dark theme.
Bug:
78619585
Test: Manual
Change-Id: I1eab4fae02bd212d2c90f596ad7eaa4d762e92c3
Bernie Innocenti [Mon, 23 Apr 2018 16:25:42 +0000 (01:25 +0900)]
apf: Add counters for dropped / passed packets
ApfFilter maintains separate counters for each reason why a packet was
passed or dropped by the filter logic.
There's also a total which should match the individual counters,
*unless* the APF interpreter aborted execution early due to an illegal
instruction or an out-of-bounds access.
Test: both on APFv2 and APFv4-capable device:
runtest -x tests/net/java/android/net/ip/IpClientTest.java
runtest -x tests/net/java/android/net/apf/ApfTest.java
manual tests connected to an AP
Bug:
73804303
Change-Id: I54b17fcbb95dfaea5db975d282314ce73d79d6ec
Ajay Panicker [Fri, 27 Apr 2018 14:13:23 +0000 (07:13 -0700)]
Don't set Bluetooth volume when the Bluetooth stream changes
Don't restore the remembered volume whenever an Bluetooth A2DP stream
comes up or whenever Bluetooth AVRCP reports absolute volume support.
All Bluetooth volume memory will now be handled by Bluetooth.
Bug:
30602783
Test: See that AudioService doesn't try to change the volume when a
Bluetooth device connects.
Change-Id: I683062c1a0565591ae33cbbb0381730b86ad17c2
(cherry picked from commit
085ecc32a40d4cf578d6c4379ff1045430ec72b0)
android-build-team Robot [Fri, 27 Apr 2018 13:00:59 +0000 (13:00 +0000)]
Merge "Use the briefcase icon with the circle" into pi-dev
Adrian Roos [Wed, 25 Apr 2018 17:09:50 +0000 (19:09 +0200)]
Keyguard: Fix threading issues in KeyguardUpdateMonitor
Fixes a bug where KeyguardViewMediator called into KeyguardUpdateMonitor
on the wrong thread. Also adds assertions to make sure we only touch
mCallbacks on the right thread.
Change-Id: I9524b6c182cb70134fbc9a28df8148043fec8c1e
Fixes:
78128789
Test: Device boots successfully.
Jorim Jaggi [Thu, 26 Apr 2018 16:51:16 +0000 (18:51 +0200)]
Fix another issue with constructing SafeActivityOptions
Also log the wtf earlier as well so we know where potential
issues are coming from
Test: Launch notififcation
Bug:
78591617
Change-Id: I99557670fd3805dbeac9042f7db13e28fa00fc21
android-build-team Robot [Fri, 27 Apr 2018 12:47:42 +0000 (12:47 +0000)]
Merge "Enable Notifications on AndroidTV" into pi-dev
android-build-team Robot [Fri, 27 Apr 2018 12:46:29 +0000 (12:46 +0000)]
Merge "PIP: Fix potential stuck state" into pi-dev
Tony Mak [Fri, 27 Apr 2018 10:01:10 +0000 (11:01 +0100)]
Use the briefcase icon with the circle
Thus, it is now consistent with the personal one, which also comes
with the circle.
Test: Observe the animation.
Change-Id: I482f629f30f7c9ca943da86902a1627b81072859
Fixes:
78684075
TreeHugger Robot [Fri, 27 Apr 2018 08:59:07 +0000 (08:59 +0000)]
Merge "apf: Add immediate encoding tests for LI" into pi-dev
Yu-Han Yang [Fri, 27 Apr 2018 05:15:29 +0000 (05:15 +0000)]
Merge "Refactor GnssNavigationMessageProvider" into pi-dev
TreeHugger Robot [Fri, 27 Apr 2018 04:30:44 +0000 (04:30 +0000)]
Merge "Adjusted the lineHeight for notification texts" into pi-dev
Sudheer Shanka [Fri, 27 Apr 2018 03:20:38 +0000 (03:20 +0000)]
Merge "Schedule external stats sync on battery level change with a delay" into pi-dev
TreeHugger Robot [Fri, 27 Apr 2018 03:15:33 +0000 (03:15 +0000)]
Merge "Fix bluetooth state updated in systemui." into pi-dev
Lin Guo [Mon, 23 Apr 2018 22:19:35 +0000 (15:19 -0700)]
Support arrow down animation
1. No need to use a FrameLayout for PagedListView.
2. Support arrow drop down animation.
BUG:
78474304,
73134851
Test: manual
Change-Id: Iec4e046f1abca40d76bd76ab3d5dc2a02e4dfcc2
Selim Cinek [Wed, 25 Apr 2018 08:08:55 +0000 (16:08 +0800)]
Adjusted the lineHeight for notification texts
The lineheight is now at 20dp
Test: observe all notification layouts and consistent lineheights
Change-Id: If39b6bef98e41c4a5890a82d7e30f2892ef3d7b1
Fixes:
78127131
TreeHugger Robot [Fri, 27 Apr 2018 01:36:52 +0000 (01:36 +0000)]
Merge "Fix PersistableBundle C++ -> Java interop" into pi-dev
Shuo Qian [Fri, 27 Apr 2018 01:24:18 +0000 (01:24 +0000)]
Merge "Restore the OEM hook implementation and usage" into pi-dev
TreeHugger Robot [Fri, 27 Apr 2018 01:16:39 +0000 (01:16 +0000)]
Merge "Fixed a leak of preDrawlisteners when an icon was animating when detached" into pi-dev
Ilya Matyukhin [Fri, 27 Apr 2018 00:19:57 +0000 (00:19 +0000)]
Merge "Add a null a check in fingerprint service" into pi-dev
TreeHugger Robot [Fri, 27 Apr 2018 00:06:01 +0000 (00:06 +0000)]
Merge "Shared touch and drag slops for quick step changes with density (1/3)" into pi-dev
Phil Weaver [Thu, 26 Apr 2018 23:51:12 +0000 (23:51 +0000)]
Merge "Expose a11y overlay window titles to a11y services" into pi-dev
Lucas Dupin [Thu, 26 Apr 2018 23:44:05 +0000 (16:44 -0700)]
Hide low-power mode black frame
Hide the wallpaper earlier and wait a little longer to
switch to low power mode.
This way the flickering area is less noticeable, since
less pixels will be visible, and users are less likely
to be looking at the screen.
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java
Change-Id: I24f2d64f580d7fdc63f6c768446d06140c29cfa5
Fixes:
78302022
Makoto Onuki [Thu, 26 Apr 2018 16:11:35 +0000 (09:11 -0700)]
Fix PersistableBundle C++ -> Java interop
PersistableBundle.java expects items to be sorted by the hash codes
of the keys, but PersistableBundle.cpp isn't compatible to it.
PersistableBundle.java now knowns what was parceled by C++
because it now uses a different magic, and change the unpercel
strategy.
Change-Id: Ia516f80b6d48dcb9f981767e0e64303434f39fb4
Fixes:
65744965
Test: adb shell sm fstrim and check logcat
Chris Tate [Thu, 26 Apr 2018 23:33:37 +0000 (23:33 +0000)]
Merge "Tie FAS service-start to the same idleness state as O+ bg restrictions" into pi-dev
Phil Weaver [Thu, 26 Apr 2018 23:26:51 +0000 (23:26 +0000)]
Merge "Handle accessibility button state on user switch" into pi-dev
Doris Ling [Thu, 26 Apr 2018 23:26:09 +0000 (23:26 +0000)]
Merge "Revert "WifiManager: Return status from startScan()"" into pi-dev
Gil O'Neil [Thu, 26 Apr 2018 23:20:41 +0000 (23:20 +0000)]
Merge "Added test API to refresh the UICC Profile" into pi-dev
Abodunrinwa Toki [Tue, 24 Apr 2018 18:19:48 +0000 (19:19 +0100)]
TC: Fix null PendingIntent being passed to RemoteAction
Problem was RemoteAction(...) takes a non-null PendingIntent but
TextClassification.createPendingIntent(...) returns a nullable PendingIntent.
Bug:
78515224
Test: manual
- Disable Contacts apps in settings
- Select a phone number in a TextView
- Verify that a Phone smart action is displayed
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Change-Id: Icab581d4eef38b4801d1b9ee3af04ffefd1eec6f
Nathan Harold [Thu, 26 Apr 2018 23:03:45 +0000 (23:03 +0000)]
Merge "Use Empty List for Default PhysicalChannelConfig" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:58:40 +0000 (22:58 +0000)]
Merge "Using a list to store usage events" into pi-dev
Ilya Matyukhin [Thu, 26 Apr 2018 21:28:45 +0000 (14:28 -0700)]
Add a null a check in fingerprint service
Fixes:
62918794
Test: ran the command from the bug report
Change-Id: Ib00ee46f775c07be5b1e821528dd390ed978b58e
Sudheer Shanka [Tue, 24 Apr 2018 18:12:11 +0000 (11:12 -0700)]
Schedule external stats sync on battery level change with a delay
and fix locking in scheduleCpuStatsSyncDueToWakelockChange().
Bug:
74146897
Test: atest cts/hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
Test: atest core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I2891dfb8a0aedf429232f45e26deab93c738506e
Rob Carr [Thu, 26 Apr 2018 22:41:18 +0000 (22:41 +0000)]
Merge "Correct cropping of windows above decor layer." into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:37:46 +0000 (22:37 +0000)]
Merge "Use view order when iterating icons in a slot" into pi-dev
TreeHugger Robot [Thu, 26 Apr 2018 22:32:59 +0000 (22:32 +0000)]
Merge "Start recents animation to the target task in the stack" into pi-dev
Doris Ling [Thu, 26 Apr 2018 22:28:27 +0000 (22:28 +0000)]
Revert "WifiManager: Return status from startScan()"
This reverts commit
b81c3d5f9a86e4e1f90be2ffaa81ea5df8fce684.
Bug:
77297012
Change-Id: Ie8727343650b549d4f438643d50a10fe50ab52b1
Reason: this change is breaking the build
Lloyd Pique [Thu, 19 Apr 2018 23:23:44 +0000 (16:23 -0700)]
camera2/legacy: Fix expected errors on eglSwapBuffers
SurfaceTextureRenderer::swapBuffers interpreted EGL_BAD_SURFACE as
indicating an abandanoned buffer queue. But the EGL 1.4 lists additional
errors that also indicate extreme failure: EGL_CONTEXT_LOST, and
EGL_BAD_NATIVE_WINDOW.
Discovered while debugging CTS test
android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
on ARC++ x86 boards.
Test: cts-tradefed/android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
Bug:
64496778
Bug:
36063477
Change-Id: I782f2c923aa5ff2442bbcf3dfb09861e129a2872
(cherry picked from commit
3511f99cf986a9fe7a67a8aee301e05f1be07f62)
TreeHugger Robot [Thu, 26 Apr 2018 21:39:49 +0000 (21:39 +0000)]
Merge "Add A2dp.disconnect() hidden API to the greylist" into pi-dev
Todd Kennedy [Thu, 26 Apr 2018 21:29:17 +0000 (21:29 +0000)]
Merge "Allow using reserved package IDs" into pi-dev