Etan Cohen
ad864c8fd9
Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535
...
am: eb4c838c46
2016-09-20 16:58:32 +00:00
Scott Main
99ec81ab46
Merge changes from topic 'n-versioncode' into nyc-dev
...
* changes:
A little more on issue #30766518 : Document what targeting N does
Cherrypick so we can publish N version code description ASAP
2016-09-20 16:56:57 +00:00
Etan Cohen
eb4c838c46
Merge "[NAN] Rename to make discovery explicit"
...
am: 5706a8f535
2016-09-20 16:50:01 +00:00
Etan Cohen
5706a8f535
Merge "[NAN] Rename to make discovery explicit"
2016-09-20 16:41:04 +00:00
Rebecca Silberstein
683bc64b6b
Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 am: c507bcaf63
...
am: 6d2cca0f43
2016-09-20 16:10:12 +00:00
Rebecca Silberstein
6d2cca0f43
Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2
...
am: c507bcaf63
2016-09-20 16:04:40 +00:00
Rebecca Silberstein
c507bcaf63
Merge "WifiScanner: retrieve single scan results"
...
am: 3c70a2fad2
2016-09-20 15:58:17 +00:00
Rebecca Silberstein
3c70a2fad2
Merge "WifiScanner: retrieve single scan results"
2016-09-20 15:50:08 +00:00
Yohei Yukawa
e3e31a8801
Fix another deadlock between IMMS and TSMS
...
Bug 31247871 and Bug 31273203 are the same in terms of that both can be
triggered by calling TSM##getCurrentSpellCheckerSubtype() but different
in terms of what lock objects are involved.
To summarize
Bug 31273203: between IMMS#mMethodMap and IMM#H
A. OnClickListener.onClick() running in the IMMS locks IMMS#mMethodMap
then does some View operations, which can be blocked until
IMM#H is unlocked (e.g. IMM#onViewDetachedFromWindow()).
B. TSMS#getCurrentSpellCheckerSubtype() internally calls
IMM#getCurrentInputMethodSubtype(), which locks IMM#H then can be
blocked until IMMS#mMethodMap is unlocked.
The tricky point here is that IMMS and TSMS are running in the same
process hence IMM#H are actually shared between them.
Bug 31247871: between IMMS#mMethodMap and TSMS#mSpellCheckerMap
C. IMMS locks IMMS#mMethodMap then calls
InputMethodUtils#setNonSelectedSystemImesDisabledUntilUsed(), which
can be blocked until TSMS#mSpellCheckerMap is unlocked.
D. TSMS#getCurrentSpellCheckerSubtype() locks TSMS#mSpellCheckerMap
then may call IMM#getCurrentInputMethodSubtype(), which can be
blocked until IMMS#mMethodMap is released.
This CL aims to remove the layered lock in D to close Bug 31247871,
while the previous CL [1] took care of B to close Bug 31273203.
Note that A and C are still concerning and should also be taken care of
as a part of Bug 31273203.
[1]: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d
fa1886feea
2016-09-20 06:43:03 -07:00
Lorenzo Colitti
29bd384f2c
Add debug output for bad wifi avoidance restrictions.
...
Bug: 31075769
Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203
2016-09-20 22:01:39 +09:00
Sudheer Shanka
56aa328bdc
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours am: fba3187084 am: ad079c3349 am: bd3b1da646
...
am: b7a74bb8ab
2016-09-20 09:52:00 +00:00
Sudheer Shanka
b7a74bb8ab
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours am: fba3187084 am: ad079c3349
...
am: bd3b1da646
2016-09-20 09:47:01 +00:00
Sudheer Shanka
d4bd175dfb
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours am: 4c77b60440 am: a5606274e6 am: 03d907911a
...
am: 920d8cc897
2016-09-20 09:44:50 +00:00
Android Build Merger (Role)
9439a3a59e
Merge "Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65 am: 73d479afeb am: 564fc8f833 am: 7fff8a7bc8" into nyc-mr1-dev-plus-aosp
2016-09-20 09:35:03 +00:00
Sudheer Shanka
975b97e964
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65 am: 73d479afeb am: 564fc8f833
...
am: 7fff8a7bc8
2016-09-20 09:34:23 +00:00
Sudheer Shanka
f0dfef3503
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours am: fba3187084
...
am: f6ce0bfda9
2016-09-20 09:34:12 +00:00
Sudheer Shanka
920d8cc897
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours am: 4c77b60440 am: a5606274e6
...
am: 03d907911a
2016-09-20 09:34:10 +00:00
Sudheer Shanka
bd3b1da646
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours am: fba3187084
...
am: ad079c3349
2016-09-20 09:29:59 +00:00
Sudheer Shanka
cd1d6b2245
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours am: 4c77b60440
...
am: b5a0a8ab2b
2016-09-20 09:27:10 +00:00
Sudheer Shanka
03d907911a
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours am: 4c77b60440
...
am: a5606274e6
2016-09-20 09:27:01 +00:00
Sudheer Shanka
7fff8a7bc8
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65 am: 73d479afeb
...
am: 564fc8f833
2016-09-20 09:25:37 +00:00
Sudheer Shanka
f6ce0bfda9
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours
...
am: fba3187084
2016-09-20 09:08:13 +00:00
Sudheer Shanka
ad079c3349
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours
...
am: fba3187084
2016-09-20 09:07:46 +00:00
Sudheer Shanka
b5a0a8ab2b
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours
...
am: 4c77b60440
2016-09-20 09:02:40 +00:00
Sudheer Shanka
564fc8f833
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65
...
am: 73d479afeb
2016-09-20 09:02:39 +00:00
Sudheer Shanka
a5606274e6
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours
...
am: 4c77b60440
2016-09-20 09:01:29 +00:00
Sudheer Shanka
27ffa639bb
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52 am: 680b4dd14e am: df54f99587
...
am: 8fa0ab1486
2016-09-20 08:33:08 +00:00
Sudheer Shanka
fba3187084
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03
...
am: 1c2e8848dc
2016-09-20 08:32:59 +00:00
Sudheer Shanka
eba8de63d9
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours am: 3f8c97465d am: 2cc87e32c2 am: c8e6a93778
...
am: 99499e5263
2016-09-20 08:28:57 +00:00
Sudheer Shanka
73d479afeb
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours
...
am: 7efc56cc65
2016-09-20 08:28:41 +00:00
Sudheer Shanka
4c77b60440
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0
...
am: 5753af889b
2016-09-20 08:28:33 +00:00
Erik Kline
8ec1dc8117
Handle more commands in StoppingState
...
Also, expand the logging of states in which messages are
received and handled.
Bug: 31264287
Change-Id: If633984cb54128716fc9b3fcb27925906d0bd826
2016-09-20 17:20:57 +09:00
Sudheer Shanka
3d84027987
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65
...
am: 3a87b6773b
2016-09-20 08:14:26 +00:00
Sudheer Shanka
3a87b6773b
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours
...
am: 7efc56cc65
2016-09-20 08:00:37 +00:00
Sudheer Shanka
53d6adeb3e
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours am: 9d3efc7882 am: 1f9646c7ca am: 6cf48dc940
...
am: 4ec469f91b
2016-09-20 07:59:41 +00:00
Vadim Tryshev
380f3f1e79
Merge "Eliminating the black hole effect with location/drop events." into nyc-mr1-dev am: b1dd85c081
...
am: 55fc7d42fb
2016-09-20 07:28:18 +00:00
Vadim Tryshev
416384e06d
Eliminating the black hole effect with location/drop events. am: 1edc6daf1d
...
am: 32394cee01
2016-09-20 07:20:07 +00:00
Sudheer Shanka
766f3a8669
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours am: 011172a731 am: 647cd7545b am: dad9b673c1
...
am: 019588abf1
2016-09-20 07:11:41 +00:00
Lorenzo Colitti
165c51c0eb
Support "don't ask again" in the avoid bad wifi dialog.
...
This contains the following changes:
1. Make NETWORK_AVOID_BAD_WIFI a tristate: 0 means never avoid
bad wifi, unset means prompt the user, 1 means always avoid.
2. Look at NETWORK_AVOID_BAD_WIFI only if the carrier restricts
avoiding bad wifi (previously, we relied on the setting being
null and defaulting to the value of the config variable).
3. Add an avoidUnvalidated bit to NetworkAgentInfo to track
whether the user has requested switching away from this
unvalidated network even though avoiding bad wifi is generally
disabled. This is set to true when the user selects "switch"
in the dialog without setting the "Don't ask again" checkbox.
4. Add a hidden setAvoidUnvalidated API to ConnectivityManager to
set the avoidUnvalidated bit.
5. Additional unit test coverage.
Bug: 31075769
Change-Id: I1be60c3016c8095df3c4752330149ce638bd0ce1
2016-09-20 16:03:53 +09:00
Sudheer Shanka
947e17f21c
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e am: 1701a25584 am: bac21c0a99
...
am: 1dc5592be3
2016-09-20 07:03:32 +00:00
Sudheer Shanka
8fa0ab1486
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52 am: 680b4dd14e
...
am: df54f99587
2016-09-20 07:03:27 +00:00
Sudheer Shanka
1c2e8848dc
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c
...
am: badb5f2a03
2016-09-20 06:34:19 +00:00
Android Build Merger (Role)
ed787ea0b3
Merge "Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808 am: 6b4e509c25 am: 5505296760 am: f06a9469dd" into nyc-mr1-dev-plus-aosp
2016-09-20 06:33:34 +00:00
Sudheer Shanka
7efc56cc65
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492
...
am: 8d302da986
2016-09-20 06:33:24 +00:00
Kevin Hufnagle
979408532e
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808 am: 6b4e509c25 am: 5505296760
...
am: f06a9469dd
2016-09-20 06:33:00 +00:00
Sudheer Shanka
65b110af60
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52
...
am: 34a5ce150d
2016-09-20 06:32:57 +00:00
Sudheer Shanka
df54f99587
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52
...
am: 680b4dd14e
2016-09-20 06:32:55 +00:00
Sudheer Shanka
5753af889b
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9
...
am: 62c6ce4ca0
2016-09-20 06:32:39 +00:00
Adrian Roos
9a6003236a
Merge "Allow dismissing ImmersiveModeCling without touch" into nyc-mr1-dev am: 0b85c6ee78
...
am: d6d1187612
2016-09-20 06:24:38 +00:00
Sudheer Shanka
99499e5263
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours am: 3f8c97465d am: 2cc87e32c2
...
am: c8e6a93778
2016-09-20 06:23:22 +00:00
