OSDN Git Service
Hugo Benichi [Tue, 11 Jul 2017 13:10:48 +0000 (13:10 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am:
d23be95dd7 -s ours
Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9
Hugo Benichi [Tue, 11 Jul 2017 11:56:52 +0000 (11:56 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
Bin Chen [Tue, 11 Jul 2017 11:17:15 +0000 (11:17 +0000)]
Merge "Fix typo in Parcel javadoc." am:
ed0e6009df
am:
d29e275b5b
Change-Id: Id1fa7cc2948153697c8c34a2e4db632153218162
Bin Chen [Tue, 11 Jul 2017 11:10:23 +0000 (11:10 +0000)]
Merge "Fix typo in Parcel javadoc."
am:
ed0e6009df
Change-Id: I06d3ac4d00cfec5179ca6e636365617c644f9fcd
Treehugger Robot [Tue, 11 Jul 2017 10:58:30 +0000 (10:58 +0000)]
Merge "Fix typo in Parcel javadoc."
Hugo Benichi [Tue, 11 Jul 2017 10:24:22 +0000 (10:24 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master
am:
858ed182d6 -s ours
Change-Id: Ia9a74f588f8600bf2e453d7e7f1b5e1a818c432d
Neil Fuller [Tue, 11 Jul 2017 10:16:54 +0000 (10:16 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master
am:
cb996b5574
Change-Id: I42513c054183772a27fb985cee66440a88003143
Hugo Benichi [Tue, 11 Jul 2017 10:15:19 +0000 (10:15 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
am:
6ab950dd5f
Change-Id: I23fbbc7bf6ec53dc04ba4328166038f19b972268
Hugo Benichi [Tue, 11 Jul 2017 10:11:39 +0000 (10:11 +0000)]
Merge "Instrument captive portal login activity" into stage-aosp-master
Android Build Merger (Role) [Tue, 11 Jul 2017 10:08:59 +0000 (10:08 +0000)]
Merge "Merge "Move column definitions to an inner class" am:
ab0bb48965" into stage-aosp-master
Neil Fuller [Tue, 11 Jul 2017 10:07:37 +0000 (10:07 +0000)]
Merge "Move column definitions to an inner class"
am:
ab0bb48965
Change-Id: Ie9fa51f05dc7df781e9e9bdeb9d3c21ca4cde6c8
Hugo Benichi [Tue, 11 Jul 2017 10:06:03 +0000 (10:06 +0000)]
Merge "NetworkCapabilities: Added support for TRANSPORT_LOWPAN" into stage-aosp-master
Neil Fuller [Tue, 11 Jul 2017 10:01:01 +0000 (10:01 +0000)]
Merge "Move column definitions to an inner class"
Hugo Benichi [Tue, 11 Jul 2017 07:25:32 +0000 (07:25 +0000)]
Merge "Fix for the missing focus in WebView form fields." am:
2708da7bf6 -s ours
am:
76ea0eb773
Change-Id: I4799a8a5a3cf3c68774f40a560a1198d9af61eb6
Hugo Benichi [Tue, 11 Jul 2017 07:20:46 +0000 (07:20 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
am:
369bbf5d05
Change-Id: I02802f762a62fc29ff383523d2c52ebd536a9715
Hugo Benichi [Tue, 11 Jul 2017 07:16:21 +0000 (07:16 +0000)]
Merge "Fix for the missing focus in WebView form fields."
am:
2708da7bf6 -s ours
Change-Id: Ia27a1468e2e81444562d592a0c9d5e4f48cc776c
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into stage-aosp-master)
Change-Id: Iff025d68b824eac2c30b9656fd2494338eb07eb3
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Change-Id: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Hugo Benichi [Tue, 11 Jul 2017 07:08:43 +0000 (07:08 +0000)]
Merge "New Metrics constants for captive portal related UI" into stage-aosp-master
Hugo Benichi [Tue, 11 Jul 2017 07:05:26 +0000 (07:05 +0000)]
Merge "Fix for the missing focus in WebView form fields."
susnata [Fri, 23 Jun 2017 16:13:05 +0000 (09:13 -0700)]
Fix for the missing focus in WebView form fields.
This looks like a regression for WebView (58.0.3029.125) in android
'O'. But this seems to have been fixed in early version of 60 (webview).
This workaround gets us past the problem, until we get the newer version
of WebView.
Bug:
62449959
Test: Manual
Change-Id: Iab22f8f0db0ab58cb0a184c3f88e6b3770a35fb0
Merged-In: I29883bf7d1567c1ce7be90b4efde4b3da93b99a2
(cherry pick from commit
97640400c4aa6bf05d5606ea749b54ad63de97cd)
Robert Quattlebaum [Mon, 15 May 2017 22:53:29 +0000 (15:53 -0700)]
NetworkCapabilities: Added support for TRANSPORT_LOWPAN
This change simply adds a new constant, `TRANSPORT_LOWPAN`, for
identifying low-power wireless networks like Thread.
Bug: b/
33073713
Test: builds
Change-Id: I50d9b8df1a0270e06c28f001adf6c52a142a85af
Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689
(cherry pick from commit
557e0c38b98f66d6147206f23d24d8d73b09e3e5)
Hugo Benichi [Wed, 31 May 2017 02:11:37 +0000 (11:11 +0900)]
New Metrics constants for captive portal related UI
This patch adds 5 new constants in metrics_constants for counting
various UI interactions involving captive portals:
- sign-in button in wifi network details card
- captive portal login activity start up
- captive portal login activity menu interactions (2 constants)
- captive portal login activity auto-closes on portal dismissed
Bug:
34901696
Bug:
26303355
Test: compiled, flashed
Change-Id: I01e2f2942b9d0183512cfddb248e66d3e33418d3
Merged-In: I489e5f2f8ff27da60fed215fa5f51326933fd79e
(cherry pick from commit
11da42bbb63dba98515e6a3ca7c55e77cbb3c7bf)
Bill Yi [Tue, 11 Jul 2017 03:59:10 +0000 (03:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
88e9aa19e2 -s ours
Change-Id: Iac87034d218ebdefbe1879192148ad323388c87c
Bill Yi [Tue, 11 Jul 2017 03:52:20 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am:
48cf1d9768 -s ours
am:
829d7186d5 -s ours
Change-Id: Icf5cedc770c63dc8e5e41cb128d01135fe1596bf
TreeHugger Robot [Tue, 11 Jul 2017 03:50:19 +0000 (03:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Tue, 11 Jul 2017 03:43:57 +0000 (03:43 +0000)]
Import translations. DO NOT MERGE
am:
48cf1d9768 -s ours
Change-Id: If7328a10566daf60ac6da033923b1acbb307865f
Bin Chen [Tue, 11 Jul 2017 03:01:44 +0000 (11:01 +0800)]
Fix typo in Parcel javadoc.
Change-Id: Ida05259143e86c15c2ed69eeb7566d39b60fa823
Bill Yi [Mon, 10 Jul 2017 21:56:13 +0000 (14:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f7c93454c795da3db06572b1cddf9691ec4ff8e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Mon, 10 Jul 2017 21:17:29 +0000 (14:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d78e510a92213c8cd7bf2ba96e756418b79aba8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Neil Fuller [Mon, 10 Jul 2017 18:18:01 +0000 (19:18 +0100)]
Move column definitions to an inner class
Move column definitions and other URI constants
to inner classes based on feedback from an API council
reviewer.
Bug:
31008728
Test: make droid
Change-Id: I213e44f2655017e0ca32a4dfb1f5617ef471d854
Neil Fuller [Mon, 10 Jul 2017 14:33:52 +0000 (14:33 +0000)]
Merge "Configure the package name of the updater app" am:
ed3e6d47ff
am:
e293f7ee0d
Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb
Neil Fuller [Mon, 10 Jul 2017 14:26:32 +0000 (14:26 +0000)]
Merge "Configure the package name of the updater app"
am:
ed3e6d47ff
Change-Id: I6de319392c50bd8d6de56144d11333d18701fcdb
Neil Fuller [Mon, 10 Jul 2017 14:14:46 +0000 (14:14 +0000)]
Merge "Configure the package name of the updater app"
Lorenzo Colitti [Mon, 10 Jul 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error." am:
9c170157a8
am:
97e7afe8d0
Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:52:37 +0000 (13:52 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621" am:
c895fcef8f
am:
03e304e4e8
Change-Id: I3aadaccd191e59046db1ac138da71bbbc0261811
Neil Fuller [Mon, 10 Jul 2017 13:48:50 +0000 (13:48 +0000)]
Merge "Fix dumpsys output for staged install version" am:
7fc43b1fbd
am:
d725e7aeab
Change-Id: Ic5fdbbcfed2d840a74b01443d9ba5806b52f4745
Hugo Benichi [Mon, 10 Jul 2017 13:47:15 +0000 (13:47 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." am:
d56856876f -s ours
am:
ae62bb1d41
Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21
Lorenzo Colitti [Mon, 10 Jul 2017 13:43:02 +0000 (13:43 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
am:
9c170157a8
Change-Id: Ia4074f720ce0db69c86cd58ddc574d595cfceeee
Przemyslaw Szczepaniak [Mon, 10 Jul 2017 13:40:49 +0000 (13:40 +0000)]
Merge "Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621"
am:
c895fcef8f
Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1
Neil Fuller [Mon, 10 Jul 2017 13:39:10 +0000 (13:39 +0000)]
Merge "Fix dumpsys output for staged install version"
am:
7fc43b1fbd
Change-Id: I14f5775c5347072365e0d84ad811078bf57c5855
Hugo Benichi [Mon, 10 Jul 2017 13:37:31 +0000 (13:37 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
am:
d56856876f -s ours
Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186
Treehugger Robot [Mon, 10 Jul 2017 12:15:47 +0000 (12:15 +0000)]
Merge "Make failure to set addrgenmode a non-fatal error."
Treehugger Robot [Mon, 10 Jul 2017 12:00:31 +0000 (12:00 +0000)]
Przemyslaw Szczepaniak [Tue, 4 Jul 2017 09:32:11 +0000 (10:32 +0100)]
Track libcore commit
2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug:
62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
Treehugger Robot [Mon, 10 Jul 2017 11:52:11 +0000 (11:52 +0000)]
Merge "Fix dumpsys output for staged install version"
Hugo Benichi [Mon, 10 Jul 2017 11:42:45 +0000 (11:42 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors."
Lorenzo Colitti [Mon, 10 Jul 2017 10:05:13 +0000 (19:05 +0900)]
Make failure to set addrgenmode a non-fatal error.
Bug:
17613910
Test: bullhead builds, boots, connects to wifi
Change-Id: I310dcacc6784c13904fca79b839b5f4d94bfc45e
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
Change-Id: I05378ed74e678829e46fbeee18df916ec6ec2856
Erik Kline [Sat, 8 Jul 2017 07:21:40 +0000 (07:21 +0000)]
Merge "Add more logging to the Tethering SharedLog" am:
839cc0433f
am:
0a76af09b1
Change-Id: Ie3bd8e8a5d8911303cead707e0485c78ea7d055c
Erik Kline [Sat, 8 Jul 2017 07:14:59 +0000 (07:14 +0000)]
Merge "Add more logging to the Tethering SharedLog"
am:
839cc0433f
Change-Id: Ibc2c9989ee9c5980003a60b43345baafc2cd3c0c
Treehugger Robot [Sat, 8 Jul 2017 07:06:09 +0000 (07:06 +0000)]
Merge "Add more logging to the Tethering SharedLog"
Kouji Shiotani [Fri, 7 Jul 2017 21:34:32 +0000 (21:34 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats" am:
87e893a449
am:
1249e0a1b0
Change-Id: I962bd3c6dee3d635c6f5b56f2141e8f785fa4cfb
Kouji Shiotani [Fri, 7 Jul 2017 21:28:43 +0000 (21:28 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
am:
87e893a449
Change-Id: I3b63fa6c8fa88b182d4a9f2442022dc45a692d46
Treehugger Robot [Fri, 7 Jul 2017 21:20:40 +0000 (21:20 +0000)]
Merge "Fix wrong array index bound in NotificationUsageStats"
Andrew Solovay [Fri, 7 Jul 2017 19:08:56 +0000 (19:08 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
am:
1cdf4244f4
Change-Id: I295298edcd7f26df46edb71924fa63038a381619
Andrew Solovay [Fri, 7 Jul 2017 19:02:48 +0000 (19:02 +0000)]
Merge "docs: Described why ProgressDialog is now deprecated." into oc-dev
Neil Fuller [Fri, 7 Jul 2017 15:09:49 +0000 (16:09 +0100)]
Fix dumpsys output for staged install version
Fix dumpsys output for staged install version:
there was a double prefix.
Bug:
31008728
Test: Manual
Change-Id: Idcbdee68cb9961d93df6de96d7a1617f70b7ac94
Android Build Merger (Role) [Fri, 7 Jul 2017 07:47:44 +0000 (07:47 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:46:46 +0000 (07:46 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:46:33 +0000 (07:46 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
am:
9dcf614397
Change-Id: I2d9a30cb879a2b689f5519b8d4c066de1265f0df
Android Build Merger (Role) [Fri, 7 Jul 2017 07:45:52 +0000 (07:45 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:45:45 +0000 (07:45 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
am:
9dcf614397
Change-Id: Ib2abfdf4a3d445a3e404877d6187480f86e4956f
Adam Vartanian [Fri, 7 Jul 2017 07:44:34 +0000 (07:44 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd
am:
2886890793
Change-Id: I0757cbf92a049cc20226172b6d3261f5ef23b362
Adam Vartanian [Fri, 7 Jul 2017 07:43:53 +0000 (07:43 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd
am:
2886890793
Change-Id: I6b5e764a2b8653937c0edaaa6b9450973a38dac4
Android Build Merger (Role) [Fri, 7 Jul 2017 07:38:38 +0000 (07:38 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master
Adam Vartanian [Fri, 7 Jul 2017 07:37:18 +0000 (07:37 +0000)]
Merge "Streamline testInstall_compatibleContext()"
am:
476d58c6bd
Change-Id: Ib9c11cb5d7cf80f6dc8695d3b3c28f82854f3617
Adam Vartanian [Fri, 7 Jul 2017 07:36:34 +0000 (07:36 +0000)]
Merge "Streamline testInstall_compatibleContext()"
am:
476d58c6bd
Change-Id: I99631c3166ced487e990f28f0e7c10c180d6473a
Erik Kline [Thu, 6 Jul 2017 07:40:06 +0000 (16:40 +0900)]
Add more logging to the Tethering SharedLog
This may at first seem a tad spammy, but a cursory examination suggests
most of this is the Tethering subsystem doing more work than necessary.
Some of this can be addressed with some simple changes in the near term.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- watch "adb shell dumpsys connectivity tethering | tail 60"
shows new log entries
Bug:
29337859
Bug:
32163131
Bug:
63334101
Change-Id: I9539a37f346469f0474084f5f31527bc35093bce
Merged-In: I6820e6cc81cfa43d99ad66860e1dcf42d20109f8
Merged-In: I10960bf23a837eda1fb473826596c484484f1875
Merged-In: I0a8eb8be5562fa814109191b0110050ca4b60c02
Merged-In: I6219e56d571854a2c61e1da63095e319e4bd3dc1
Adam Vartanian [Fri, 7 Jul 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Streamline testInstall_compatibleContext()"
Robert Carr [Fri, 7 Jul 2017 03:22:53 +0000 (03:22 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am:
401b8907d0
Change-Id: I10b683e78ea75a1ca9cdd4e31317aa7f284ac046
TreeHugger Robot [Fri, 7 Jul 2017 03:10:12 +0000 (03:10 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 23:04:57 +0000 (23:04 +0000)]
Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp
Ruchi Kandoi [Thu, 6 Jul 2017 23:00:35 +0000 (23:00 +0000)]
Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master
am:
41d6995efa
Change-Id: I49343d3ee533b8b567edf2c76b9fbc78ad2cd235
Android Build Merger (Role) [Thu, 6 Jul 2017 22:59:15 +0000 (22:59 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'NCI-2.0' am:
430dded515 am:
4d08be4a52
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
Ruchi Kandoi [Thu, 6 Jul 2017 22:56:47 +0000 (22:56 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515
am:
4d08be4a52
Change-Id: Id2b2073acb3b901015b2b0d938a8cb5ee5a0270b
Ruchi Kandoi [Thu, 6 Jul 2017 22:56:19 +0000 (22:56 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515
am:
4d08be4a52
Change-Id: Ie427005b3fa448a33c1756afdea66715914c4ff4
Love Khanna [Thu, 6 Jul 2017 22:55:46 +0000 (22:55 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
am:
93d313b0a0
Change-Id: Iab0bd06f3f3a0d3f632e6bd5bedd8fb7c9831b90
Love Khanna [Thu, 6 Jul 2017 22:55:33 +0000 (22:55 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
am:
93d313b0a0
Change-Id: If6952f71012f48a789c31775161720dd409bf40b
Robert Carr [Thu, 6 Jul 2017 22:28:34 +0000 (15:28 -0700)]
SurfaceView: Avoid initializing Surface from an invalid
SurfaceControl.
In a recent CL we introduced a call to Surface#createFrom, in order to
recreate the Surface object from the underlying SurfaceControl, as a
workaround to emulate when it was parcelled over binder in the past.
However this is causing BufferQueue abandoned errors when stopping and
resuming some applications. To understand them, we need to revisit the
SurfaceView destruction process when handling onStop.
First mWindowStopped will be set to true (SurfaceView#windowStopped),
and we should then enter updateSurface. Our requested visibility will
now be false and so we emit the Surface destroyed callbacks. Notice in
the finally block in mUpdateSurface, we will release mSurface, but we
will NOT null mSurfaceControl. Inline documentation explains why.
In the case that the activity is not actually being destroyed, it's
possible that we may not get a dispatchDetachedFromWindow. This means
that we will not null mSurfaceControl. Now if the activity is
un-stopped and we re-enter updateSurface we encounter a problem
state. "creating" will be set to false since mSurfaceControl != null,
however mSurfaceControl will not point to a valid surface.
Prior to the introduction of the #createFrom call, this unwanted state
didn't cause any problems. Because mSurface was released back in the
finally block as we were stopping we now fall out of the
mSurface.isValid() block in updateSurface. As we reach the finally
block again, we would now set mSurfaceControl=null since the app was
no longer stopped. Later when we reach updateSurface again (which
tends to happen quite often) it will now be null and we will correctly
set creating=true, create a valid SurfaceControl, and move along
happily. However following, the introduction of this
Surface#createFrom call we will now reinitialize the Surface from an
invalid underlying SurfaceControl. This means we will enter the
mSurface.isValid block, but will proceed to emit an invalid Surface to
the client in the callbacks.
We avoid this state by making creating=true even if
SurfaceControl=non-null when the calculated visibility changes from
invisible to visible.
Bug:
63251745
Test: Manual of app from bug and apps from previous related bugs. go/wm-smoke. Additional manual testing of many SV apps.
Change-Id: Icc32a34cac239d65267da705cc23feb23e1ceb67
Android Build Merger (Role) [Thu, 6 Jul 2017 22:52:32 +0000 (22:52 +0000)]
Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master
* changes:
Merge changes from topic 'NCI-2.0' am:
430dded515
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11
Ruchi Kandoi [Thu, 6 Jul 2017 22:49:25 +0000 (22:49 +0000)]
Merge changes from topic 'NCI-2.0'
am:
430dded515
Change-Id: I3f56752a4c044c216bf1161ac778a349941ed541
Love Khanna [Thu, 6 Jul 2017 22:48:23 +0000 (22:48 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am:
e7ecebae11
Change-Id: I285fa2cfb5e0cd34f0342d78f283c67a5ce8d7f1
Ruchi Kandoi [Thu, 6 Jul 2017 22:48:20 +0000 (22:48 +0000)]
Merge changes from topic 'NCI-2.0'
am:
430dded515
Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f
Love Khanna [Thu, 6 Jul 2017 22:47:08 +0000 (22:47 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
am:
e7ecebae11
Change-Id: Ic91ecb6a8dcb8529efda8eb0cdc99ca7758b66e6
Ruchi Kandoi [Thu, 6 Jul 2017 22:41:29 +0000 (22:41 +0000)]
Merge changes from topic 'NCI-2.0'
* changes:
AID suffix registration.
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
Android Build Merger (Role) [Thu, 6 Jul 2017 21:20:51 +0000 (21:20 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:19:36 +0000 (21:19 +0000)]
Merge "Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master am:
dc17418da0" into oc-dev-plus-aosp
Alex Light [Thu, 6 Jul 2017 21:19:06 +0000 (21:19 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
am:
dc17418da0
Change-Id: Ice4b58746d888aacf759df70146817deaff39f51
Android Build Merger (Role) [Thu, 6 Jul 2017 21:18:31 +0000 (21:18 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f am:
c9b8de6136" into oc-dev-plus-aosp
Alex Light [Thu, 6 Jul 2017 21:17:43 +0000 (21:17 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
am:
dc17418da0
Change-Id: Ic560028afab1b3918c32c10efd457331b17b6abc
Alex Light [Thu, 6 Jul 2017 21:16:51 +0000 (21:16 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f
am:
c9b8de6136
Change-Id: If90472d31e9c46b9848d3aa29b548beecbe1978a
Alex Light [Thu, 6 Jul 2017 21:15:59 +0000 (21:15 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f
am:
c9b8de6136
Change-Id: Ia613ba66564bb881339569055205165e5f4c00b1
Android Build Merger (Role) [Thu, 6 Jul 2017 21:13:29 +0000 (21:13 +0000)]
Merge "Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am:
a4267fd89f" into stage-aosp-master
Alex Light [Thu, 6 Jul 2017 21:11:47 +0000 (21:11 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am:
a4267fd89f
Change-Id: I8cd6ee971686accf3cc832e7c0f5f18e8b4fbf2f
Android Build Merger (Role) [Thu, 6 Jul 2017 21:11:06 +0000 (21:11 +0000)]
Merge "Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master am:
2e8ba8dd5c" into oc-dev-plus-aosp
Colin Cross [Thu, 6 Jul 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master
am:
2e8ba8dd5c
Change-Id: I0833d345749714ccd8a9feb9e1e495f540253fd0
Alex Light [Thu, 6 Jul 2017 21:10:11 +0000 (21:10 +0000)]
Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am:
a4267fd89f
Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388
Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:50 +0000 (21:09 +0000)]
Merge "Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66" into stage-aosp-master am:
2e8ba8dd5c" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Merge "Enable priority boost for non-Jack builds." am:
847c70da66 am:
24a1598b5b" into oc-dev-plus-aosp
OSDN Git Service
