OSDN Git Service
Android Build Merger (Role) [Fri, 7 Jul 2017 07:57:30 +0000 (07:57 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
d7e6de2267" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:56:41 +0000 (07:56 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
587eeda675" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:56:25 +0000 (07:56 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
d7e6de2267
Change-Id: Ica715d36549f120a63ad70ce348ba6032ffc3eaa
Android Build Merger (Role) [Fri, 7 Jul 2017 07:55:30 +0000 (07:55 +0000)]
Merge "Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp am:
587eeda675" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:55:27 +0000 (07:55 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
587eeda675
Change-Id: If58174412aeaaad00a49143c67c19e1fef191709
Android Build Merger (Role) [Fri, 7 Jul 2017 07:54:43 +0000 (07:54 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp am:
37b52721ec" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:54:30 +0000 (07:54 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd" into stage-aosp-master am:
9dcf614397" into oc-dev-plus-aosp
am:
587eeda675
Change-Id: I9ad7c61b3a068246d486f81ec4d0929ebd787ace
Adam Vartanian [Fri, 7 Jul 2017 07:53:40 +0000 (07:53 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
am:
37b52721ec
Change-Id: Ie057e5a870c9e58b4999cecb56c19aaca6183121
Android Build Merger (Role) [Fri, 7 Jul 2017 07:53:33 +0000 (07:53 +0000)]
Merge "Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp am:
37b52721ec" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 07:53:04 +0000 (07:53 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793 am:
5cba3b343f" into oc-dr1-dev-plus-aosp
Adam Vartanian [Fri, 7 Jul 2017 07:52:21 +0000 (07:52 +0000)]
Merge "Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793" into oc-dev-plus-aosp
am:
37b52721ec
Change-Id: I43b7bb188a723e131056adc5e85571003c0bad21
Adam Vartanian [Fri, 7 Jul 2017 07:51:36 +0000 (07:51 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793
am:
5cba3b343f
Change-Id: I79f96c13475ef98c6457f5125bd1dd752f0a32db
Adam Vartanian [Fri, 7 Jul 2017 07:50:56 +0000 (07:50 +0000)]
Merge "Streamline testInstall_compatibleContext()" am:
476d58c6bd am:
2886890793
am:
5cba3b343f
Change-Id: I922f53fa48cb0acaa8c663202d7b1e5ffc2683f9
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
Adam Vartanian [Fri, 7 Jul 2017 07:27:29 +0000 (07:27 +0000)]
Merge "Streamline testInstall_compatibleContext()"
Erik Kline [Fri, 7 Jul 2017 06:19:23 +0000 (06:19 +0000)]
Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev
am:
351ba95239
Change-Id: I0a8eb8be5562fa814109191b0110050ca4b60c02
TreeHugger Robot [Fri, 7 Jul 2017 06:13:55 +0000 (06:13 +0000)]
Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 03:45:15 +0000 (03:45 +0000)]
Merge "Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev am:
ec43e485e7" into oc-dr1-dev-plus-aosp
Jason Monk [Fri, 7 Jul 2017 03:43:48 +0000 (03:43 +0000)]
Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev
am:
ec43e485e7
Change-Id: I8ec35f9e2b02b67d700dd684ceda220591099423
Jason Monk [Fri, 7 Jul 2017 03:42:39 +0000 (03:42 +0000)]
Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev
am:
ec43e485e7
Change-Id: I97c28e7b182a4a83f6818bae66484082ed5008a0
TreeHugger Robot [Fri, 7 Jul 2017 03:34:24 +0000 (03:34 +0000)]
Merge "Fix keyguard visibilities after reinflate" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 03:31:40 +0000 (03:31 +0000)]
Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0 am:
2f927d56cf" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 03:31:05 +0000 (03:31 +0000)]
Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0 am:
5482790a3f" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 03:30:16 +0000 (03:30 +0000)]
Merge "Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0 am:
5482790a3f" into oc-dr1-dev-plus-aosp
Robert Carr [Fri, 7 Jul 2017 03:29:50 +0000 (03:29 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0
am:
2f927d56cf
Change-Id: Idd571a3e786afba287b83277d2e95f7143d4e37d
Robert Carr [Fri, 7 Jul 2017 03:29:48 +0000 (03:29 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0
am:
5482790a3f
Change-Id: If186deb432621b5ce819ab9789b9dd57e324b440
Robert Carr [Fri, 7 Jul 2017 03:29:06 +0000 (03:29 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0
am:
2f927d56cf
Change-Id: I2916aa9a24b84d4f379c8ebebc7e19eb4adc96f4
Robert Carr [Fri, 7 Jul 2017 03:29:04 +0000 (03:29 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am:
401b8907d0
am:
5482790a3f
Change-Id: Ic613c35dd029bc637c6bef60d05110db31e04062
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
Robert Carr [Fri, 7 Jul 2017 03:22:50 +0000 (03:22 +0000)]
Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev
am:
401b8907d0
Change-Id: Ib7a916fb484fb3a7924315169d162f4fdddd8a06
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) [Fri, 7 Jul 2017 02:56:30 +0000 (02:56 +0000)]
Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am:
956647ec3e" into oc-dr1-dev-plus-aosp
Bryce Lee [Fri, 7 Jul 2017 02:54:36 +0000 (02:54 +0000)]
Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev
am:
956647ec3e
Change-Id: I7204eae9829d1e5ddc6f92ea6d358a62abc282a3
Android Build Merger (Role) [Fri, 7 Jul 2017 02:54:15 +0000 (02:54 +0000)]
Merge "Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev am:
956647ec3e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 02:53:58 +0000 (02:53 +0000)]
Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am:
da075a9681" into oc-dr1-dev-plus-aosp
Adam Lesinski [Fri, 7 Jul 2017 02:52:47 +0000 (02:52 +0000)]
Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am:
da075a9681
Change-Id: I131d809cbe0405849193245cb82df643512a2d16
Bryce Lee [Fri, 7 Jul 2017 02:52:47 +0000 (02:52 +0000)]
Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev
am:
956647ec3e
Change-Id: I6b5c09d11796f9dd07701ee647c0cb7daa0b46d3
Android Build Merger (Role) [Fri, 7 Jul 2017 02:52:25 +0000 (02:52 +0000)]
Merge "Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev am:
da075a9681" into oc-dr1-dev-plus-aosp
Adam Lesinski [Fri, 7 Jul 2017 02:50:55 +0000 (02:50 +0000)]
Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
am:
da075a9681
Change-Id: Ic4b22dab0f73fb91b23946946b6e2d30727606df
Android Build Merger (Role) [Fri, 7 Jul 2017 02:50:25 +0000 (02:50 +0000)]
Merge "Merge "Color of the ring around the lock icon" into oc-dr1-dev am:
0903e31e72" into oc-dr1-dev-plus-aosp
Lucas Dupin [Fri, 7 Jul 2017 02:49:09 +0000 (02:49 +0000)]
Merge "Color of the ring around the lock icon" into oc-dr1-dev
am:
0903e31e72
Change-Id: I4cb8d6e0987543fa9e189c508398ba70d683064d
Android Build Merger (Role) [Fri, 7 Jul 2017 02:48:07 +0000 (02:48 +0000)]
Merge "Merge "Hide all color hints references" into oc-dr1-dev am:
b1ab0ff21e" into oc-dr1-dev-plus-aosp
Lucas Dupin [Fri, 7 Jul 2017 02:46:15 +0000 (02:46 +0000)]
Merge "Hide all color hints references" into oc-dr1-dev
am:
b1ab0ff21e
Change-Id: I3ec45a3d914665dcff0bea651032351c06ca514b
Android Build Merger (Role) [Fri, 7 Jul 2017 02:44:13 +0000 (02:44 +0000)]
Merge "Merge "Hide all color hints references" into oc-dr1-dev am:
b1ab0ff21e" into oc-dr1-dev-plus-aosp
Lucas Dupin [Fri, 7 Jul 2017 02:42:35 +0000 (02:42 +0000)]
Merge "Hide all color hints references" into oc-dr1-dev
am:
b1ab0ff21e
Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30
Android Build Merger (Role) [Fri, 7 Jul 2017 02:41:11 +0000 (02:41 +0000)]
Merge "Merge "Make dun APNs as read-only by default." into oc-dr1-dev am:
730e4a5651" into oc-dr1-dev-plus-aosp
Amit Mahajan [Fri, 7 Jul 2017 02:40:05 +0000 (02:40 +0000)]
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am:
730e4a5651
Change-Id: I9fff601c11c937d83f55275646ddf44a5bdf3acb
Bryce Lee [Fri, 7 Jul 2017 02:38:38 +0000 (02:38 +0000)]
Merge "Revert "Use configuration delta to determine if still in orientation change."" into oc-dr1-dev
Amit Mahajan [Fri, 7 Jul 2017 02:37:34 +0000 (02:37 +0000)]
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
am:
730e4a5651
Change-Id: Iab30ea34531682e9e4212aa8930232121aa530bd
Antony Sargent [Fri, 7 Jul 2017 02:35:12 +0000 (02:35 +0000)]
Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev
am:
3e9d74091c
Change-Id: I43397652ec031b5cc2730dd0f8f2b8a6481a8bbe
Love Khanna [Fri, 7 Jul 2017 02:25:27 +0000 (02:25 +0000)]
Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
am:
5cb8f220a8
Change-Id: I9c91dbb63239a4f7f6b2f1e70a690c0fb35c7119
Love Khanna [Fri, 7 Jul 2017 02:24:26 +0000 (02:24 +0000)]
AID suffix registration.
am:
68f719e196
Change-Id: I41f8fb65218cb6c959f36ac30b604629bd04a1f2
TreeHugger Robot [Fri, 7 Jul 2017 01:38:01 +0000 (01:38 +0000)]
Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 01:29:54 +0000 (01:29 +0000)]
Merge "Color of the ring around the lock icon" into oc-dr1-dev
Bryce Lee [Fri, 7 Jul 2017 00:51:26 +0000 (17:51 -0700)]
Revert "Use configuration delta to determine if still in orientation change."
This reverts commit
2a0284b1a69b57cc239357c9a5fbb514cf2fc8b2.
Reason for revert: b/
63380251
Bug:
62846907
Fixes:
63380251
Change-Id: I18eb9e478cb2b99980a2e9bff22ba9b32b817f2f
TreeHugger Robot [Fri, 7 Jul 2017 00:12:08 +0000 (00:12 +0000)]
Merge "Hide all color hints references" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:50:32 +0000 (23:50 +0000)]
Merge "Make dun APNs as read-only by default." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Add a MetricsEvent entry for BT forget device confirm dialog" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 23:29:07 +0000 (23:29 +0000)]
Merge "Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp am:
4c92af3155" into oc-dr1-dev-plus-aosp
Ruchi Kandoi [Thu, 6 Jul 2017 23:24:27 +0000 (23:24 +0000)]
Merge "Merge changes from topic 'am-
638c543cf14f446eae62e5f283001253' into stage-aosp-master am:
41d6995efa" into oc-dev-plus-aosp
am:
4c92af3155
Change-Id: I9825dcb653ac21ef0c7b8f2d93addfcbd30e879e
Android Build Merger (Role) [Thu, 6 Jul 2017 23:22:04 +0000 (23:22 +0000)]
Merge changes from topic 'am-
bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp
* changes:
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp am:
3462f03144
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0 am:
06ece4ee26
Ruchi Kandoi [Thu, 6 Jul 2017 23:15:14 +0000 (23:15 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am:
3462f03144
Change-Id: Ia4abd92331ee0d0684d5014f2b33bbc2101935d0
Love Khanna [Thu, 6 Jul 2017 23:14:21 +0000 (23:14 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
am:
06ece4ee26
Change-Id: Ie1d9a3b96fa415eb99f4c8e9f75b2c519734ebd0
Ruchi Kandoi [Thu, 6 Jul 2017 23:13:54 +0000 (23:13 +0000)]
Merge changes from topic 'am-
0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp
am:
3462f03144
Change-Id: Ie95b06cd45924664c7a05e649fc96ac4d0f66745
Love Khanna [Thu, 6 Jul 2017 23:11:55 +0000 (23:11 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
am:
06ece4ee26
Change-Id: I0d0fd8bd98c177df117a649a359f919b8af751ed
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:04:53 +0000 (23:04 +0000)]
Merge changes from topic 'NCI-2.0' am:
430dded515 am:
4d08be4a52
am:
67d3257519
Change-Id: I77202532d60368ebc18e754a5454eb6fa1b0e5dc
Love Khanna [Thu, 6 Jul 2017 23:03:36 +0000 (23:03 +0000)]
NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am:
e7ecebae11 am:
93d313b0a0
am:
a161427214
Change-Id: If545ea98d8c8d6a97006bcc455b55e7c665e5a66
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:53:02 +0000 (22:53 +0000)]
Merge "Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev am:
407c4c5719" into oc-dr1-dev-plus-aosp
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
Matthew Ng [Thu, 6 Jul 2017 22:51:50 +0000 (22:51 +0000)]
Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev
am:
407c4c5719
Change-Id: Ibdaae695cb6055a0ca4b19bc70f180362b4b2bc4
Matthew Ng [Thu, 6 Jul 2017 22:51:40 +0000 (22:51 +0000)]
Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev
am:
407c4c5719
Change-Id: I85fc6bc9b19074a1be53704e91e7a776efed1cb9
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.
TreeHugger Robot [Thu, 6 Jul 2017 22:39:48 +0000 (22:39 +0000)]
Merge changes from topic 'nci-2.0-part2' into oc-dr1-dev
* changes:
NCI2.0 update LF_T3T_PARAMETERS of 18 byte.
AID suffix registration.
TreeHugger Robot [Thu, 6 Jul 2017 22:38:16 +0000 (22:38 +0000)]
Merge "DO NOT MERGE Ensure minimized state is false when dock is gone on exists change" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev am:
a48cf1e619" into oc-dr1-dev-plus-aosp
Daniel Nishi [Thu, 6 Jul 2017 22:05:43 +0000 (22:05 +0000)]
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
am:
a48cf1e619
Change-Id: I0382e247050e075f80ea94ae39509cea1e133b98
Daniel Nishi [Thu, 6 Jul 2017 22:03:36 +0000 (22:03 +0000)]
Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev
am:
a48cf1e619
Change-Id: I4a1531a293f5c3493db22f73bc5511a97e756f52
Android Build Merger (Role) [Thu, 6 Jul 2017 21:59:56 +0000 (21:59 +0000)]
Merge "Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev am:
457c58f912" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 6 Jul 2017 21:58:55 +0000 (21:58 +0000)]
Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
am:
457c58f912
Change-Id: I38573971acf0206ac3a5a8a32ae6a4577628e6a9
OSDN Git Service
