OSDN Git Service
Andreas Huber [Tue, 12 Sep 2017 10:42:19 +0000 (10:42 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev am:
ce30e909c2
am:
b7fb36566b
Change-Id: I38a005c2cbadf2f3773361d16be7e8882f95079c
Andreas Huber [Tue, 12 Sep 2017 10:34:29 +0000 (10:34 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev
am:
ce30e909c2
Change-Id: I8fe0d1a2d5e27cf059a216353bfabf700c4bbddf
TreeHugger Robot [Tue, 12 Sep 2017 10:26:40 +0000 (10:26 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder." into oc-mr1-dev
Petar Šegina [Tue, 12 Sep 2017 10:24:35 +0000 (10:24 +0000)]
Merge "Enable smart select animation for multiline scenarios"
Petar Šegina [Tue, 12 Sep 2017 10:23:36 +0000 (10:23 +0000)]
Merge "Filter out empty and unnecessary rectangles"
Narayan Kamath [Tue, 12 Sep 2017 07:54:57 +0000 (07:54 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev am:
c0e6aa4233
am:
1b31be026d
Change-Id: I43970535a3a3e614fa9acd990035f73dca80ba88
Shubham Ajmera [Tue, 12 Sep 2017 07:48:43 +0000 (07:48 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev am:
3de875019e
am:
a8a9acaf85
Change-Id: Icaabfd74daa96f7a3f44be0996987d94789fbd06
Narayan Kamath [Tue, 12 Sep 2017 07:45:12 +0000 (07:45 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev
am:
c0e6aa4233
Change-Id: I91b6f277344032daf4c3c5ee57d5c4f483064e48
TreeHugger Robot [Tue, 12 Sep 2017 07:36:24 +0000 (07:36 +0000)]
Merge "AudioPackageGo: Add misc. other sounds required by the system." into oc-mr1-dev
Shubham Ajmera [Tue, 12 Sep 2017 07:34:36 +0000 (07:34 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
am:
3de875019e
Change-Id: I570bcf56e7b971b452007eb8db1ce6f13066ce05
TreeHugger Robot [Tue, 12 Sep 2017 07:26:35 +0000 (07:26 +0000)]
Merge "Remove broken secondary dexopt during OTA" into oc-mr1-dev
Erik Kline [Tue, 12 Sep 2017 06:39:44 +0000 (06:39 +0000)]
Merge "Check for IControllOffload.getServer() returning null" am:
c5932ab2a8 am:
a3658b0fc2 am:
c9fad76673 -s ours
am:
1efca130c9 -s ours
Change-Id: I50776e3406b0aa6606a617bba05bb1170919dce0
Erik Kline [Tue, 12 Sep 2017 06:34:11 +0000 (06:34 +0000)]
Merge "Check for IControllOffload.getServer() returning null" am:
c5932ab2a8 am:
a3658b0fc2
am:
c9fad76673 -s ours
Change-Id: I4ea32048fa59dcaee62a30f57e9f318b7013f0c1
Erik Kline [Tue, 12 Sep 2017 06:26:11 +0000 (06:26 +0000)]
Merge "Check for IControllOffload.getServer() returning null" am:
c5932ab2a8
am:
a3658b0fc2
Change-Id: I69d8504f8487218f14faf4f35b5307c396f9cb4f
Erik Kline [Tue, 12 Sep 2017 06:19:16 +0000 (06:19 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
am:
c5932ab2a8
Change-Id: If27fca9aa594af2f58a470709d78f19f31bb316d
Treehugger Robot [Tue, 12 Sep 2017 06:10:45 +0000 (06:10 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
Erik Kline [Mon, 11 Sep 2017 07:33:27 +0000 (16:33 +0900)]
Check for IControllOffload.getServer() returning null
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
65529504
Merged-In: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497
Merged-In: Ib2d1862367145260ac83f14d181646eb827538f8
Change-Id: I671487344000f1f2db92b8e4a693c096b680830c
(cherry picked from commit
87b3bfd5f2d3d0ccfc3ee1279b496d4ff289e38f)
Erik Kline [Tue, 12 Sep 2017 03:15:35 +0000 (03:15 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev am:
ec02583438
am:
b49e11f712
Change-Id: Ib2d1862367145260ac83f14d181646eb827538f8
Erik Kline [Tue, 12 Sep 2017 03:06:53 +0000 (03:06 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
am:
ec02583438
Change-Id: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497
TreeHugger Robot [Tue, 12 Sep 2017 03:00:38 +0000 (03:00 +0000)]
Merge "Check for IControllOffload.getServer() returning null" into oc-mr1-dev
Siyamed Sinir [Tue, 12 Sep 2017 01:53:53 +0000 (01:53 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours am:
428f7402ba -s ours
am:
dd5fc73944 -s ours
Change-Id: I999efafd61f5f21d3405a28ddb4b0722bf0304c3
Siyamed Sinir [Tue, 12 Sep 2017 01:46:59 +0000 (01:46 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours am:
ba7d98210e -s ours
am:
2135d23dcc -s ours
Change-Id: I81ba6fc009d0e1933576821cc7633deb30b970f3
Siyamed Sinir [Tue, 12 Sep 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours
am:
428f7402ba -s ours
Change-Id: Ic1829b1574e9185f533c3c09cdbc165ea30ca88f
Siyamed Sinir [Tue, 12 Sep 2017 01:39:50 +0000 (01:39 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours am:
121df5bc6d -s ours
am:
ba7d98210e -s ours
Change-Id: Ica932e9ac84c764412253decccbe608c534fe310
Siyamed Sinir [Tue, 12 Sep 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours
am:
121df5bc6d -s ours
Change-Id: I065099fb086c91124e7076a0d9df5782547cb1f3
Siyamed Sinir [Tue, 12 Sep 2017 01:27:33 +0000 (01:27 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours am:
b2ba32be69 -s ours
am:
121df5bc6d -s ours
Change-Id: I7a9d0021466e4fa4d326b54df996d23045c15a5c
Siyamed Sinir [Tue, 12 Sep 2017 01:19:26 +0000 (01:19 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82 am:
7359d93942 -s ours
am:
b2ba32be69 -s ours
Change-Id: I20a77b0ed8af5570b899080b80655e965ecc0502
Shubham Ajmera [Tue, 12 Sep 2017 00:46:07 +0000 (00:46 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev am:
3df5aa6fca
am:
cbc6212856 -s ours
Change-Id: I8b4d57b6dafd82a341b5b972107098113e386c69
Siyamed Sinir [Tue, 12 Sep 2017 00:45:19 +0000 (00:45 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242 am:
4d91e69c82
am:
7359d93942 -s ours
Change-Id: I87dd0675b05119a349887e534ec639fc798709e3
Siyamed Sinir [Tue, 12 Sep 2017 00:38:21 +0000 (00:38 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74 am:
5288fcc242
am:
4d91e69c82
Change-Id: Ie45e4da6e29b61481d6d43cc24530e5e0db7fa15
Shubham Ajmera [Tue, 12 Sep 2017 00:33:47 +0000 (00:33 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
am:
3df5aa6fca
Change-Id: Ifa0a19d73b4570867630418085b67257b70f1224
Siyamed Sinir [Tue, 12 Sep 2017 00:31:18 +0000 (00:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e am:
954b6e9b74
am:
5288fcc242
Change-Id: If564d9a1c4feb66163994ffb51233ce589df2465
Siyamed Sinir [Tue, 12 Sep 2017 00:23:53 +0000 (00:23 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be am:
8393b54d3e
am:
954b6e9b74
Change-Id: Ic5a041376b5f921b68f85c397b9b56440d11697c
Siyamed Sinir [Tue, 12 Sep 2017 00:16:19 +0000 (00:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635 am:
064bfd22be
am:
8393b54d3e
Change-Id: If5b7319d2514ce67467d6092c99a4661155938e0
TreeHugger Robot [Tue, 12 Sep 2017 00:15:17 +0000 (00:15 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader" into oc-mr1-dev
Siyamed Sinir [Tue, 12 Sep 2017 00:09:18 +0000 (00:09 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498 am:
6352ced635
am:
064bfd22be
Change-Id: Idca3441e586206358880953bcbfd7697f0475b2b
Lucas Dupin [Tue, 12 Sep 2017 00:06:45 +0000 (00:06 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev am:
3163ba7458
am:
8584468862
Change-Id: I57474e7da639afb306b98fe75f462d6d5d72c332
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498
am:
6352ced635
Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
Lucas Dupin [Tue, 12 Sep 2017 00:00:45 +0000 (00:00 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev
am:
3163ba7458
Change-Id: I7a2d2ddaccaf099bb6a81c4129b8e03ed3d021e1
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6
am:
028ad8d498
Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
TreeHugger Robot [Mon, 11 Sep 2017 23:43:51 +0000 (23:43 +0000)]
Merge "Fixed keyguard inflation problem" into oc-mr1-dev
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am:
06183a57a6
Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
Siyamed Sinir [Mon, 11 Sep 2017 23:41:10 +0000 (23:41 +0000)]
Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp am:
529c7ea9bd" into oc-mr1-dev-plus-aosp
am:
0ee5c36e7f
Change-Id: I8560667a92e1c66c59d497efce11ae48790efd7c
Siyamed Sinir [Mon, 11 Sep 2017 23:38:08 +0000 (23:38 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43 am:
031e9d5cc8" into oc-mr1-dev-plus-aosp
am:
45453f2312
Change-Id: I56e86cde34b139db0909a037806eabd10ecb10b0
TreeHugger Robot [Mon, 11 Sep 2017 23:34:34 +0000 (23:34 +0000)]
Merge "AAPT2: Handle inflating compiled attributes."
Android Build Merger (Role) [Mon, 11 Sep 2017 23:33:07 +0000 (23:33 +0000)]
Merge "Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1 am:
2602e5ff62 am:
ab9cd2868e am:
c0a0a08ee8"
Tarandeep Singh [Mon, 11 Sep 2017 23:32:40 +0000 (23:32 +0000)]
Merge "Enhance IME support in ActivityView for AAe."
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Jordan Liu [Mon, 11 Sep 2017 23:31:35 +0000 (23:31 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1 am:
2602e5ff62 am:
ab9cd2868e
am:
c0a0a08ee8
Change-Id: I2ae4702a288943cee889edd03a565ad2be39ac30
Android Build Merger (Role) [Mon, 11 Sep 2017 23:28:14 +0000 (23:28 +0000)]
Merge "Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp am:
529c7ea9bd" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 11 Sep 2017 23:25:55 +0000 (23:25 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43 am:
031e9d5cc8" into oc-mr1-dev-plus-aosp
Siyamed Sinir [Mon, 11 Sep 2017 23:25:46 +0000 (23:25 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp
am:
529c7ea9bd
Change-Id: I948bc394d3904a1c7e7245b539cd004ce8fccad1
Siyamed Sinir [Mon, 11 Sep 2017 23:24:21 +0000 (23:24 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43
am:
031e9d5cc8
Change-Id: I0e7b2804bc3cb8a356b2a57691dec44342b8c999
Mathieu Chartier [Mon, 11 Sep 2017 23:23:55 +0000 (23:23 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev am:
15998c4d01
am:
012be1c455
Change-Id: I316b2161bf2b4a78865c8b908aaf6f17c64ab76a
Jordan Liu [Mon, 11 Sep 2017 23:21:48 +0000 (23:21 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1 am:
2602e5ff62
am:
ab9cd2868e
Change-Id: Ief0f4d2f5c53917cc1f8d91091bf1644bc7c3589
Siyamed Sinir [Mon, 11 Sep 2017 23:18:51 +0000 (23:18 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c
am:
491aaaae43
Change-Id: I5aeedb12ac229181ea5f4b2343acf81e5778494f
Android Build Merger (Role) [Mon, 11 Sep 2017 23:18:13 +0000 (23:18 +0000)]
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c am:
491aaaae43" into oc-dr1-dev-plus-aosp
Siyamed Sinir [Mon, 11 Sep 2017 23:16:13 +0000 (23:16 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am:
846a46043c
am:
491aaaae43
Change-Id: I38a64e635f6820ca5368d154363ea3414c8e047e
Jordan Liu [Mon, 11 Sep 2017 23:14:59 +0000 (23:14 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type" am:
9da895b5e1
am:
2602e5ff62
Change-Id: Ifd7054cb269edbc7728e1ad561a012ff858cdad5
Mathieu Chartier [Mon, 11 Sep 2017 23:11:52 +0000 (23:11 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev
am:
15998c4d01
Change-Id: I9164d6c8816c9cfaabe85b0e33c7eed76682e1fd
Siyamed Sinir [Mon, 11 Sep 2017 23:06:27 +0000 (23:06 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
am:
846a46043c
Change-Id: I00fa802fca31e973609932fcadf49b8889f1bf00
Jordan Liu [Mon, 11 Sep 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
am:
9da895b5e1
Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970
TreeHugger Robot [Mon, 11 Sep 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Add some extra zygote preloads" into oc-mr1-dev
Jordan Liu [Mon, 11 Sep 2017 22:52:20 +0000 (22:52 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
Siyamed Sinir [Mon, 11 Sep 2017 22:52:01 +0000 (22:52 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into oc-dev
Android Build Merger (Role) [Mon, 11 Sep 2017 22:23:54 +0000 (22:23 +0000)]
Merge "Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf am:
9bf83b4cd1 am:
63c3aa9a45 am:
4aaf3b90cb"
Adam Lesinski [Mon, 11 Sep 2017 22:21:45 +0000 (22:21 +0000)]
Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf am:
9bf83b4cd1 am:
63c3aa9a45
am:
4aaf3b90cb
Change-Id: Ia00829933d7e7a8b7e413c72ac7d2887266c7e8e
Janis Danisevskis [Mon, 11 Sep 2017 22:20:31 +0000 (22:20 +0000)]
Merge "Fix use of auth-bound keys after screen lock removal"
Adam Lesinski [Mon, 11 Sep 2017 22:17:54 +0000 (22:17 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am:
8303fb42e0 am:
6cbee7a73c am:
4ad7c2dd29
am:
08d8c8321b
Change-Id: I5b73c2852e5a4a85a2dbb0a0efb903f9df311fa6
Kevin Chyn [Mon, 11 Sep 2017 22:07:34 +0000 (22:07 +0000)]
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev am:
c6e9bb9da0
am:
1540738d55
Change-Id: Ic39acd56e431f535b507d1a1aa1054d3cdfd3018
Adam Lesinski [Mon, 11 Sep 2017 22:06:19 +0000 (22:06 +0000)]
Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf am:
9bf83b4cd1
am:
63c3aa9a45
Change-Id: I8c691fdcbe58c5fe60f0a55ed710f266f51c3f25
Chad Brubaker [Mon, 11 Sep 2017 22:04:07 +0000 (22:04 +0000)]
Merge "Expand and expose Lockdown global action"
TreeHugger Robot [Mon, 11 Sep 2017 22:02:44 +0000 (22:02 +0000)]
Merge "WebViewUpdateService.dumpState: print a line for each WebView package"
John Reck [Mon, 11 Sep 2017 22:00:02 +0000 (22:00 +0000)]
Merge "Fix flicker from multiwindow resize" into oc-mr1-dev am:
facdce3ab2
am:
a0c211120a
Change-Id: I701b817d0109c650069d445548280bec4193729d
Adam Lesinski [Mon, 11 Sep 2017 21:59:04 +0000 (21:59 +0000)]
Merge "AAPT2: Fix processing of quotes in XML" am:
9b65f03abf
am:
9bf83b4cd1
Change-Id: Ibed7a996aed00e6e5cfdee457c40277469a95ebf
Adam Lesinski [Mon, 11 Sep 2017 21:57:44 +0000 (21:57 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am:
8303fb42e0 am:
6cbee7a73c
am:
4ad7c2dd29
Change-Id: I0cd56262c2b72dd48fa3c5263e60bee9feb65658
Adam Lesinski [Mon, 11 Sep 2017 21:50:55 +0000 (21:50 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
am:
9b65f03abf
Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed
Adam Lesinski [Mon, 11 Sep 2017 21:49:49 +0000 (21:49 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package"" am:
8303fb42e0
am:
6cbee7a73c
Change-Id: I10f38277b2bdc364ea5f8caba08475badac325f4
Kevin Chyn [Mon, 11 Sep 2017 21:48:55 +0000 (21:48 +0000)]
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
am:
c6e9bb9da0
Change-Id: Ib8e1512e06cc81ddf9e7f9beac1eef49d232ffc0
Adam Lesinski [Mon, 11 Sep 2017 21:41:27 +0000 (21:41 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
am:
8303fb42e0
Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.
Bug:
63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java
John Reck [Mon, 11 Sep 2017 21:36:05 +0000 (21:36 +0000)]
Merge "Fix flicker from multiwindow resize" into oc-mr1-dev
am:
facdce3ab2
Change-Id: I217c2db8adcb5b2b9ad2ffcd3226176c7e7c08c4
Ping Sun [Mon, 11 Sep 2017 21:35:28 +0000 (21:35 +0000)]
Merge "Merge "Add ims registration status" am:
d217a0c5a7 -s ours am:
d850ce22f2 -s ours am:
f27ccdbafa -s ours" into oc-mr1-dev-plus-aosp
am:
a2ff4ce0a0 -s ours
Change-Id: Iec956b4076993cf6f1ebdc9e175fb6c5e3d39eba
Treehugger Robot [Mon, 11 Sep 2017 21:34:53 +0000 (21:34 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
Kevin Chyn [Mon, 11 Sep 2017 21:33:32 +0000 (21:33 +0000)]
Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
Evan Rosky [Mon, 11 Sep 2017 21:24:01 +0000 (21:24 +0000)]
Merge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev am:
c8b91ecbae
am:
2e7e7a9960
Change-Id: I4843d0b8409909d9b0c1af2950321918adc722bb
Lucas Dupin [Mon, 11 Sep 2017 19:28:03 +0000 (12:28 -0700)]
Fixed keyguard inflation problem
Inflating a keyguard while dettached from window would
raise a NullPointerException since window insets wouldn't
be available at the time.
Test: packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Change-Id: I7f48a62807877537814e6f34db1e6fa6fbec7923
Fixes:
65495303
TreeHugger Robot [Mon, 11 Sep 2017 21:19:41 +0000 (21:19 +0000)]
Merge "Fix flicker from multiwindow resize" into oc-mr1-dev
Android Build Merger (Role) [Mon, 11 Sep 2017 21:11:15 +0000 (21:11 +0000)]
Merge "Merge "Add ims registration status" am:
d217a0c5a7 -s ours am:
d850ce22f2 -s ours am:
f27ccdbafa -s ours" into oc-mr1-dev-plus-aosp
Treehugger Robot [Mon, 11 Sep 2017 21:10:12 +0000 (21:10 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
Ping Sun [Mon, 11 Sep 2017 21:08:34 +0000 (21:08 +0000)]
Merge "Add ims registration status" am:
d217a0c5a7 -s ours am:
d850ce22f2 -s ours
am:
f27ccdbafa -s ours
Change-Id: I2152341da275eaba4de011168775d095c2142a9e
Selim Cinek [Mon, 11 Sep 2017 21:07:54 +0000 (21:07 +0000)]
Merge "Fixed an issue where a notification could flicker" into oc-mr1-dev am:
b338f034e9
am:
9a6205a5ab
Change-Id: Ic65a1187832bf7f33209564b9a13443e3ea69d89
Evan Rosky [Mon, 11 Sep 2017 21:03:41 +0000 (21:03 +0000)]
Merge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev
am:
c8b91ecbae
Change-Id: Ife498c2a72c2053f9d6d7f2ffee6ed63153f2a7b
Shubham Ajmera [Fri, 8 Sep 2017 00:55:22 +0000 (17:55 -0700)]
Remove broken secondary dexopt during OTA
This is interim until the selinux policies get fixed.
Bug:
65067046
Test: make
(cherry-picked from commit
b6156ca0f53d933b427d30e69aa2f638d4ecb88f)
Change-Id: Iea69e987ae451c80fa67065e08939e389efd2814
Shubham Ajmera [Tue, 5 Sep 2017 17:20:41 +0000 (10:20 -0700)]
Handle '&' in DexoptUtils#encodeClassLoader
For system apps, we pass '&' for CLC.
The method was treating this as a path as a result we were getting
wrong encoding for CLC.
This was causing dexopt failures for A/B OTA.
Removed the secondary dex file dexopt till we fixed it.
Bug:
65067046
Test: runtest.py -x \
frameworks/base/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry-picked from commit
557c054935c0864b42ce49541d12d32ae6a797bc)
Change-Id: I9aa440750c811676c86d8c6d0d451077d0edf5a0
Shubham Ajmera [Mon, 11 Sep 2017 20:48:11 +0000 (20:48 +0000)]
Merge "Remove broken secondary dexopt during OTA"
Ping Sun [Mon, 11 Sep 2017 20:28:52 +0000 (20:28 +0000)]
Merge "Add ims registration status" am:
d217a0c5a7 -s ours
am:
d850ce22f2 -s ours
Change-Id: Icd96929712b747a3c9e6e3baae65c79831420dde
Evan Rosky [Mon, 11 Sep 2017 20:25:50 +0000 (20:25 +0000)]
Merge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev
Wileen Chiu [Fri, 18 Sep 2015 22:17:54 +0000 (15:17 -0700)]
Show 3G data icon for TD-SCDMA network type
- The data annunciator on the UI shows up as
"G" instead of "3G"
- Map the 3G telephony icon to network type
TD-SCDMA
Bug:
36802489
Test: manual
Change-Id: I63a0e54aab7fda2bcc6f098bb0b43799aad2f6c2
Brad Ebinger [Mon, 11 Sep 2017 20:20:54 +0000 (20:20 +0000)]
Merge "Add ims registration status" into stage-aosp-master am:
bd1f2b56bb am:
569ccc26c8 -s ours
am:
7d7a6be1aa -s ours
Change-Id: I11aeaa63c3da7f071bec0e2882e83885e5bef6ca
OSDN Git Service
