OSDN Git Service
Android Build Merger (Role) [Fri, 15 Sep 2017 02:43:45 +0000 (02:43 +0000)]
Merge "Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16 am:
531a955dba" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 15 Sep 2017 02:43:03 +0000 (02:43 +0000)]
Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am:
cebe432650" into oc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 15 Sep 2017 02:42:06 +0000 (02:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16
am:
531a955dba
Change-Id: Iacfb1e2fc9b06ba9f559e44633a19ad6ab4f9038
sergeyv [Fri, 15 Sep 2017 02:40:32 +0000 (02:40 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
am:
cebe432650
Change-Id: Id5d81c128f6e96bef732508b8a50bad35f3cb298
Jakub Pawlowski [Fri, 15 Sep 2017 02:38:09 +0000 (02:38 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6 am:
3aa179fabd
am:
e22de0f23f
Change-Id: I30dc6840311d338976240cc86b9da9b116b175ad
Andreas Gampe [Fri, 15 Sep 2017 02:34:44 +0000 (02:34 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
am:
2437f9f10c
Change-Id: I69474f8e14d6abd2657b1fe9c587fef117df38ec
Jean-Michel Trivi [Fri, 15 Sep 2017 02:28:28 +0000 (02:28 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
am:
982ee8e6c3
Change-Id: Ifa18821b2ae5b3103f5025df88c0e545bdca56af
Kevin Hufnagle [Fri, 15 Sep 2017 02:24:50 +0000 (02:24 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df am:
91fb9b2a16
am:
677b6f5a7b
Change-Id: Ib225f08dd4d53479adab6df0f3559d09fe09ab21
Lucas Dupin [Fri, 15 Sep 2017 02:20:58 +0000 (02:20 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
am:
06dc14cabc
Change-Id: I838cbedf1388e8fcab56ecf824730b9ac871a738
Matthew Ng [Fri, 15 Sep 2017 02:17:32 +0000 (02:17 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
am:
33b1e1fe4d
Change-Id: Ic7c0ffeb7f295c4161d01d7ad1d0ae2eae6d9f85
TreeHugger Robot [Fri, 15 Sep 2017 02:15:23 +0000 (02:15 +0000)]
Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev
Matthew Ng [Fri, 15 Sep 2017 02:14:26 +0000 (02:14 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
am:
03f8b068a9
Change-Id: I83d71c531785410cf7aaaf18d921b0a3bcfa77eb
TreeHugger Robot [Fri, 15 Sep 2017 02:11:12 +0000 (02:11 +0000)]
Merge "Frameworks: Fix NPE for agent attach" into oc-mr1-dev
Beverly [Fri, 15 Sep 2017 02:10:50 +0000 (02:10 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
am:
8bba760b4f
Change-Id: Ib0982cf352af1e107f182251a1d01382865228d8
Jean-Michel Trivi [Fri, 15 Sep 2017 01:37:55 +0000 (01:37 +0000)]
Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 01:01:15 +0000 (01:01 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ib5ff83e4ce6c5a172db8f483387ebb6a8a97ae55
TreeHugger Robot [Fri, 15 Sep 2017 00:56:22 +0000 (00:56 +0000)]
Merge "Do not animate icons when leaving AoD" into oc-mr1-dev
Kevin Hufnagle [Fri, 15 Sep 2017 00:55:42 +0000 (00:55 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev am:
6087b990df
am:
91fb9b2a16
Change-Id: Ic808c82a82028169ed7aebd8c6d1b25f9e2b84cf
Kevin Hufnagle [Fri, 15 Sep 2017 00:42:20 +0000 (00:42 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
am:
6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
Kevin Hufnagle [Fri, 15 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Merge "docs: updated link on RemoteInput page" into oc-dev
Jakub Pawlowski [Fri, 15 Sep 2017 00:01:54 +0000 (00:01 +0000)]
Merge changes from topic "incl_svc_parsing_fix" am:
fee4546fd6
am:
3aa179fabd
Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:00 +0000 (23:36 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
am:
fee4546fd6
Change-Id: If7ee44287dbec54e49df9fc350b2ebdfcdaeb431
TreeHugger Robot [Thu, 14 Sep 2017 23:28:24 +0000 (23:28 +0000)]
Merge "Avoid saving position before minimizing when in transition" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 23:27:04 +0000 (23:27 +0000)]
Merge "Fixes quick switch animation entering recents for low ram devices" into oc-mr1-dev
Treehugger Robot [Thu, 14 Sep 2017 22:59:37 +0000 (22:59 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
* changes:
Fix included service parsing (3/3)
Bluetooth: fix typo in comment
Lucas Dupin [Thu, 14 Sep 2017 22:32:57 +0000 (22:32 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev
am:
a4996f241f
Change-Id: Iad619b9585fd3e0859e3588cc5d6dbb604f763e7
TreeHugger Robot [Thu, 14 Sep 2017 22:26:55 +0000 (22:26 +0000)]
Merge "Added SafetyNet logging for UsbDebugging security bug." into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:19:41 +0000 (22:19 +0000)]
Merge "Show big text on AoD" into oc-mr1-dev
Alan Viverette [Thu, 14 Sep 2017 21:59:37 +0000 (21:59 +0000)]
Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev
am:
c668bc0d92
Change-Id: Id1884d29e0d43808024947de6c366312d2e3e7d0
TreeHugger Robot [Thu, 14 Sep 2017 21:49:43 +0000 (21:49 +0000)]
Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:41:39 +0000 (21:41 +0000)]
Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
am:
a57aea0d61
Change-Id: I1aa4703f4d5fb110c0b4261cc091ba8dbfc5e5f1
Lei Yu [Thu, 14 Sep 2017 21:31:11 +0000 (21:31 +0000)]
Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
Andreas Gampe [Thu, 14 Sep 2017 21:02:09 +0000 (14:02 -0700)]
Frameworks: Fix NPE for agent attach
Fix missing null check.
Bug:
62445317
Test: m
Test: adb shell am start --attach-agent dummy.so
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsJvmtiAttachingHostTestCases
Change-Id: Ia16c2973b24f81839d20502339978e75a23a93bc
sergeyv [Thu, 14 Sep 2017 18:41:54 +0000 (11:41 -0700)]
Throw if BitmapFactory.Options.inBitmap is HARDWARE
Test: BitmapRegionDecoderTest#testHardwareBitmapIn
bug:
34415265
Change-Id: I58061504dd42ba918f89e1e5daf668f7601ca8d3
Hall Liu [Thu, 14 Sep 2017 20:11:32 +0000 (20:11 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations" am:
1bbf287859 am:
200d8f6242
am:
4de6420978
Change-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Chris Wren [Thu, 14 Sep 2017 20:06:33 +0000 (20:06 +0000)]
Merge "also log user-initiated notification collapse events" into oc-mr1-dev
am:
e72e8b1528
Change-Id: I7a65e5ac332cb5f9d0b6cad8cb346132dfe74949
Philip P. Moltmann [Thu, 14 Sep 2017 20:02:53 +0000 (20:02 +0000)]
Merge "Do not fail session.commit on current thread" into oc-mr1-dev
am:
304d267066
Change-Id: I1ed37d63e3ecd4041851d9de786dd21fd184264a
Hall Liu [Thu, 14 Sep 2017 19:57:36 +0000 (19:57 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations" am:
1bbf287859
am:
200d8f6242
Change-Id: Iebea130f19c60c407a95ff1c1a3f80abd7c66925
Chris Wren [Thu, 14 Sep 2017 19:55:32 +0000 (19:55 +0000)]
Merge "also log user-initiated notification collapse events" into oc-mr1-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 19:53:13 +0000 (19:53 +0000)]
Merge "Merge "Clear calling identity" into oc-mr1-dev am:
bc0c5882c6" into oc-mr1-dev-plus-aosp
Philip P. Moltmann [Thu, 14 Sep 2017 19:52:31 +0000 (19:52 +0000)]
Merge "Do not fail session.commit on current thread" into oc-mr1-dev
Julia Reynolds [Thu, 14 Sep 2017 19:51:45 +0000 (19:51 +0000)]
Merge "Clear calling identity" into oc-mr1-dev
am:
bc0c5882c6
Change-Id: I7c2099ce909f1bdfc0a862c4d25257e0f51a0025
Jakub Pawlowski [Thu, 14 Sep 2017 19:50:18 +0000 (19:50 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated" am:
1f53eb76e4 am:
8ab1ed1789
am:
dd71df9d41
Change-Id: I46d8cf106ed9c2b22e5dfc2b0a38588622c140e8
Julia Reynolds [Thu, 14 Sep 2017 19:46:37 +0000 (19:46 +0000)]
Merge "Display volume dialog for longer..." into oc-mr1-dev
am:
d5ca90a7af
Change-Id: I55c8feae01484de44f89fd75edd784e65e719c31
Hall Liu [Thu, 14 Sep 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
am:
1bbf287859
Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
Jakub Pawlowski [Thu, 14 Sep 2017 19:41:52 +0000 (19:41 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated" am:
1f53eb76e4
am:
8ab1ed1789
Change-Id: I534e04c709f6ee3f74358e9e1b3a30ad6cb64083
Beverly Tai [Thu, 14 Sep 2017 19:41:20 +0000 (19:41 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours am:
fe5ce91c5f -s ours
am:
9fbf077e80 -s ours
Change-Id: Ib4ccb0c44187f27c1643b94ceb95a6c46ec18dee
Jakub Pawlowski [Thu, 14 Sep 2017 18:54:59 +0000 (11:54 -0700)]
Fix included service parsing (3/3)
Bug:
65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c
Jakub Pawlowski [Thu, 14 Sep 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
am:
1f53eb76e4
Change-Id: I45642dfbb8ed8bb90a1306d066844d18aa1962b3
Hall Liu [Thu, 14 Sep 2017 19:35:23 +0000 (19:35 +0000)]
Merge "Unhide EMBMS download API" into oc-mr1-dev
am:
5dab2f297c -s ours
Change-Id: Ifa5e4aede36e590afd0afb86234793a5b0b11047
Hall Liu [Thu, 14 Sep 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
Julia Reynolds [Thu, 14 Sep 2017 19:26:25 +0000 (19:26 +0000)]
Merge "Clear calling identity" into oc-mr1-dev
Jakub Pawlowski [Thu, 14 Sep 2017 15:51:44 +0000 (08:51 -0700)]
Bluetooth: fix typo in comment
Test: none
Change-Id: I48c674049df88285268145d4140870eb4ab79a62
Jakub Pawlowski [Thu, 14 Sep 2017 19:24:06 +0000 (19:24 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
Jakub Pawlowski [Thu, 14 Sep 2017 15:24:15 +0000 (08:24 -0700)]
Bluetooth: fix parameter name in onConnectionUpdated
Test: compilation
Change-Id: I625e4ca63477b795310ebb42ca5e9a0549523cc5
Julia Reynolds [Thu, 14 Sep 2017 19:19:56 +0000 (19:19 +0000)]
Merge "Display volume dialog for longer..." into oc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 19:17:28 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours am:
fe5ce91c5f
am:
7c8a60c3e4 -s ours
Change-Id: Iddf985fd988f5a561b8211fb1df28b805319fe3d
Beverly [Thu, 24 Aug 2017 13:33:57 +0000 (09:33 -0400)]
Added SafetyNet logging for UsbDebugging security bug.
Bug:
62187985
Test: n/a
Change-Id: I69244381b2172357c5adc8785fc73d1cfd3cc17d
Beverly Tai [Thu, 14 Sep 2017 19:09:35 +0000 (19:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours
am:
fe5ce91c5f -s ours
Change-Id: I28bb498ea60d1a42d4b557f0b58c7134650bb3dd
Beverly Tai [Thu, 14 Sep 2017 19:09:03 +0000 (19:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am:
d740b2d09a -s ours
am:
fe5ce91c5f
Change-Id: If9c65045e4810a08dc0a025ac740c5499547fd7e
Beverly Tai [Thu, 14 Sep 2017 19:00:40 +0000 (19:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
am:
d740b2d09a -s ours
Change-Id: I952391f1801cd678240b145971a733c755f62078
Evan Laird [Thu, 14 Sep 2017 18:52:53 +0000 (18:52 +0000)]
Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev
am:
a76a1e8842
Change-Id: Icb107684248f324722ce36da3ec63b4531ddf49f
Beverly Tai [Thu, 14 Sep 2017 18:49:00 +0000 (18:49 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
Android Build Merger (Role) [Thu, 14 Sep 2017 18:47:43 +0000 (18:47 +0000)]
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8" into oc-mr1-dev am:
2dfb1bab8d" into oc-mr1-dev-plus-aosp
Beverly Tai [Thu, 14 Sep 2017 18:44:46 +0000 (18:44 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8" into oc-mr1-dev
am:
2dfb1bab8d
Change-Id: Ibceb50b184f18164e6e3203f43c16ac267d83826
Android Build Merger (Role) [Thu, 14 Sep 2017 18:42:46 +0000 (18:42 +0000)]
Merge "Merge "Throttle fetching RPM stats" into oc-mr1-dev am:
8ddb77a3df" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 14 Sep 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8 am:
98e46b5bd8" into oc-mr1-dev-plus-aosp
Hall Liu [Thu, 14 Sep 2017 18:39:46 +0000 (18:39 +0000)]
Merge "Unhide EMBMS download API" into oc-mr1-dev
Adam Bookatz [Thu, 14 Sep 2017 18:39:35 +0000 (18:39 +0000)]
Merge "Throttle fetching RPM stats" into oc-mr1-dev
am:
8ddb77a3df
Change-Id: I97868b6f4327125f201384e0d6dc1a597ddfa6d9
Beverly Tai [Thu, 14 Sep 2017 18:38:39 +0000 (18:38 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8
am:
98e46b5bd8
Change-Id: I3051278fb2cb8f9bc470464cabf0150d91e752c4
Android Build Merger (Role) [Thu, 14 Sep 2017 18:37:00 +0000 (18:37 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e am:
c3e2d40309 am:
d0c9f402d5" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Thu, 14 Sep 2017 18:34:55 +0000 (18:34 +0000)]
Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 18:34:53 +0000 (18:34 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e am:
c3e2d40309
am:
d0c9f402d5
Change-Id: Id0e718caf1663ff8e7c27a7b39a795dd8d3afc37
Adam Bookatz [Thu, 14 Sep 2017 18:33:47 +0000 (18:33 +0000)]
Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev
am:
e332629667
Change-Id: Ib522e060c7a77b0e0ae0ecf3c9d84c331890d3e9
Android Build Merger (Role) [Thu, 14 Sep 2017 18:30:58 +0000 (18:30 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e am:
c3e2d40309 am:
bb7fc483f0" into oc-mr1-dev-plus-aosp
Beverly Tai [Thu, 14 Sep 2017 18:28:41 +0000 (18:28 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e am:
c3e2d40309
am:
bb7fc483f0
Change-Id: Iafccb0596c104fab9aceb428a082f55b804f02cf
Beverly Tai [Thu, 14 Sep 2017 18:28:26 +0000 (18:28 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2 am:
8462da779b am:
ba55b3bea6 -s ours am:
ef696aa47b am:
a35989b007
am:
8ee7f6a5b7
Change-Id: I5b4a8f723063001336bbd76dd4ef810b8adca083
Beverly Tai [Thu, 14 Sep 2017 18:27:56 +0000 (18:27 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d
am:
b237ea7cc8
Change-Id: I04d50fa8ed1d66b706f5a5497543bc6b01aa1d8a
Android Build Merger (Role) [Thu, 14 Sep 2017 18:26:13 +0000 (18:26 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d am:
b237ea7cc8" into oc-mr1-dev
Beverly Tai [Thu, 14 Sep 2017 18:24:15 +0000 (18:24 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours am:
9bc160cc3d
am:
b237ea7cc8
Change-Id: Id56d8fb2630c03f7588ba475dafa48f5f7bab011
Android Build Merger (Role) [Thu, 14 Sep 2017 18:23:38 +0000 (18:23 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92 am:
9a74d618c2 am:
0bf81b63f9 am:
e148e39d61 am:
a126d94892 -s ours am:
2435c816d8 am:
a62951f28f am:
6d23578d09" into oc-mr1-dev-plus-aosp
Adam Bookatz [Thu, 14 Sep 2017 18:23:36 +0000 (18:23 +0000)]
Merge "Throttle fetching RPM stats" into oc-mr1-dev
Adam Bookatz [Thu, 14 Sep 2017 18:22:34 +0000 (18:22 +0000)]
Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev
* changes:
Disable screen-off RPM timing in BatteryStats
Added resource power manager stats to batterystats
Beverly Tai [Thu, 14 Sep 2017 18:21:49 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee am:
97b98a3b1c am:
d54bc6a908 -s ours am:
b004901c92 am:
9a74d618c2 am:
0bf81b63f9 am:
e148e39d61 am:
a126d94892 -s ours am:
2435c816d8 am:
a62951f28f
am:
6d23578d09
Change-Id: Ia55fa862dc46672d4fa6c49a1a2da5c4ad091a06
Android Build Merger (Role) [Thu, 14 Sep 2017 18:21:22 +0000 (18:21 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2 am:
8462da779b am:
ba55b3bea6 -s ours am:
ef696aa47b am:
a35989b007 am:
ba4b1cdcff" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 14 Sep 2017 18:20:06 +0000 (18:20 +0000)]
Merge "Merge "Finalize package intents used to trigger tz update" am:
48d3181b1d am:
0e0f3b6d29 am:
8b70fb0869" into oc-mr1-dev-plus-aosp
Beverly Tai [Thu, 14 Sep 2017 18:19:07 +0000 (18:19 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2 am:
8462da779b am:
ba55b3bea6 -s ours am:
ef696aa47b am:
a35989b007
am:
ba4b1cdcff
Change-Id: Ib1e5ab053cb28ad310d406cd383b446abdb9e797
Beverly Tai [Thu, 14 Sep 2017 18:18:48 +0000 (18:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e
am:
c3e2d40309
Change-Id: Ie07e84bbb31df780b8366d63bd364368a24b9134
Neil Fuller [Thu, 14 Sep 2017 18:18:08 +0000 (18:18 +0000)]
Merge "Finalize package intents used to trigger tz update" am:
48d3181b1d am:
0e0f3b6d29
am:
8b70fb0869
Change-Id: Ic582233a7b9be9293e2dbd02ce0193d75bba0f2b
Beverly Tai [Thu, 14 Sep 2017 18:17:48 +0000 (18:17 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours am:
95e10b296e
am:
c3e2d40309
Change-Id: I2376a371a5b4e5e29155dff85054b5620dfd2fa6
Android Build Merger (Role) [Thu, 14 Sep 2017 18:12:54 +0000 (18:12 +0000)]
Merge "Merge changes I4719b4dc,I0308cdf4,I38db1bb7 am:
a3c28cc567 am:
3fce811dcb am:
b025492a6b" into oc-mr1-dev-plus-aosp
Beverly Tai [Thu, 14 Sep 2017 18:11:18 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours am:
26e84466d3 -s ours
am:
9bc160cc3d
Change-Id: Ib152e64e01f43f3a6fb1df6c749e4f83566266b5
Hugo Benichi [Thu, 14 Sep 2017 18:11:06 +0000 (18:11 +0000)]
Merge changes I4719b4dc,I0308cdf4,I38db1bb7 am:
a3c28cc567 am:
3fce811dcb
am:
b025492a6b
Change-Id: I5385a3747e039a42e86034f7632edd0f855b2eb1
Android Build Merger (Role) [Thu, 14 Sep 2017 18:06:03 +0000 (18:06 +0000)]
Merge "Merge changes Ie2676b20,Ie8db6f85 am:
61901ddedd am:
4188432a7b am:
7d16886c7e" into oc-mr1-dev-plus-aosp
Lucas Dupin [Thu, 14 Sep 2017 00:24:09 +0000 (17:24 -0700)]
Do not animate icons when leaving AoD
Change-Id: I10ff1f06f6f699c0b0ceedffa54b463fdf25593f
Fixes:
37433524
Test: screenrecord # look at video frame by frame
Hugo Benichi [Thu, 14 Sep 2017 18:02:14 +0000 (18:02 +0000)]
Merge changes Ie2676b20,Ie8db6f85 am:
61901ddedd am:
4188432a7b
am:
7d16886c7e
Change-Id: Ifd0ace409909d258db3738e58126bbf1c48af5dc
Beverly Tai [Thu, 14 Sep 2017 18:02:07 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2 am:
8462da779b am:
ba55b3bea6 -s ours am:
ef696aa47b
am:
a35989b007
Change-Id: I05764035a31a1be641f3c2aea4bda9b1770e8aa0
Beverly Tai [Thu, 14 Sep 2017 18:02:07 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am:
0bdb7902d8 am:
3be1269c0a -s ours am:
0a93f42be2 am:
8462da779b am:
ba55b3bea6 -s ours am:
ef696aa47b
am:
a35989b007
Change-Id: Iac8295f193dca56ed6a1817e729c024921abe593
Beverly Tai [Thu, 14 Sep 2017 18:00:56 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am:
121d3b89f7 -s ours
am:
95e10b296e
Change-Id: I4cc393a504461b206355dd269c59cd5b38c80f09
Beverly Tai [Thu, 14 Sep 2017 18:00:15 +0000 (18:00 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am:
61bc3f3c9b am:
68f91528c3 -s ours
am:
26e84466d3 -s ours
Change-Id: I8564ca1d5f7c185bd6eedd0ee23adbefa9a421e0
OSDN Git Service
