OSDN Git Service
Svet Ganov [Tue, 27 Mar 2018 04:19:46 +0000 (04:19 +0000)]
Merge "Don't allow acccess to uninstalled system providers" into pi-dev
am:
bf47ae3152
Change-Id: I559684b93914020702636ee21ff0f79138740a77
Jeff Sharkey [Tue, 27 Mar 2018 04:13:02 +0000 (04:13 +0000)]
Merge "Give DPM callers unsafe labels." into pi-dev
am:
a80057c359
Change-Id: I1db954072cd00caa70ef527b885a1893668b3eac
Jeff Sharkey [Tue, 27 Mar 2018 03:57:46 +0000 (03:57 +0000)]
Merge "API council requested tweaks to TrafficStats." into pi-dev
am:
9a6bc76ee8
Change-Id: I6b969377a6e268c1377fcc17f2443cb73072fda2
Jeff Sharkey [Tue, 27 Mar 2018 03:45:07 +0000 (03:45 +0000)]
Merge "Report final progress when finished copying." into pi-dev
am:
01f2ff1aa4
Change-Id: I1421da9d91c172fb9afff1e5960a9c86ff2d794d
Jerry Zhang [Tue, 27 Mar 2018 03:39:57 +0000 (03:39 +0000)]
Merge "Revert "Add additional context to MtpDatabase"" into pi-dev
am:
02a005703a
Change-Id: Id1667df7f50096619e7207d42a0212139eab7758
Jerry Zhang [Tue, 27 Mar 2018 03:20:27 +0000 (03:20 +0000)]
Merge "Write descriptors for Mtp in UsbService" into pi-dev
am:
df101a4596
Change-Id: If12b1138a9be2f2e653c070c44d54ebfe008b7ff
TreeHugger Robot [Tue, 27 Mar 2018 03:16:25 +0000 (03:16 +0000)]
Merge "Don't allow acccess to uninstalled system providers" into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 03:14:48 +0000 (03:14 +0000)]
Merge "Fix NPE when UID doesn't exist." into pi-dev
am:
31e1171fd8
Change-Id: I2426e4d9d105637874aa51885b728ce3962f0698
TreeHugger Robot [Tue, 27 Mar 2018 03:06:37 +0000 (03:06 +0000)]
Merge "Give DPM callers unsafe labels." into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 03:04:34 +0000 (03:04 +0000)]
Merge "API council requested tweaks to SystemClock." into pi-dev
am:
0bff5a6dfa
Change-Id: I5b7d6247342eaddb8024842cecfc516ae2aa5fcc
TreeHugger Robot [Tue, 27 Mar 2018 02:56:24 +0000 (02:56 +0000)]
Merge "API council requested tweaks to TrafficStats." into pi-dev
Lucas Dupin [Tue, 27 Mar 2018 02:52:48 +0000 (02:52 +0000)]
Merge "Fix issue where bouncer would go away" into pi-dev
am:
fddbae9c78
Change-Id: I372570965e1199bb15343eba5740f71ed11cb3b7
TreeHugger Robot [Tue, 27 Mar 2018 02:52:26 +0000 (02:52 +0000)]
Merge "Report final progress when finished copying." into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 02:49:30 +0000 (02:49 +0000)]
Merge "Revert "Add additional context to MtpDatabase"" into pi-dev
Jerry Zhang [Tue, 27 Mar 2018 02:49:02 +0000 (02:49 +0000)]
Merge "Write descriptors for Mtp in UsbService" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 02:48:46 +0000 (02:48 +0000)]
Merge "Add metrics for new settings conditional cards." into pi-dev
am:
930f74d00d
Change-Id: I4f7f98b3f4cda9c0c072121913a2a252dd022cfe
TreeHugger Robot [Tue, 27 Mar 2018 02:44:02 +0000 (02:44 +0000)]
Merge "Fix NPE when UID doesn't exist." into pi-dev
Jeff Sharkey [Tue, 27 Mar 2018 02:41:52 +0000 (02:41 +0000)]
Merge "API council requested tweaks to DataUnit." into pi-dev
am:
b15bcea4d4
Change-Id: Ibf7dce0c3d823135834a5160bc55da94c3b874e4
TreeHugger Robot [Tue, 27 Mar 2018 02:40:24 +0000 (02:40 +0000)]
Merge "API council requested tweaks to SystemClock." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 02:37:35 +0000 (02:37 +0000)]
Merge "Fix issue where bouncer would go away" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 02:36:14 +0000 (02:36 +0000)]
Merge "Add metrics for new settings conditional cards." into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 02:30:25 +0000 (02:30 +0000)]
Merge "API council requested tweaks to DataUnit." into pi-dev
Christofer Åkersten [Tue, 27 Mar 2018 02:04:08 +0000 (02:04 +0000)]
Merge "Hide Media*2 APIs" into pi-dev
am:
855617501c
Change-Id: Id9523e20766e68422a2808383623e11f5e799de2
Jeff Sharkey [Tue, 27 Mar 2018 01:53:01 +0000 (01:53 +0000)]
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
am:
fee443bfab
Change-Id: Ie2a6b0bb46ea6275cb2af0ef006472daf5e80b14
Christofer Åkersten [Tue, 27 Mar 2018 01:46:42 +0000 (01:46 +0000)]
Merge "Hide Media*2 APIs" into pi-dev
TreeHugger Robot [Tue, 27 Mar 2018 01:40:23 +0000 (01:40 +0000)]
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
Lucas Dupin [Tue, 27 Mar 2018 01:25:38 +0000 (01:25 +0000)]
Merge "Fix flickering when switching display power modes" into pi-dev
am:
5e0957aaed
Change-Id: If60109cfeb9f5e059b0bf1963eadd7b2e2c8748c
Svet Ganov [Sat, 24 Mar 2018 08:05:33 +0000 (01:05 -0700)]
Don't allow acccess to uninstalled system providers
If system providers are not installed yet we aggressively crash to avoid
creating multiple instance of these providers and then bad things happen!
Test: manual
Bug:
72457712
Change-Id: I5d7da8c05c08f719a8996b48bffa2317193c1275
Android Build Merger (Role) [Tue, 27 Mar 2018 01:21:37 +0000 (01:21 +0000)]
Merge "[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a am:
b1cb52e1a8 -s ours" into pi-dev-plus-aosp
Hall Liu [Tue, 27 Mar 2018 01:20:41 +0000 (01:20 +0000)]
[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a
am:
b1cb52e1a8 -s ours
Change-Id: I87ed98ccbb62e13bc88f5cfe7e00b15364711969
Jeff Sharkey [Tue, 27 Mar 2018 01:19:23 +0000 (19:19 -0600)]
Give DPM callers unsafe labels.
Tests want the full label, so give it to them.
Test: none
Bug:
74254785
Change-Id: Ia358ee54396ee0a0684fd352c7133f54d9f8c4a7
Matthew Ng [Tue, 27 Mar 2018 01:19:21 +0000 (01:19 +0000)]
Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev
am:
f856f352ab
Change-Id: I83e40ef4f253890441369e46479b62487eaf27b5
Seigo Nonaka [Tue, 27 Mar 2018 01:11:24 +0000 (01:11 +0000)]
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev
am:
a1ff74c68d
Change-Id: Ic003d918ce83224e3daa513a0a8c8ee161f62c42
Hall Liu [Tue, 27 Mar 2018 01:10:16 +0000 (01:10 +0000)]
Merge "Split the DownloadStateCallback class into two"
am:
aa8f09d41a
Change-Id: Id31521d2a138a0a3ef98ea5a56d19621c757dc90
Jeff Sharkey [Tue, 27 Mar 2018 01:06:54 +0000 (01:06 +0000)]
Merge "Add linter for strings.xml." into pi-dev
am:
642c0be3f3
Change-Id: I9677257b4ddfe5c1347b6de13b98e2b25fd649ac
Ajay Panicker [Tue, 27 Mar 2018 01:01:53 +0000 (01:01 +0000)]
[automerger skipped] Merge "Add the AVRCP Target Service (2/2)" into pi-dev
am:
d3a6af439e -s ours
Change-Id: I538ec1a08ac8f7e4c403a2559831042414d1d9bb
Ajay Panicker [Tue, 27 Mar 2018 00:50:15 +0000 (00:50 +0000)]
[automerger skipped] Add the AVRCP Target Service (2/2)
am:
0a9258f435 -s ours
Change-Id: Iebb8e4c29c37e8afa18f364a94f5eb4b874ee786
Lucas Dupin [Tue, 27 Mar 2018 00:48:17 +0000 (00:48 +0000)]
Merge "Fix flickering when switching display power modes" into pi-dev
Winson Chung [Tue, 27 Mar 2018 00:45:24 +0000 (00:45 +0000)]
Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev
am:
20ebb32825
Change-Id: Icf92ea2e9573d41157c973690fe5a0457abc2207
TreeHugger Robot [Tue, 27 Mar 2018 00:43:55 +0000 (00:43 +0000)]
Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev
Chen Xu [Tue, 27 Mar 2018 00:39:59 +0000 (00:39 +0000)]
Merge "throw runtimeException for applicable TM APIs" into pi-dev
am:
17aa751907
Change-Id: I44ab8310928658c38bae9522b31515ee6c36d6d2
Philip P. Moltmann [Tue, 27 Mar 2018 00:28:02 +0000 (00:28 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev
am:
a1b9a31f1e
Change-Id: I5137b68961cba761256220e7b5fe9f00474df3f7
Chenjie Yu [Tue, 27 Mar 2018 00:20:34 +0000 (00:20 +0000)]
Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev
am:
dafbeecaf7
Change-Id: Ic0fda3ce07eec50e40e27cd88dc7c2d6c7ed8a5a
TreeHugger Robot [Tue, 27 Mar 2018 00:10:11 +0000 (00:10 +0000)]
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev
Abodunrinwa Toki [Mon, 26 Mar 2018 23:59:02 +0000 (23:59 +0000)]
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
am:
d982f561cc
Change-Id: I231dd3046832556a55ea8a5eec7b288c9a199f9f
Jeff Sharkey [Mon, 26 Mar 2018 23:57:34 +0000 (23:57 +0000)]
Merge "Add linter for strings.xml." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 23:54:39 +0000 (23:54 +0000)]
Merge "Add the AVRCP Target Service (2/2)" into pi-dev
Treehugger Robot [Mon, 26 Mar 2018 23:53:40 +0000 (23:53 +0000)]
Merge "Split the DownloadStateCallback class into two"
Fan Zhang [Mon, 26 Mar 2018 23:52:53 +0000 (16:52 -0700)]
Add metrics for new settings conditional cards.
Bug:
76022431
Test: rebuild
Change-Id: I12541a43d742c17e22db701050bb7b72bd423522
Winson Chung [Mon, 26 Mar 2018 23:45:22 +0000 (23:45 +0000)]
Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev
Chen Xu [Mon, 26 Mar 2018 23:39:56 +0000 (23:39 +0000)]
Merge "throw runtimeException for applicable TM APIs" into pi-dev
Matthew Ng [Mon, 26 Mar 2018 23:39:36 +0000 (23:39 +0000)]
Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev
am:
a76018de57
Change-Id: Ic2d9c1d1f486f4aac99b03b5a25351b65447c47e
TreeHugger Robot [Mon, 26 Mar 2018 23:34:50 +0000 (23:34 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 23:28:30 +0000 (23:28 +0000)]
Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev
Dmitry Dementyev [Mon, 26 Mar 2018 23:26:27 +0000 (23:26 +0000)]
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
am:
5b4a0d6751
Change-Id: I27700c001112a0778a3599679f46914000e36174
TreeHugger Robot [Mon, 26 Mar 2018 23:21:37 +0000 (23:21 +0000)]
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev
Rubin Xu [Mon, 26 Mar 2018 23:19:11 +0000 (23:19 +0000)]
Merge "Disallow copy & paste from personal to profile under policy" into pi-dev
am:
22d10bc586
Change-Id: Ie4cec95ab77024d92f0923600c341c6baa7707c1
TreeHugger Robot [Mon, 26 Mar 2018 23:17:25 +0000 (23:17 +0000)]
Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev
Ajay Panicker [Fri, 16 Mar 2018 11:00:27 +0000 (04:00 -0700)]
Add the AVRCP Target Service (2/2)
Add the AVRCP Target constant to Bluetooth Profile. Also remove redundant
public static final modifier on the constants.
Bug:
68854188
Test: Compiles and local test with service enabled
Change-Id: If2ec607fc704c225f8903d438fe970dfafac25f1
(cherry picked from commit
38c3073ba2532db7b5adf5f7f96cef847771c41b)
Merged-In: If2ec607fc704c225f8903d438fe970dfafac25f1
Andrew Chant [Mon, 26 Mar 2018 23:08:16 +0000 (23:08 +0000)]
Merge changes I72688f65,I2dd8d439 into pi-dev
am:
ae0b962865
Change-Id: Iefb0c90fd64c20ecfc1c1e73ca1a7c69d0b849de
Dmitry Dementyev [Mon, 26 Mar 2018 23:07:23 +0000 (23:07 +0000)]
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev
David Chen [Mon, 26 Mar 2018 23:02:48 +0000 (23:02 +0000)]
Merge "Fix uidmap in statsd." into pi-dev
am:
d41fad71a6
Change-Id: Ia61b30b34fa8e0fa7e4f189ba39fa4a2335b409c
Philip P. Moltmann [Mon, 26 Mar 2018 22:56:01 +0000 (22:56 +0000)]
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
am:
9360a31f5f
Change-Id: Ie4c8cb0ffa78bd1a008aad2eae9caae6c2c0afb5
Jeff Sharkey [Mon, 26 Mar 2018 22:54:36 +0000 (16:54 -0600)]
Report final progress when finished copying.
Test: none
Bug:
74120182
Change-Id: I984d38505545b5f18dd3dd9a3c6f714a9ea86edd
Jeff Sharkey [Mon, 26 Mar 2018 22:50:59 +0000 (16:50 -0600)]
Fix NPE when UID doesn't exist.
This can happen when the usage was performed by a synthetic UID,
such as TrafficStats.UID_TETHERING or UID_REMOVED.
Test: none
Bug:
74195808
Change-Id: I2859a8f5f4a1611c48bb56386ad4b2335a87f611
TreeHugger Robot [Mon, 26 Mar 2018 22:47:45 +0000 (22:47 +0000)]
Merge "Disallow copy & paste from personal to profile under policy" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 22:45:28 +0000 (22:45 +0000)]
Merge changes I72688f65,I2dd8d439 into pi-dev
* changes:
UsbHostManager: Restore inserted device logging
UsbDescriptorParser: always parse in constructor
Mady Mellor [Mon, 26 Mar 2018 22:43:14 +0000 (22:43 +0000)]
Merge "Fix string description" into pi-dev
am:
2ed9bf437e
Change-Id: I6e2fc00904d50d7f8ec78a4b56f5a7bc5b05270a
Tyler Gunn [Mon, 26 Mar 2018 22:39:19 +0000 (22:39 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." am:
13791285aa
am:
7f4c7a1b88
Change-Id: Ibc4e5312b04abd5bad43f59c66a6f48a8150760e
TreeHugger Robot [Mon, 26 Mar 2018 22:38:25 +0000 (22:38 +0000)]
Merge "Fix uidmap in statsd." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 22:36:45 +0000 (22:36 +0000)]
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
Tyler Gunn [Mon, 26 Mar 2018 22:25:35 +0000 (22:25 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
am:
13791285aa
Change-Id: I91280ca5ce1a146ca0635f95fb2b0d9a311778ea
TreeHugger Robot [Mon, 26 Mar 2018 22:24:26 +0000 (22:24 +0000)]
Merge "Fix string description" into pi-dev
Jason Monk [Mon, 26 Mar 2018 21:59:46 +0000 (21:59 +0000)]
Merge "Security fixup for Slices" into pi-dev
am:
fc704e2fd7
Change-Id: I7a3dfda74afdbaa1c77058b3a27c86899c1b05a3
Makoto Onuki [Mon, 26 Mar 2018 21:54:07 +0000 (21:54 +0000)]
Merge "Sticky battery saver" into pi-dev
am:
110a7c20f4
Change-Id: Ieac07ecfaa0489d08a0bb9e2670da5b7e1a2d67c
Hall Liu [Tue, 20 Mar 2018 01:12:23 +0000 (18:12 -0700)]
Split the DownloadStateCallback class into two
Use individually-registered DownloadStatusListener and
DownloadProgressListener instead to listen for download status and
progress, respectively.
Bug:
74409377
Test: cts
Change-Id: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Merged-In: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Jason Monk [Mon, 26 Mar 2018 21:44:38 +0000 (21:44 +0000)]
Merge "Security fixup for Slices" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 21:41:09 +0000 (21:41 +0000)]
Merge "Sticky battery saver" into pi-dev
Jeff Sharkey [Mon, 26 Mar 2018 21:26:00 +0000 (15:26 -0600)]
API council requested tweaks to SystemClock.
Test: none
Bug:
73952114
Change-Id: Idd7aae5161a2326920860a6a9c7137369a4d8b3d
Tyler Gunn [Mon, 26 Mar 2018 21:18:54 +0000 (21:18 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
Hall Liu [Mon, 26 Mar 2018 21:12:17 +0000 (21:12 +0000)]
Merge "Modify LocationAccessPolicy to use LocationManager" into pi-dev
am:
8404d082c4
Change-Id: Idb1f49fbadd56de4a7d83263411b1be0c7dc34e1
Matthew Ng [Thu, 22 Mar 2018 18:33:16 +0000 (11:33 -0700)]
Fixes drawing quickscrub track in correct location with cutout
Cutout changes navigation bar padding, correct track rect with the
padding.
Test: do quickscrub
Change-Id: I762be276cc95af7290219cec1cc6afd27ddc8fd0
Fixes:
74904602
Seigo Nonaka [Fri, 23 Mar 2018 22:41:52 +0000 (15:41 -0700)]
Stop using DynamicLayout in case of non selectable PrecomputedText
DynamicLayout is required when
- The text is Editable.
- The selection is enabled on TextView.
This CL stops using DynamicLayout when the TextView is not selectable
TextView and the input text is PrecomputedText.
Bug:
72998298
Test: atest CtsWidgetTestCases:EditTextTest
CtsWidgetTestCases:TextViewFadingEdgeTest
FrameworksCoreTests:TextViewFallbackLineSpacingTest
FrameworksCoreTests:TextViewTest FrameworksCoreTests:TypefaceTest
CtsGraphicsTestCases:TypefaceTest CtsWidgetTestCases:TextViewTest
CtsTextTestCases FrameworksCoreTests:android.text
CtsWidgetTestCases:TextViewPrecomputedTextTest
Change-Id: Ic4a66ad3ed8868570735e3199879b74132a8c4aa
Hall Liu [Mon, 26 Mar 2018 20:59:58 +0000 (20:59 +0000)]
Merge "Modify LocationAccessPolicy to use LocationManager" into pi-dev
Andrew Chant [Fri, 2 Mar 2018 21:45:09 +0000 (13:45 -0800)]
UsbHostManager: Restore inserted device logging
Restore logcat logging of newly-added USB devices.
Eliminate blacklist log lines.
Test: Connected USB Storage and USB audio devices.
Updated UsbDescriptorParserTests for device descriptor
version.
example output:
UsbHostManager: USB device attached: vidpid 03eb:2433 mfg/product/ver/serial Libratone/Libratone_INEAR/1.00/Inear_mcu_app_0.2.1_20160304 hasAudio/HID/Storage: true/true/false
UsbHostManager: USB device attached: vidpid 05dc:a82b mfg/product/ver/serial Lexar/ARA Storage /2.08/
0024070163400215 hasAudio/HID/Storage: false/false/true
UsbHostManager: USB device attached: vidpid 18d1:5029 mfg/product/ver/serial Google/USB-C to 3.5mm-Headphone Adapter/22.80/
201405280001 hasAudio/HID/Storage: false/true/false
UsbHostManager: USB device attached: vidpid 18d1:5025 mfg/product/ver/serial Google/USB-C to 3.5mm-Headphone Adapter/22.80/
201405280001 hasAudio/HID/Storage: true/true/false
Bug:
74119682
Change-Id: I72688f651c819d4bdc48f6d6316570ca5fc54d1e
Andrew Chant [Fri, 2 Mar 2018 21:18:18 +0000 (13:18 -0800)]
UsbDescriptorParser: always parse in constructor
UsbDescriptorParser::parseDescriptors always returned true.
Remove the return value, and remove the one constructor that
doesn't parse descriptors so the device is always in a parsed state.
Bug:
74119682
Test: Built
Change-Id: I2dd8d439405867d78102a9591dd1db36fe3959dc
Lucas Dupin [Sat, 24 Mar 2018 00:26:06 +0000 (17:26 -0700)]
Fix issue where bouncer would go away
Activities with the flag FLAG_DISMISS_KEYGUARD_ACTIVITY will try to
dismiss the keyguard. In this case we should show the occluded bouncer.
Ideally we should not show the lock screen, but at this point,
ActivityManager still doesn't know if the keyguard should be dismissed
or not.
Test: manual, edit emergency information on EmercencyDialer
Test: runtest -x cts/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerDisplayLockedKeyguardTests.java
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Test: atest packages/SystemUI/tests/src/com/android/keyguard/KeyguardHostViewTest.java
Change-Id: I65b40ae47319c522c13ed3dc9420bc15cb472430
Fixes:
74726131
Fixes:
74779270
Android Build Merger (Role) [Mon, 26 Mar 2018 20:42:34 +0000 (20:42 +0000)]
Merge "Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev am:
d52c532df7" into pi-dev-plus-aosp
Chris Craik [Mon, 26 Mar 2018 20:42:10 +0000 (20:42 +0000)]
Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev
am:
d52c532df7
Change-Id: Ib503211113d175ed633a6e2045cd01938ba0d4c0
Android Build Merger (Role) [Mon, 26 Mar 2018 20:40:48 +0000 (20:40 +0000)]
Merge "[automerger skipped]Merge "Add new trace tag for AIDL." am:
fe3877f140 am:
c040ffd288 -s ours" into pi-dev-plus-aosp
Martijn Coenen [Mon, 26 Mar 2018 20:38:34 +0000 (20:38 +0000)]
[automerger skipped]Merge "Add new trace tag for AIDL." am:
fe3877f140
am:
c040ffd288 -s ours
Change-Id: I6e5fb41fc029498229f273e02d6c039b539cafbf
Svetoslav Ganov [Mon, 26 Mar 2018 20:37:01 +0000 (20:37 +0000)]
Merge "Add missing null check" into pi-dev
am:
8eef782e32
Change-Id: I65f07944eebe45d867f1b8250cd034dcfffd2816
Lucas Dupin [Mon, 26 Mar 2018 20:32:16 +0000 (13:32 -0700)]
Fix flickering when switching display power modes
So far we've been Waiting for the next frame but it doesn't
mean that it will be visible on the screen.
We're usually rendering with 2 buffers and it's possible that
we'll switch the display power mode before anything has hit
the display.
Increased the timeout for now until we have a better alternative.
Change-Id: I63afc8a9139a4ccbba4f16f5569717e22217da9a
Fixes:
72527083
Test: manual
Test: packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Kweku Adams [Mon, 26 Mar 2018 20:26:48 +0000 (20:26 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev
am:
cff4c5492e
Change-Id: If5bbf71d879484ad21e6e8d1222b31cde404b8af
Martijn Coenen [Mon, 26 Mar 2018 20:26:18 +0000 (20:26 +0000)]
Merge "Add new trace tag for AIDL."
am:
fe3877f140
Change-Id: I7aced8041cb8859b0a26db157e7626045e17a006
Philip P. Moltmann [Mon, 26 Mar 2018 20:26:05 +0000 (13:26 -0700)]
Run instant app pruning in background thread
Test: Installed realtor instant app and waited for pruning to remove it
Change-Id: I72e68930cd5d59ff2ca0943fb1670c409c51e617
Fixes:
76098629
Chris Craik [Mon, 26 Mar 2018 20:21:04 +0000 (20:21 +0000)]
Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev
Svetoslav Ganov [Mon, 26 Mar 2018 20:18:45 +0000 (20:18 +0000)]
Merge "Add missing null check" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 20:11:09 +0000 (20:11 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev
Jeff Sharkey [Mon, 26 Mar 2018 19:35:50 +0000 (13:35 -0600)]
API council requested tweaks to DataUnit.
Test: none
Bug:
71584606
Change-Id: Ic516dd7645e150586d7dd2e389e7663a32924ecc
OSDN Git Service
