OSDN Git Service
Timur Iskhakov [Thu, 13 Jul 2017 19:39:36 +0000 (19:39 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a am:
9cdec3943c
am:
1cdcaa8cf3
Change-Id: Iea02cb61c0a77eb3d94b9ebe63687457b6a5032c
Timur Iskhakov [Thu, 13 Jul 2017 19:33:29 +0000 (19:33 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a
am:
9cdec3943c
Change-Id: Id3e2523a755e8ce207ac6bd85dbf6d5a69070207
Timur Iskhakov [Thu, 13 Jul 2017 19:27:37 +0000 (19:27 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547
am:
791a698a6a
Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936
Julia Reynolds [Thu, 13 Jul 2017 19:23:26 +0000 (19:23 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev am:
bcc35f5ae6
am:
886d8b1c00
Change-Id: I232b0239d0af7d211cb91496a1b35646864a4032
Timur Iskhakov [Thu, 13 Jul 2017 19:21:42 +0000 (19:21 +0000)]
Merge "Add configureRpcThreadpool to java interface"
am:
d8dab11547
Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
Qingxi Li [Thu, 13 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev am:
b7febbb727
am:
11ba1cb60a
Change-Id: Iebb4844baf119ae51749aab524184f35c208853d
Julia Reynolds [Thu, 13 Jul 2017 19:15:54 +0000 (19:15 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
am:
bcc35f5ae6
Change-Id: Ifb65c3b9aba091a30f6b895bd2c5f585802cf150
Treehugger Robot [Thu, 13 Jul 2017 19:11:39 +0000 (19:11 +0000)]
Merge "Add configureRpcThreadpool to java interface"
Qingxi Li [Thu, 13 Jul 2017 19:08:27 +0000 (19:08 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
am:
b7febbb727
Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
Bill Yi [Thu, 13 Jul 2017 19:08:04 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e210bf7a40 -s ours
am:
e47cc86d69 -s ours
Change-Id: Ia57216e086b55fcf91d31c1b9f075d50e65a61f4
TreeHugger Robot [Thu, 13 Jul 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Add metrics to log performance of different ranker services in ChooserActivity."
TreeHugger Robot [Thu, 13 Jul 2017 19:03:48 +0000 (19:03 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
Qingxi Li [Thu, 13 Jul 2017 19:02:24 +0000 (19:02 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e210bf7a40 -s ours
Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab
Evan Laird [Thu, 13 Jul 2017 18:56:39 +0000 (18:56 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev am:
31ff02ecd2
am:
8154057746
Change-Id: I5296fc15a424ea10f41edb4fc544f711a5d65d6c
TreeHugger Robot [Thu, 13 Jul 2017 18:53:12 +0000 (18:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 18:47:11 +0000 (18:47 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev am:
fa62d79a02
am:
b3d51770d1
Change-Id: I267b6be7a95c19b927e8ecb01e597342e6bee1d3
Evan Laird [Thu, 13 Jul 2017 18:45:23 +0000 (18:45 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
am:
31ff02ecd2
Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7
TreeHugger Robot [Thu, 13 Jul 2017 18:43:13 +0000 (18:43 +0000)]
Merge "Added mediumTest annotation to execute on tradefed."
TreeHugger Robot [Thu, 13 Jul 2017 18:39:39 +0000 (18:39 +0000)]
Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 18:34:30 +0000 (18:34 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
am:
fa62d79a02
Change-Id: Iaff54dcb133a4169f70f7ea2d7ded68cc313e946
Bryce Lee [Thu, 13 Jul 2017 18:28:09 +0000 (18:28 +0000)]
Merge "Do not use rotation as indicator to relaunch from config change." into oc-dr1-dev
Paul McLean [Thu, 13 Jul 2017 18:09:17 +0000 (18:09 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev am:
84a60bf9e8
am:
6899fa6c81
Change-Id: Ic70707c334e9765e7f196bdcb0d2d753ce17b0fb
Selim Cinek [Thu, 13 Jul 2017 18:03:59 +0000 (18:03 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev am:
c8c121757e
am:
ce58e94a5b
Change-Id: Iefe597271e07e53a9a9b879d62690acbc4fef8cc
Paul McLean [Thu, 13 Jul 2017 18:00:55 +0000 (18:00 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
am:
84a60bf9e8
Change-Id: Ica095cfa4d341916fdb3ab1f9948c693c9471733
Bryce Lee [Thu, 13 Jul 2017 17:55:05 +0000 (17:55 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev am:
a926dbf5d2
am:
d0bc21efd5
Change-Id: Idf2bfb1d6c2b70a53ebe46df300be6fe3fce3258
Selim Cinek [Thu, 13 Jul 2017 17:54:13 +0000 (17:54 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
am:
c8c121757e
Change-Id: I796e63264ddbba810a1def709594fa73977f50ca
TreeHugger Robot [Thu, 13 Jul 2017 17:48:23 +0000 (17:48 +0000)]
Merge "More fine-grained exception handling so we can still use non-excepting descriptors." into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:47:52 +0000 (17:47 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
am:
a926dbf5d2
Change-Id: I3f1dd4938ed37af093d326a951b9eb1854e60611
TreeHugger Robot [Thu, 13 Jul 2017 17:40:44 +0000 (17:40 +0000)]
Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 17:38:48 +0000 (17:38 +0000)]
Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 17:19:05 +0000 (17:19 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev am:
717dd58c52
am:
de3597c769
Change-Id: I929d33ba540d03cdd823f0cf9a1b22b365fd9f2f
Lucas Dupin [Thu, 13 Jul 2017 17:09:59 +0000 (17:09 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am:
717dd58c52
Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e
Kang Li [Wed, 5 Jul 2017 21:47:32 +0000 (14:47 -0700)]
Add metrics to log performance of different ranker services in
ChooserActivity.
bug:
63353389
Test: tested by GmsCore debug logs.
Change-Id: Iacfef00531953344af190d3bd381c0ea38c37fe2
Lucas Dupin [Thu, 13 Jul 2017 17:03:47 +0000 (17:03 +0000)]
Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
Tenghui Zhu [Thu, 13 Jul 2017 16:46:35 +0000 (16:46 +0000)]
Merge "Update the annotation for getAnimation"
Selim Cinek [Thu, 13 Jul 2017 16:42:24 +0000 (16:42 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev am:
ac77186d34
am:
d4a3ca8d76
Change-Id: I7853e861904dac6a251979dfe841107f9956772d
Selim Cinek [Thu, 13 Jul 2017 16:36:48 +0000 (16:36 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am:
ac77186d34
Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03
Selim Cinek [Thu, 13 Jul 2017 16:29:21 +0000 (16:29 +0000)]
Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 16:11:39 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
4c44a3059c -s ours
am:
ff5416e5dc -s ours
Change-Id: If46ff7739aae13d118f597f4838c65924ce083f4
Bill Yi [Thu, 13 Jul 2017 16:06:11 +0000 (16:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
4c44a3059c -s ours
Change-Id: I0474490ef308e2df768be086ad76e8aae671891d
TreeHugger Robot [Thu, 13 Jul 2017 16:01:10 +0000 (16:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Paul McLean [Tue, 11 Jul 2017 17:18:59 +0000 (11:18 -0600)]
More fine-grained exception handling so we can still use non-excepting descriptors.
Bug:
63655391
Test: Manual - connect various devices and verify the connection state is correct.
Change-Id: Iae6143d2e853e916c8588e0c6f771c00714b3a8a
Bill Yi [Thu, 13 Jul 2017 15:44:05 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
482b2c3b12 -s ours
am:
b7d1a1fdc7 -s ours
Change-Id: I9ad8713f26221dbd14be8b44741ba236c32223d7
Bill Yi [Thu, 13 Jul 2017 15:39:12 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
482b2c3b12 -s ours
Change-Id: I943722c47109b65dee52ad67292b14ec53074a24
TreeHugger Robot [Thu, 13 Jul 2017 15:36:34 +0000 (15:36 +0000)]
Merge "IpManager: define InitialConfiguration"
TreeHugger Robot [Thu, 13 Jul 2017 15:31:41 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Selim Cinek [Thu, 13 Jul 2017 15:27:20 +0000 (17:27 +0200)]
Fixed a bug where status icons were not animating
Initializing should be done to true
Test: manual, add animating notification, observe statusbar
Change-Id: I53c7667184b1e9e0d065816982236b9a7b919b6f
Fixes:
63533925
Julia Reynolds [Thu, 13 Jul 2017 15:23:12 +0000 (11:23 -0400)]
Fix nomanservice notificationrecord leak
Test: runtest systemui-notification
Change-Id: Ic5761b917edd000bf73b3291b0ca95bbb0b9bedb
Fixes:
63585648
Selim Cinek [Thu, 13 Jul 2017 13:46:10 +0000 (15:46 +0200)]
Fixed a bug where an incoming call wasn't launching
When the lockscreen isn't showing, but aod is, an incomming
call would not launch its fullscreen intent but show up in
AOD1. In addition was the display completely messed up and
overlapping other parts of the AOD screen.
Test: receive call while in AOD but not locked
Change-Id: Icc3e989167e72289ddcd0a62064526db9004cdc2
Fixes:
62402251
Bill Yi [Thu, 13 Jul 2017 13:42:58 +0000 (06:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d916ea4bce1d259de0703e12701b534f31178a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Change-Id: I060b02603af7d73a6407df89344bf0c000574af2
Adrian Roos [Thu, 13 Jul 2017 12:17:44 +0000 (12:17 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev am:
3fbd93056e
am:
6d626acdbf
Change-Id: Iabff9ca955aef414ad7e62e0c68e2774ff01c9b7
Adrian Roos [Thu, 13 Jul 2017 12:10:21 +0000 (12:10 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
am:
3fbd93056e
Change-Id: I8bc8e01a97711fdd30ff59aeb72d38e8acaa7c75
Adrian Roos [Thu, 13 Jul 2017 12:01:52 +0000 (12:01 +0000)]
Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
Neil Fuller [Thu, 13 Jul 2017 11:20:35 +0000 (11:20 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20 am:
a5a493cc19 am:
3a6b550753
am:
154eca93e7
Change-Id: Ie8793108595b128a8ec898b4cada98c98a93fb1c
Neil Fuller [Thu, 13 Jul 2017 11:13:09 +0000 (11:13 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20 am:
a5a493cc19
am:
3a6b550753
Change-Id: I0e2e6fa93a4f15023f17efba275c236880863ccd
Neil Fuller [Thu, 13 Jul 2017 11:06:06 +0000 (11:06 +0000)]
Merge "Re-enable use of isPrivilegedApp()" am:
bd51de1b20
am:
a5a493cc19
Change-Id: I633d8e838d559056a331bc81bd5db5f644fa4489
Neil Fuller [Thu, 13 Jul 2017 10:59:41 +0000 (10:59 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
am:
bd51de1b20
Change-Id: I3e41058a76b840dfcd1b5171b8c6688509f1fd7d
Pavel Grafov [Thu, 13 Jul 2017 10:55:11 +0000 (10:55 +0000)]
Merge "Add DPMS test as presubmit test."
Neil Fuller [Thu, 13 Jul 2017 10:50:23 +0000 (10:50 +0000)]
Merge "Re-enable use of isPrivilegedApp()"
Bill Yi [Thu, 13 Jul 2017 10:10:00 +0000 (03:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id63562e9b590d6351469c5d884ebb9e5a24ba195
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Thu, 13 Jul 2017 09:17:33 +0000 (09:17 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa am:
ae21b89414 am:
17a62281e4 -s ours
am:
00c73c7784 -s ours
Change-Id: Iee7147a3f2a0e968d2154b623f741c738e5a641d
Erik Kline [Thu, 13 Jul 2017 09:12:02 +0000 (09:12 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa am:
ae21b89414
am:
17a62281e4 -s ours
Change-Id: I3242d187a794d9c3fe51f971e9b15edfe55e9ce6
Erik Kline [Thu, 13 Jul 2017 09:07:01 +0000 (09:07 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" am:
de837a97aa
am:
ae21b89414
Change-Id: If96a33f26fed64a84219868d28765b7581ad453d
Erik Kline [Thu, 13 Jul 2017 09:00:56 +0000 (09:00 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
am:
de837a97aa
Change-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9
Treehugger Robot [Thu, 13 Jul 2017 08:53:05 +0000 (08:53 +0000)]
Merge "Program offload-exempt local prefixes into the HAL"
Robert Berry [Thu, 13 Jul 2017 08:43:02 +0000 (08:43 +0000)]
Merge "Improve logging when restore fails to load Package Manager."
Bill Yi [Thu, 13 Jul 2017 07:50:26 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife7e581a0b00d66c174680ed4e40ba8ba7fed86b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Merged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Merged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1
Merged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
(cherry picked from commit
32179ff81511e00aef31e8fda705be3df074ece6)
Change-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05
Erik Kline [Thu, 13 Jul 2017 07:41:52 +0000 (07:41 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev am:
aa7b8b5322
am:
b3d2aaaf2f
Change-Id: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4
Erik Kline [Thu, 13 Jul 2017 07:36:50 +0000 (07:36 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
am:
aa7b8b5322
Change-Id: Iaf80e584df458010741401fc1a19e7f6e21923c1
TreeHugger Robot [Thu, 13 Jul 2017 07:31:13 +0000 (07:31 +0000)]
Merge "Program offload-exempt local prefixes into the HAL" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 06:35:00 +0000 (06:35 +0000)]
Merge "WebView: update docs for WebView#initSafeBrowsing"
TreeHugger Robot [Thu, 13 Jul 2017 05:43:46 +0000 (05:43 +0000)]
Merge "LowpanCommissioningSession: Add `static abstract` keywords"
Nate Fischer [Thu, 13 Jul 2017 05:17:39 +0000 (05:17 +0000)]
Merge "WebView: Fix SafeBrowsingResponse API"
Nate Fischer [Thu, 13 Jul 2017 05:16:53 +0000 (05:16 +0000)]
Merge "WebView: fix WebView#setSafeBrowsingWhiteList"
Erik Kline [Tue, 4 Jul 2017 09:28:11 +0000 (18:28 +0900)]
Program offload-exempt local prefixes into the HAL
Additionally:
- move mOffloadController into MasterTetherSM
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- observed calls to the HAL setLocalPrefixes in tethering log
Bug:
29337859
Bug:
32163131
Change-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b
Sudheer Shanka [Thu, 13 Jul 2017 04:39:27 +0000 (04:39 +0000)]
Merge "Update user perf tests to report only mean."
TreeHugger Robot [Thu, 13 Jul 2017 04:30:52 +0000 (04:30 +0000)]
Merge "Do not clear scores during stopTracking."
Fyodor Kupolov [Thu, 13 Jul 2017 04:07:09 +0000 (04:07 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am:
31419a4ad4 am:
8625194c19 am:
cd816c1853
am:
c2a76d16f0
Change-Id: I6916fbf80f86419a264b4645d29c9167777543e8
Fyodor Kupolov [Thu, 13 Jul 2017 04:02:11 +0000 (04:02 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am:
31419a4ad4 am:
8625194c19
am:
cd816c1853
Change-Id: I278d9449ab47f9bdecac8ad1075daed7d718544a
Fyodor Kupolov [Thu, 13 Jul 2017 03:56:09 +0000 (03:56 +0000)]
Merge "Revert "Fix ContentObserver unregister issue"" am:
31419a4ad4
am:
8625194c19
Change-Id: I5025d99e35dd267ffc3a0c0393a24ebb87cc0546
Fyodor Kupolov [Thu, 13 Jul 2017 03:49:36 +0000 (03:49 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
am:
31419a4ad4
Change-Id: I455be72533c24ceb5ea352774ded30d0c0a2367f
Andrii Kulian [Thu, 13 Jul 2017 03:47:30 +0000 (03:47 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev am:
a40af83c32
am:
8d99ed44f2
Change-Id: I28cee4719647f5c1746e62fe8c73ebdc99be6c65
Andrii Kulian [Thu, 13 Jul 2017 03:41:34 +0000 (03:41 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
am:
a40af83c32
Change-Id: I08967a79847a0d42a0a5c67d2bb178d2717eae33
Treehugger Robot [Thu, 13 Jul 2017 03:38:46 +0000 (03:38 +0000)]
Merge "Revert "Fix ContentObserver unregister issue""
Robert Quattlebaum [Thu, 13 Jul 2017 02:51:46 +0000 (19:51 -0700)]
LowpanCommissioningSession: Add `static abstract` keywords
These keywords were accidentally left off of the original declaration.
Bug: b/
63645461
Change-Id: I1cadcd68831377ee1d1059f645f7178b7e5c742e
Tests: Verified by being able to successfully compile
I46667d4ea337463a35a9dd31fb00f7e130553d53
TreeHugger Robot [Thu, 13 Jul 2017 03:36:25 +0000 (03:36 +0000)]
Merge "Clear mCurrentAccessory if accessory function is no longer enabled"
Andrii Kulian [Thu, 13 Jul 2017 03:34:52 +0000 (03:34 +0000)]
Merge "Position app with short aspect ratio opposite of nav bar" into oc-dr1-dev
Bryce Lee [Thu, 13 Jul 2017 02:31:59 +0000 (02:31 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev am:
a781d471e2
am:
ae56a90541
Change-Id: I88b6daeec2a6770ab31e0ab661448968597fcdf5
Bryce Lee [Thu, 13 Jul 2017 02:24:59 +0000 (02:24 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
am:
a781d471e2
Change-Id: If9c5c4a01bd11d71ba2e755b8b823a9acd013333
Bryce Lee [Thu, 13 Jul 2017 02:24:53 +0000 (02:24 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev am:
7968af4873
am:
5623446926
Change-Id: I011d8e543245d11d530b61746513bc2bb812e6ea
Bryce Lee [Thu, 13 Jul 2017 02:18:50 +0000 (02:18 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
am:
7968af4873
Change-Id: Iad8a30362e2680522dafe602864d893ceb13e811
Bryce Lee [Thu, 13 Jul 2017 02:15:49 +0000 (02:15 +0000)]
Merge "Do not apply maxAspectRatio to bounds when in VR mode." into oc-dr1-dev
Sundeep Ghuman [Mon, 26 Jun 2017 23:05:40 +0000 (16:05 -0700)]
Do not clear scores during stopTracking.
Bug: b/
63034725
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: Ic15c7f42ec9a3883e8ba34194d9a9410457e4399
Bryce Lee [Thu, 13 Jul 2017 02:12:29 +0000 (02:12 +0000)]
Merge "Do not gate updating allDrawn on all child WindowStates." into oc-dr1-dev
Bryce Lee [Thu, 6 Jul 2017 21:09:29 +0000 (14:09 -0700)]
Do not gate updating allDrawn on all child WindowStates.
A recent change prevents allDrawn in AppWindowToken from being
updated until all child WindowStates have been considered. However,
children that are not visible do not affect allDrawn and therefore
need to be excluded.
This changelist adds an additional check to make sure the child can
affect the allDrawn state before considering blocking on it. It also
adds additional logs to the WindowState dump to better understand
this scenario.
Change-Id: I76d0f75496ed3da6a16c4a1d7bf2e7dc5b8bbe1e
Bug:
63380251
Test: go/wm-smoke
Bryce Lee [Thu, 13 Jul 2017 01:57:26 +0000 (01:57 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev am:
3de5101c12
am:
dfee7bea20
Change-Id: I8980b0d29fde42a8caf402d09db8537fddb7ac60
Bryce Lee [Thu, 13 Jul 2017 01:52:55 +0000 (01:52 +0000)]
Merge "Use configuration delta to determine if still in orientation change." into oc-dr1-dev
am:
3de5101c12
Change-Id: I16cb39a8734799649b78a811e8b97eb87eb0c55d
OSDN Git Service
