OSDN Git Service
Hall Liu [Tue, 27 Mar 2018 01:53:11 +0000 (01:53 +0000)]
[automerger skipped] Merge "Split the DownloadStateCallback class into two" am:
aa8f09d41a am:
b1cb52e1a8 -s ours
am:
8d67ba80ae -s ours
Change-Id: Ie6ac719581ea1175987b51105a2fd8c90a25d007
Matthew Ng [Tue, 27 Mar 2018 01:39:15 +0000 (01:39 +0000)]
Merge "Fixes the inability to start quickscrub because hit target is none" into pi-dev am:
f856f352ab
am:
9112e74f36
Change-Id: Ic65bda3d4e944b82720563106922d61c0f262ad7
Seigo Nonaka [Tue, 27 Mar 2018 01:36:16 +0000 (01:36 +0000)]
Merge "Stop using DynamicLayout in case of non selectable PrecomputedText" into pi-dev am:
a1ff74c68d
am:
b2d133a858
Change-Id: I5669d0b2b4eea79e782e980cd7993d06d5183c49
Jeff Sharkey [Tue, 27 Mar 2018 01:32:36 +0000 (01:32 +0000)]
Merge "Add linter for strings.xml." into pi-dev am:
642c0be3f3
am:
6527cd70a2
Change-Id: I63b2c1e8be1e3ac908094b9822f0c5cc4072196e
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
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
Ajay Panicker [Tue, 27 Mar 2018 01:16:27 +0000 (01:16 +0000)]
[automerger skipped] Merge "Add the AVRCP Target Service (2/2)" into pi-dev am:
d3a6af439e -s ours
am:
3ea74ae05e -s ours
Change-Id: I79567281be090a592e4e1165159f3be1a8ae1767
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
Ajay Panicker [Tue, 27 Mar 2018 01:07:11 +0000 (01:07 +0000)]
[automerger skipped] Add the AVRCP Target Service (2/2) am:
0a9258f435 -s ours
am:
1c7fe9f63c -s ours
Change-Id: Icb7ac96788faeca0d5acd09ace81f5f79b815391
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
Winson Chung [Tue, 27 Mar 2018 00:59:17 +0000 (00:59 +0000)]
Merge "Fix issue with multiple recent tasks showing after restarting the device" into pi-dev am:
20ebb32825
am:
59af233fe8
Change-Id: Ie660665105d34ec7f2c1fef839174bb5945ba0ff
Chen Xu [Tue, 27 Mar 2018 00:54:37 +0000 (00:54 +0000)]
Merge "throw runtimeException for applicable TM APIs" into pi-dev am:
17aa751907
am:
7d38883e1b
Change-Id: I3be6e23cbcc31a46759275878f4d3a5681a1bdaf
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
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
Philip P. Moltmann [Tue, 27 Mar 2018 00:45:07 +0000 (00:45 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev am:
a1b9a31f1e
am:
a1e6c8fdf3
Change-Id: Ib8040410dabaa4176eb4e8f8f70217028d1641ef
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
Chenjie Yu [Tue, 27 Mar 2018 00:37:23 +0000 (00:37 +0000)]
Merge "Up the dimension key limit for CpuTimePerUidFreq" into pi-dev am:
dafbeecaf7
am:
40842f86f7
Change-Id: Ifd7a70a7177c48591f699ebd9d43524deeede289
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
Abodunrinwa Toki [Tue, 27 Mar 2018 00:18:34 +0000 (00:18 +0000)]
Merge "Fix random SmartLinkify-related TextView bugs." into pi-dev am:
d982f561cc
am:
62c135418d
Change-Id: Ibf482b7f40eb99ea53d9ed7187beeed0e7ff8195
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"
Matthew Ng [Mon, 26 Mar 2018 23:51:20 +0000 (23:51 +0000)]
Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev am:
a76018de57
am:
87f64d3420
Change-Id: I8cd8490895e6b586b9cffdaa9a04a9cfeef9eec3
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
Dmitry Dementyev [Mon, 26 Mar 2018 23:36:47 +0000 (23:36 +0000)]
Merge "Use Builder instead for KeyChainProtectionParams." into pi-dev am:
5b4a0d6751
am:
82476a3d52
Change-Id: Iec2ea078b5804be48857f8f04c15e126d57634a7
TreeHugger Robot [Mon, 26 Mar 2018 23:34:50 +0000 (23:34 +0000)]
Merge "Run instant app pruning in background thread" into pi-dev
Rubin Xu [Mon, 26 Mar 2018 23:28:35 +0000 (23:28 +0000)]
Merge "Disallow copy & paste from personal to profile under policy" into pi-dev am:
22d10bc586
am:
e2745a3bb7
Change-Id: I80b25fabd6750e8a2d3d91c52f629f81a6ce9796
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
Andrew Chant [Mon, 26 Mar 2018 23:23:14 +0000 (23:23 +0000)]
Merge changes I72688f65,I2dd8d439 into pi-dev am:
ae0b962865
am:
6568eec338
Change-Id: Ia21cb148114f3ddd83b015dc87d7c6ab0ab2fc53
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
David Chen [Mon, 26 Mar 2018 23:18:19 +0000 (23:18 +0000)]
Merge "Fix uidmap in statsd." into pi-dev am:
d41fad71a6
am:
bc341cdf02
Change-Id: I52167c72f6c544a29db71de93a57a241150f2bda
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
Philip P. Moltmann [Mon, 26 Mar 2018 23:08:15 +0000 (23:08 +0000)]
Merge "Make PackageManager#getNamesForUids testable." into pi-dev am:
9360a31f5f
am:
895b6a19a6
Change-Id: I91c97b4755173c0c870f692b0026886b0e03faf5
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
Mady Mellor [Mon, 26 Mar 2018 22:55:31 +0000 (22:55 +0000)]
Merge "Fix string description" into pi-dev am:
2ed9bf437e
am:
b2309652e6
Change-Id: I998cab6cc993df82e29efa74392733617812b8a1
Tyler Gunn [Mon, 26 Mar 2018 22:49:23 +0000 (22:49 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom." am:
13791285aa am:
7f4c7a1b88
am:
8b07cc5819
Change-Id: Iae4c2dfc912e0d2a4194deb62568ee2f78ce4e22
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 22:13:16 +0000 (22:13 +0000)]
Merge "Security fixup for Slices" into pi-dev am:
fc704e2fd7
am:
fe54f0c260
Change-Id: I3630b6130f2e51fee1a76364c424a20728213251
Makoto Onuki [Mon, 26 Mar 2018 22:00:33 +0000 (22:00 +0000)]
Merge "Sticky battery saver" into pi-dev am:
110a7c20f4
am:
7e62948ab3
Change-Id: Iabfe51042c3982d1d7315d5975d6b1a23594b443
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
Hall Liu [Mon, 26 Mar 2018 21:25:31 +0000 (21:25 +0000)]
Merge "Modify LocationAccessPolicy to use LocationManager" into pi-dev am:
8404d082c4
am:
0713d63e17
Change-Id: I254dac327a391af5828bb9adde0254cf1a0814a4
Tyler Gunn [Mon, 26 Mar 2018 21:18:54 +0000 (21:18 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
Chris Craik [Mon, 26 Mar 2018 21:17:36 +0000 (21:17 +0000)]
Merge "Merge "Remove incorrect @NonNull annotations on getDrawable() and variants." into pi-dev am:
d52c532df7" into pi-dev-plus-aosp
am:
51b58b2479
Change-Id: I61aae2f93b0aa0991b33ea376e4809ebce23df31
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
Martijn Coenen [Mon, 26 Mar 2018 20:59:37 +0000 (20:59 +0000)]
[automerger skipped]Merge "[automerger skipped]Merge "Add new trace tag for AIDL." am:
fe3877f140 am:
c040ffd288 -s ours" into pi-dev-plus-aosp
am:
a5bfcecde6 -s ours
Change-Id: I53e9da8fa83f5c18099d9edd4b6902fe820e5f8e
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
Svetoslav Ganov [Mon, 26 Mar 2018 20:44:18 +0000 (20:44 +0000)]
Merge "Add missing null check" into pi-dev am:
8eef782e32
am:
c95cc3ae63
Change-Id: Iaba76c1d4b87016efaa9182f45b21da25b4606f9
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
Kweku Adams [Mon, 26 Mar 2018 20:37:07 +0000 (20:37 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev am:
cff4c5492e
am:
635c42becc
Change-Id: I24513755644e10adb62dda85892570df1b2be6e9
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
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
Jesse Hall [Mon, 26 Mar 2018 20:12:00 +0000 (20:12 +0000)]
Merge "Docs: add more detail to SurfaceTexture#getTimestamp"
TreeHugger Robot [Mon, 26 Mar 2018 20:11:09 +0000 (20:11 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev
Robert Berry [Mon, 26 Mar 2018 19:47:20 +0000 (19:47 +0000)]
Merge "Fix setServerParams to not always set snapshot pending" into pi-dev am:
54419ca2bb
am:
1ffc8b1238
Change-Id: I3591732453a256554af1eabfae1a29e3583e71a3
Selim Cinek [Mon, 26 Mar 2018 19:42:14 +0000 (19:42 +0000)]
Merge "Translating the icon in the shelf with the notification" into pi-dev am:
5b154cee04
am:
ca7b762932
Change-Id: I3edb0f599d66d9ad280fd55c4d75d2daaefb5be7
Robert Berry [Mon, 26 Mar 2018 19:35:20 +0000 (19:35 +0000)]
Merge "Fix setServerParams to not always set snapshot pending" into pi-dev
am:
54419ca2bb
Change-Id: I15092dbcc5b328d71e3f93d92963583a54d78d54
Selim Cinek [Mon, 26 Mar 2018 19:30:43 +0000 (19:30 +0000)]
Merge "Translating the icon in the shelf with the notification" into pi-dev
am:
5b154cee04
Change-Id: I2f7fd1d685c3a90a4a55c2f66c3ef412fd24c2ee
Robert Berry [Mon, 26 Mar 2018 19:18:52 +0000 (19:18 +0000)]
Merge "Fix setServerParams to not always set snapshot pending" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 19:14:36 +0000 (19:14 +0000)]
Merge "Translating the icon in the shelf with the notification" into pi-dev
Dmitry Dementyev [Mon, 26 Mar 2018 18:31:46 +0000 (11:31 -0700)]
Use Builder instead for KeyChainProtectionParams.
Use Builder to create KeyChainSnapshot it tests.
Bug:
75952916
Test: apct
Change-Id: I5ab8c864a7ccc55dafa40867ec4364a705738d86
Martijn Coenen [Mon, 26 Mar 2018 19:00:57 +0000 (19:00 +0000)]
Merge "Add new trace tag for AIDL."
Elliott Hughes [Mon, 26 Mar 2018 18:50:54 +0000 (18:50 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
yuemingw [Mon, 26 Mar 2018 18:16:16 +0000 (18:16 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting." am:
5d9544cbea am:
2e8ebcf09b
am:
cd875b587b
Change-Id: I5403a2d0947176275a64397910eb6e2ca8a2a5d6
Matthew Ng [Thu, 22 Mar 2018 23:06:09 +0000 (16:06 -0700)]
Fixes the inability to start quickscrub because hit target is none
This can be caused by going home and quick scrubbing. onLayout in
NavigationBarView will record the incorrect location of the home button
if the home button has been dragged. The location is used to determined
which button was touched. Fixed by only recording the location if the
button has not moved.
Test: manual - press home, quickly scrub far and try scrub again
Change-Id: I24f1ac44531a030fdd4ba23410d803908462d564
Fixes:
75975208
OSDN Git Service
