OSDN Git Service
Mathew Inwood [Tue, 27 Mar 2018 22:19:51 +0000 (22:19 +0000)]
Merge "Configurable hidden API exemptions." am:
4b8285b907
am:
625aa8d33a
Change-Id: I3ead821be36e65c5d6abf7b40ecb3171949656f9
Winson Chung [Tue, 27 Mar 2018 22:12:53 +0000 (22:12 +0000)]
Merge "Use package context for loading task description icon resource" into pi-dev
am:
a17eccac73
Change-Id: I0649ed9f3c5c635359d73eda0ca5abeaf7b75ce3
Meng Wang [Tue, 27 Mar 2018 22:06:36 +0000 (22:06 +0000)]
Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev
am:
2cc67382c0
Change-Id: Ic92575356dbad97423a99285b4a0715c1e8e4886
Mathew Inwood [Tue, 27 Mar 2018 22:05:14 +0000 (22:05 +0000)]
Merge "Configurable hidden API exemptions."
am:
4b8285b907
Change-Id: Ia61896bdedff170d75715094ce87b97dc96994ed
Chavi Weingarten [Tue, 27 Mar 2018 21:56:01 +0000 (21:56 +0000)]
Merge "Don't animate dim layer exit when recents animation finishes." into pi-dev
am:
ce61d118de
Change-Id: Ida93d21b52438fc9b880a43feb75446dfa7782df
Mike Ma [Tue, 27 Mar 2018 21:43:23 +0000 (21:43 +0000)]
Merge "Track USB data link in batterystats" into pi-dev
am:
3787f73198
Change-Id: Id0d95a1516a21d9c7e9739a1237558f47f3d2e9c
Andrew Chant [Tue, 27 Mar 2018 21:37:27 +0000 (21:37 +0000)]
Merge "Add UsbDeviceAdded and update PhysicalDropDetected" into pi-dev
am:
b8d8ccf9e4
Change-Id: I7809b6e1c2e0f7d2f59a6cda9dad2df7de722bf1
Jeff Sharkey [Tue, 27 Mar 2018 21:31:19 +0000 (21:31 +0000)]
Merge changes Iba4e52c2,I81160755 into pi-dev
am:
5681efd1af
Change-Id: I2352404cdc27e75a510eb8f999679cfe67aa7ec6
Lei Yu [Tue, 27 Mar 2018 21:16:32 +0000 (21:16 +0000)]
Merge "Remove feature flag for battery settings" into pi-dev
am:
dea705ba59
Change-Id: I4eb9bfabae1bec4b46acee2426ec8ead50d3ba24
Lucas Dupin [Tue, 27 Mar 2018 21:06:19 +0000 (21:06 +0000)]
Merge "Avoid binder call while dragging" into pi-dev
am:
8261cbe32d
Change-Id: I4d37c1d769e75ce7912f7683cdd227e9a36e88d6
Winson Chung [Tue, 27 Mar 2018 21:03:59 +0000 (21:03 +0000)]
Merge "Use package context for loading task description icon resource" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 20:58:54 +0000 (20:58 +0000)]
Merge "Revert "Unhide enable_apps carrier config key."" into pi-dev
Chavi Weingarten [Tue, 27 Mar 2018 20:56:17 +0000 (20:56 +0000)]
Merge "Don't animate dim layer exit when recents animation finishes." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 20:52:57 +0000 (20:52 +0000)]
Merge "Track USB data link in batterystats" into pi-dev
Treehugger Robot [Tue, 27 Mar 2018 20:49:45 +0000 (20:49 +0000)]
Merge "Configurable hidden API exemptions."
Andrew Chant [Tue, 27 Mar 2018 20:44:53 +0000 (20:44 +0000)]
Merge "Add UsbDeviceAdded and update PhysicalDropDetected" into pi-dev
Felipe Leme [Tue, 27 Mar 2018 20:43:34 +0000 (20:43 +0000)]
Merge "Recover dataset picker when view fail to autofill." into pi-dev
am:
828ffa45a1
Change-Id: Ie28f57b5132ed141f2ea3ca51656c878e7ecbf79
TreeHugger Robot [Tue, 27 Mar 2018 20:28:31 +0000 (20:28 +0000)]
Merge changes Iba4e52c2,I81160755 into pi-dev
* changes:
Public volumes only browsable by mounting user.
Public volumes are only visible to mounted user.
Android Build Merger (Role) [Tue, 27 Mar 2018 20:23:34 +0000 (20:23 +0000)]
Merge "Merge "Camera2: Add distortion correction support" into pi-dev am:
3801d3a7d9" into pi-dev-plus-aosp
TreeHugger Robot [Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)]
Merge "Remove feature flag for battery settings" into pi-dev
Eino-Ville Talvala [Tue, 27 Mar 2018 20:22:00 +0000 (20:22 +0000)]
Merge "Camera2: Add distortion correction support" into pi-dev
am:
3801d3a7d9
Change-Id: I696e03a7211d55919e73b7732e28637f48920efe
Android Build Merger (Role) [Tue, 27 Mar 2018 20:16:29 +0000 (20:16 +0000)]
Merge "Merge "Show dynamic subtext for RestrictedSwitchPreference." into pi-dev am:
e1c4324e6c" into pi-dev-plus-aosp
yuemingw [Tue, 27 Mar 2018 20:15:58 +0000 (20:15 +0000)]
Merge "Show dynamic subtext for RestrictedSwitchPreference." into pi-dev
am:
e1c4324e6c
Change-Id: I5cce379922d6b91f32b22795d8116a8e3f11f452
Android Build Merger (Role) [Tue, 27 Mar 2018 20:12:03 +0000 (20:12 +0000)]
Merge "Merge "[Notif] Add Blocking helper to swipe" into pi-dev am:
f431ded9dd" into pi-dev-plus-aosp
Rohan Shah [Tue, 27 Mar 2018 20:11:42 +0000 (20:11 +0000)]
Merge "[Notif] Add Blocking helper to swipe" into pi-dev
am:
f431ded9dd
Change-Id: I806913f32d8f5747c205da7090bbe5ee69aa4f85
TreeHugger Robot [Tue, 27 Mar 2018 20:10:28 +0000 (20:10 +0000)]
Merge "Avoid binder call while dragging" into pi-dev
Android Build Merger (Role) [Tue, 27 Mar 2018 20:09:12 +0000 (20:09 +0000)]
Merge "Merge "Don't let callers OOM the system process." into pi-dev am:
c08aa83b48" into pi-dev-plus-aosp
Jeff Sharkey [Tue, 27 Mar 2018 20:08:50 +0000 (20:08 +0000)]
Merge "Don't let callers OOM the system process." into pi-dev
am:
c08aa83b48
Change-Id: I9698aab0d98c564ad7779462485576121e9bc815
Myles Watson [Tue, 27 Mar 2018 20:04:29 +0000 (20:04 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs" am:
5b36567b76
am:
29ac17b8ac
Change-Id: I413e9bdc30677429bc3a42578e374e0f6ddf9e23
Myles Watson [Tue, 27 Mar 2018 19:56:36 +0000 (19:56 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs"
am:
5b36567b76
Change-Id: Ia4a564d9117915103a96a0ce0894b35cae0ff730
Jesse Hall [Tue, 27 Mar 2018 19:56:32 +0000 (19:56 +0000)]
Merge "Docs: add more detail to SurfaceTexture#getTimestamp" into pi-dev
am:
bef42cd87f
Change-Id: If719310e5f5c771651746e56d0e08cf166d83684
Rohan Shah [Tue, 27 Mar 2018 19:52:02 +0000 (19:52 +0000)]
Merge "[QS] Update landscape UI" into pi-dev
am:
6d0412ee22
Change-Id: I38b8214bf560d406d5f95468419314010cf6f579
TreeHugger Robot [Tue, 27 Mar 2018 19:48:44 +0000 (19:48 +0000)]
Merge "Recover dataset picker when view fail to autofill." into pi-dev
Kevin Chyn [Tue, 27 Mar 2018 19:47:19 +0000 (19:47 +0000)]
Merge "Tweak FingerprintDialog" into pi-dev
am:
b57843059a
Change-Id: Iee30b701c208d29f7391c7a7368d1a5028d72f35
Lin Guo [Tue, 27 Mar 2018 19:41:38 +0000 (19:41 +0000)]
Merge "Adjust the volumeDialog layout" into pi-dev
am:
e19226b121
Change-Id: Ie9e1244899ec5ecb1db8123a575f7dfad9efb551
Yao Chen [Tue, 27 Mar 2018 19:34:48 +0000 (19:34 +0000)]
Merge "Support sliced condition change in GaugeMetric" into pi-dev
am:
d9afdee26f
Change-Id: Ic6cbbb276661e6ab6e70ed05fd0b069ecac096f7
Andreas Gampe [Tue, 27 Mar 2018 19:30:03 +0000 (19:30 +0000)]
Fix merge commit
am:
e5ff934639
Change-Id: I5b77089beef67f2d816e24176e3ab7386b670293
Alexandru-Andrei Rotaru [Tue, 27 Mar 2018 19:28:24 +0000 (19:28 +0000)]
[automerger skipped] Reapply "Notify the user and turn off tethering when the service is disallowed."
am:
be8e056d0e -s ours
Change-Id: I6e8960dc1efb1c9b81cd6a3273e4d06c354050e1
TreeHugger Robot [Tue, 27 Mar 2018 19:26:44 +0000 (19:26 +0000)]
Merge "Camera2: Add distortion correction support" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 19:23:50 +0000 (19:23 +0000)]
Merge "Show dynamic subtext for RestrictedSwitchPreference." into pi-dev
Nate Fischer [Tue, 27 Mar 2018 19:20:12 +0000 (19:20 +0000)]
Merge "WebView: clarify shouldInterceptRequest docs" into pi-dev
am:
0cf0d1368a
Change-Id: Ib556e836800e748cca781b2cf94280ac62e1d0bf
TreeHugger Robot [Tue, 27 Mar 2018 19:19:40 +0000 (19:19 +0000)]
Merge "[Notif] Add Blocking helper to swipe" into pi-dev
Kweku Adams [Tue, 27 Mar 2018 19:06:52 +0000 (19:06 +0000)]
Merge "Refactoring SecureSettingsProto to avoid method limit." into pi-dev
am:
4bd3f99bfe
Change-Id: I0aac058c9eea7a462ad48a7b97faa4cd838c5132
Mike Ma [Sun, 25 Mar 2018 09:32:35 +0000 (02:32 -0700)]
Track USB data link in batterystats
Record USB data link state in addition to plug & charging state, since
modern USB controller can keep USB data link connected with minimum
current. Device is not acutally charging at those times.
Test: manual
Fixes:
76209292
Change-Id: I0710d547399a631d594488a524682ccc32a25ce6
TreeHugger Robot [Tue, 27 Mar 2018 19:05:24 +0000 (19:05 +0000)]
Merge "Don't let callers OOM the system process." into pi-dev
Derek Sollenberger [Tue, 27 Mar 2018 18:59:01 +0000 (18:59 +0000)]
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev
am:
812e87ecba
Change-Id: I0e201fc0c0aa445c8697ff438cbbb314b02884c9
Jesse Hall [Tue, 27 Mar 2018 18:54:28 +0000 (18:54 +0000)]
Merge "Docs: add more detail to SurfaceTexture#getTimestamp" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 18:52:36 +0000 (18:52 +0000)]
Merge "[QS] Update landscape UI" into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 18:52:15 +0000 (18:52 +0000)]
Merge "Guard against null server" into pi-dev
am:
bb54f62d1a
Change-Id: I6a35fcd7b27e04ae207fafca9f504bfaad174035
TreeHugger Robot [Tue, 27 Mar 2018 18:49:01 +0000 (18:49 +0000)]
Merge "resolve merge conflicts of
a2640b6f5142697162d4f02b4134e78b268f4a4b to pi-dev-plus-aosp" into pi-dev-plus-aosp
Jeff Sharkey [Tue, 27 Mar 2018 18:47:31 +0000 (18:47 +0000)]
Merge "Only resolve users on content:// Uris." into pi-dev
am:
766343cbbc
Change-Id: Ibc3d03e645e07324484a8a2f4db9832d042a07d3
TreeHugger Robot [Tue, 27 Mar 2018 18:43:17 +0000 (18:43 +0000)]
Merge "Tweak FingerprintDialog" into pi-dev
Tyler Gunn [Tue, 27 Mar 2018 18:42:00 +0000 (18:42 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." into pi-dev
am:
8b7fcc3dab
Change-Id: I273a85688aa4d9601d4b482dc15fa9c4d2fb0411
TreeHugger Robot [Tue, 27 Mar 2018 18:40:39 +0000 (18:40 +0000)]
Merge "Adjust the volumeDialog layout" into pi-dev
Joshua Baxter [Tue, 27 Mar 2018 18:36:31 +0000 (18:36 +0000)]
docs: fixed typo am:
3639e2f929
am:
b3c20232f1
Change-Id: I69cfe0e14e51b1c70851752de38c0ae6461b4b0f
Lucas Dupin [Tue, 27 Mar 2018 18:35:33 +0000 (11:35 -0700)]
Avoid binder call while dragging
Test: change auth method, swipe up
Test: brakpoint at binder call
Change-Id: I2a5454e1f80dae094866a5b3f32d02bd528a0696
Fixes:
76456138
Robert Berry [Tue, 27 Mar 2018 18:31:59 +0000 (18:31 +0000)]
Merge "Do not create snapshot on first init" into pi-dev
am:
678c0286be
Change-Id: I0972ab2048c328364800ed8657413dbf1f5c2543
Treehugger Robot [Tue, 27 Mar 2018 18:30:12 +0000 (18:30 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs"
TreeHugger Robot [Tue, 27 Mar 2018 18:27:27 +0000 (18:27 +0000)]
Merge "Support sliced condition change in GaugeMetric" into pi-dev
Andrii Kulian [Tue, 27 Mar 2018 18:24:50 +0000 (18:24 +0000)]
Merge "Use transaction for local activity relaunch" into pi-dev
am:
dbac87dd40
Change-Id: Iea33b11413999fe45f6d0e28d376b18e68fc5124
TreeHugger Robot [Tue, 27 Mar 2018 18:23:02 +0000 (18:23 +0000)]
Merge "WebView: clarify shouldInterceptRequest docs" into pi-dev
Andrew Chant [Fri, 23 Mar 2018 04:07:33 +0000 (21:07 -0700)]
Add UsbDeviceAdded and update PhysicalDropDetected
Add UsbDeviceAdded to log VID, PID, and interface
types of USB devices added to the system.
Add a fall duration to physical drop detected.
Bug:
74260509
Bug:
74261750
Test: Built and booted Walleye
Change-Id: I2b38697ba52869bc448fac2cc4b8bdb3fa75fa64
Mihai Popa [Tue, 27 Mar 2018 18:20:26 +0000 (18:20 +0000)]
Merge "[Magnifier-35] Do not show when text is large" into pi-dev
am:
f45b3a1136
Change-Id: I6f050b6dfe847daf8d3ebef29398344d69d8baf5
Beverly [Tue, 27 Mar 2018 18:14:57 +0000 (18:14 +0000)]
Merge "Priority only dnd doesn't change ringer" into pi-dev
am:
0d5bbf77b5
Change-Id: I50789ea423b1134f87af763cea4c51fb5471eae3
Myles Watson [Mon, 26 Mar 2018 21:28:46 +0000 (14:28 -0700)]
Tell the user to toggle Bluetooth when enabling HCI logs
Bug:
67634644
Test: Manually inspect the new text in developer settings
Change-Id: Ic8b08c8d6d0c7727a03a265fb6b10a3c55fd96cb
Andreas Gampe [Tue, 27 Mar 2018 17:23:58 +0000 (10:23 -0700)]
Fix merge commit
Follow-up to commit
a2640b6f5142697162d4f02b4134e78b268f4a4b
Test: mmma frameworks/base/tests/net
Change-Id: I5cdc873f6d0d0c39c8e0b38cd04c16fd16a47cbf
Rohan Shah [Tue, 27 Mar 2018 18:09:38 +0000 (18:09 +0000)]
Merge "[Notif] Disable long click listener after dismiss" into pi-dev
am:
620da5249f
Change-Id: I32f5cdb7487f603533e55920110428104e55c9f9
TreeHugger Robot [Tue, 27 Mar 2018 18:09:37 +0000 (18:09 +0000)]
Merge "Refactoring SecureSettingsProto to avoid method limit." into pi-dev
Alexandru-Andrei Rotaru [Mon, 26 Jun 2017 16:31:35 +0000 (17:31 +0100)]
Reapply "Notify the user and turn off tethering when the service is disallowed."
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification about
tethering being turned off. Also added Unit Tests to test the functionality
of the UserRestrictionListener added.
(cherry picked from commit
f8f3fbbd016d12f80c02e136ab4684da807792a1)
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: I500e51fb44a93e943f8566b544e7ad4983ac6a6e
chaviw [Mon, 26 Mar 2018 21:06:17 +0000 (14:06 -0700)]
Don't animate dim layer exit when recents animation finishes.
Recents animation handles animating the entire Task, which includes the
dim layer. After the recents animation is completed, there's no need for
the dim layer to start the exit animation. The recents animation takes
care of fading out the dim layer. Instead, just set the dimmer
mAnimateExit to false so the next call to updateDims will remove the dim
layer instead of starting the exit animation.
Test: Enter quick step with assistant open. Dim no longer flickers
at the end of the quick step animation.
Test: DimmerTests#testRemoveDimImmediately
Fixes:
74606159
Change-Id: Iceb4edde5edffdbba57dca35f258d9b3d7bf74f4
yuemingw [Mon, 12 Mar 2018 17:04:04 +0000 (17:04 +0000)]
Show dynamic subtext for RestrictedSwitchPreference.
Show dynamic subtext for RestrictedSwitchPreference when corresponding
restriction is on according to the current settings status controlled
by this RestrictedSwitchPreference. I.e., show "enabled by admin"
when corresponding setting is currently turned on by admin, or
"disabled by admin". In the past, this string is hard coded in xml and
the subtext of RestrictedSwitchPreference always shows one of
"enabled by admin" and "disabled by admin" regardless of the current
status of the setting.
Bug:
73811933
Test: manually by TestDPC
Change-Id: I2bbeee14e650b288d71f6aa59fc63dd78e18d49e
TreeHugger Robot [Tue, 27 Mar 2018 18:00:29 +0000 (18:00 +0000)]
Merge "Remove deprecated android.graphics.Canvas APIs" into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 17:54:21 +0000 (17:54 +0000)]
Merge "Guard against null server" into pi-dev
Felipe Leme [Mon, 26 Mar 2018 23:18:45 +0000 (16:18 -0700)]
Recover dataset picker when view fail to autofill.
When a dataset is selected, the framework tries to autofill all views belonging
to it. But if one (or more view) failed to autofill, we should let the user
recover by tapping the view again.
This scenario typically happens when views are recycled.
Test: atest MutableAutofillIdTest#testViewGoneDuringAutofillCanStillBeFilled
Test: atest CtsAutoFillServiceTestCases # manually retrying flaky failures
Fixes:
76149637
Change-Id: I7a6352c68b4a7d5e4cb80a7346c66efd831f21c8
Winson Chung [Tue, 27 Mar 2018 02:18:39 +0000 (19:18 -0700)]
Use package context for loading task description icon resource
Bug:
73816146
Test: Manual, swipe up, ensure we still load icons
Change-Id: I21d39da5891e2f4cdf5427bcb03049ed05780c87
Victor Hsieh [Tue, 27 Mar 2018 17:48:04 +0000 (17:48 +0000)]
Merge "Downgrade OOB warning of priv app to warning" into pi-dev
am:
7d2c324cc7
Change-Id: Id1933304f4a9dc9382de285e900a9d3e6a1904cc
TreeHugger Robot [Tue, 27 Mar 2018 17:43:27 +0000 (17:43 +0000)]
Merge "Only resolve users on content:// Uris." into pi-dev
Tyler Gunn [Tue, 27 Mar 2018 17:39:26 +0000 (17:39 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 17:35:32 +0000 (11:35 -0600)]
Public volumes only browsable by mounting user.
We can't browse public volumes mounted for a different user, so don't
return an Intent claiming that we can, since it'll just fail.
Test: manual
Bug:
74056525
Change-Id: Iba4e52c2672258b981d2912875e55949bb35e310
Joshua Baxter [Tue, 27 Mar 2018 17:34:53 +0000 (17:34 +0000)]
docs: fixed typo
am:
3639e2f929
Change-Id: I6f7381045bb25fdcc9f86e3e2dd0d7b8c4eda853
Jeff Sharkey [Tue, 27 Mar 2018 17:30:53 +0000 (11:30 -0600)]
Public volumes are only visible to mounted user.
New lower-level security fixes are blocking access, so make these
upper-level APIs reflect those properties.
Test: manual
Bug:
68857050
Change-Id: I81160755180f4f419d8577ea1f18a6ece10c560c
TreeHugger Robot [Tue, 27 Mar 2018 17:28:32 +0000 (17:28 +0000)]
Merge "Do not create snapshot on first init" into pi-dev
Meng Wang [Fri, 23 Mar 2018 23:25:03 +0000 (16:25 -0700)]
Revert "Unhide enable_apps carrier config key."
This reverts commit
4793b28d3f2a65492aa7049c5e6e77c1cdbbb1a3.
Reason for revert: This is not intended as a public API.
Bug:
62907095
Test: make
Change-Id: Id79f91c72eac3929fa5ee7ac1cdd9df8671a1eb1
(cherry picked from commit
f47a426206cd89d49df8369eaa98a685365a62ed)
Andrii Kulian [Tue, 27 Mar 2018 17:24:42 +0000 (17:24 +0000)]
Merge "Use transaction for local activity relaunch" into pi-dev
David Brazdil [Tue, 27 Mar 2018 17:23:54 +0000 (17:23 +0000)]
Merge "Add serialization methods to hidden API light greylist" into pi-dev
am:
02175b7847
Change-Id: Ie625488ec40b3fd18d11043a1d25f5ccb487c351
TreeHugger Robot [Tue, 27 Mar 2018 17:20:12 +0000 (17:20 +0000)]
Merge "[Magnifier-35] Do not show when text is large" into pi-dev
Rohan Shah [Thu, 15 Mar 2018 21:40:02 +0000 (14:40 -0700)]
[Notif] Add Blocking helper to swipe
Implemented blocking helper UI as part of guts - the
ExpandableNotificationRow that's swiped away is effectively detached
from the notification logic but kept in as a view in the layout (it'll
still show up when looping through the normal view hierarchy). We
purposefully open up NotificationInfo with the intent of showing it as
the blocking helper.
It's animated away/closed when the user interacts with any other content
or swipes away, as with guts (Can be changed in the future if we want it
to stick around for longer).
KIs, that will be tracked in bugs once CL is in:
- Swiping a notification if it's partially hidden by the shelf does not
bring it up into focus
- If only one notification is showing, the shade auto-closes as if it
didn't have any notifications (which it technically doesn't)
- Animation on multiple blocking helper shows cuts too early and doesn't
allow the notification to transition out
- Long press on notification dismisses (it should probably ignore it)
- Metrics are still missing
- Accessibility needs a runthrough
Bug:
63095540,
73783854
Test: Visually & Ran all tests
Change-Id: Iaa5e3d5537bbb72c946fdd7ee35b155e22ca2b05
TreeHugger Robot [Tue, 27 Mar 2018 17:14:17 +0000 (17:14 +0000)]
Merge "Priority only dnd doesn't change ringer" into pi-dev
Jorim Jaggi [Tue, 27 Mar 2018 17:11:49 +0000 (17:11 +0000)]
Merge "Clear calling identity in finish callback" into pi-dev
am:
2f426bcd09
Change-Id: Ide17dbc9159085c4367644a891e82c40247ab9fa
Jeff Sharkey [Tue, 27 Mar 2018 17:09:16 +0000 (11:09 -0600)]
Don't let callers OOM the system process.
Constrain our default history size to 180 days; if we end up needing
more, we'll dynamically grow the history object.
Test: manual
Bug:
70916680
Change-Id: Id885f9800ad8f45fb0c1a89dab5a4b10ffd9e2f2
Jesse Hall [Fri, 23 Mar 2018 16:43:42 +0000 (09:43 -0700)]
Docs: add more detail to SurfaceTexture#getTimestamp
Copies language from <android/surface_texture.h> that connects
EGL/Vulkan presentation timestamps to SurfaceTexture#getTimestamp.
In the process, reorganized the existing language to talk about
general properties of the timestamp, and then talk about behavior of
specific producers instead of mixing them together.
Bug:
72755997
Test: make docs
Change-Id: I88253f9e23df7d7c4fe3c1c51ff2ac494da1913c
(cherry picked from commit
63d2a0e00005e9b5bb6e62d752a23ef2e43b03d4)
Rohan Shah [Tue, 27 Mar 2018 17:06:51 +0000 (17:06 +0000)]
Merge "[Notif] Disable long click listener after dismiss" into pi-dev
Winson Chung [Tue, 27 Mar 2018 17:06:51 +0000 (17:06 +0000)]
Merge "Disable long press recents whenever overview service is bound" into pi-dev
am:
b1d16f8e52
Change-Id: I6999074e8354dd6fc7a9529d08722f2a3a65ff6e
Victor Hsieh [Tue, 27 Mar 2018 17:04:01 +0000 (17:04 +0000)]
Merge "Downgrade OOB warning of priv app to warning" into pi-dev
Winson Chung [Tue, 27 Mar 2018 17:00:15 +0000 (17:00 +0000)]
Merge "Update onboarding based on swipe up state" into pi-dev
am:
5995d21a93
Change-Id: Ib664658e297afb0f136f44dd2da86b195adc380f
David Brazdil [Tue, 27 Mar 2018 16:55:18 +0000 (16:55 +0000)]
Merge "Add serialization methods to hidden API light greylist" into pi-dev
David Brazdil [Mon, 26 Mar 2018 15:02:23 +0000 (16:02 +0100)]
Add serialization methods to hidden API light greylist
This patch adds a build-time rule that adds all members with signatures:
readObject(Ljava/io/ObjectInputStream;)V
readObjectNoData()V
readResolve()Ljava/lang/Object;
serialVersionUID:J
serialPersistentFields:[Ljava/io/ObjectStreamField
writeObject(Ljava/io/ObjectOutputStream;)V
writeReplace()Ljava/lang/Object;
to the hidden API light greylist. This is needed so that apps can retain
the ability to write their own serializers.
Bug:
64382372
Bug:
73255398
Test: make
Change-Id: I0103f47044e957bbff0a39230ff53562f3feddac
TreeHugger Robot [Tue, 27 Mar 2018 16:44:26 +0000 (16:44 +0000)]
Merge "Clear calling identity in finish callback" into pi-dev
Winson Chung [Tue, 27 Mar 2018 16:43:55 +0000 (16:43 +0000)]
Merge "Disable long press recents whenever overview service is bound" into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 16:43:25 +0000 (16:43 +0000)]
Merge "API council requested tweaks to JobInfo." into pi-dev
am:
a9975804a2
Change-Id: I40217f8df995db19a59e0253b3d8d0440d57acb3