OSDN Git Service
Adrian Roos [Tue, 20 Sep 2016 21:03:21 +0000 (14:03 -0700)]
DozeService: Seperate double tap and pickup
Adds handling for a separate double tap gesture
and allows enabling double tap and pickup
individually.
Test: Turn screen off, toggle gestures with `adb shell settings put secure doze_pulse_on_pick_up 0/1` and `adb shell settings put secure doze_pulse_on_double_tap 0/1`
Bug:
30595437
Change-Id: Id7b79f90b28429cf321544a3e425cf33c575d1c3
Mary Yanchar [Tue, 20 Sep 2016 21:03:12 +0000 (21:03 +0000)]
Merge "Small change for new sample test code" into nyc-dev am:
e5e9265e09
am:
c9ac62857d
Change-Id: Iede40ce493f46da6d74038e222c820993b6bb072
Mary Yanchar [Tue, 20 Sep 2016 21:00:05 +0000 (21:00 +0000)]
Small change for new sample test code am:
acb3eb39da
am:
2fba2c8c1b
Change-Id: I07502f5d1234d9b62836624777d4c5b015b10158
Scott Main [Tue, 20 Sep 2016 20:48:43 +0000 (20:48 +0000)]
Merge changes from topic 'n-versioncode' into nyc-dev am:
99ec81ab46
am:
1c944335cb
Change-Id: I1ba8c5bc910bb4727ed59b8e758c7e94006e98df
Mary Yanchar [Tue, 20 Sep 2016 20:48:40 +0000 (20:48 +0000)]
Merge "Small change for new sample test code" into nyc-dev
am:
e5e9265e09
Change-Id: Ia0b11bfa66bf25950afa5304ca1de3be4cb9207c
Mary Yanchar [Tue, 20 Sep 2016 20:48:36 +0000 (20:48 +0000)]
Small change for new sample test code
am:
acb3eb39da
Change-Id: I72196654f922a7ef46ab5903e1bd7f9409330076
Dianne Hackborn [Tue, 20 Sep 2016 20:47:48 +0000 (20:47 +0000)]
A little more on issue #
30766518: Document what targeting N does am:
da6be5b871
am:
c8bf8951c2
Change-Id: I83fd73bbda973de2667631dc77fc06b83051bc4e
Android Build Merger (Role) [Tue, 20 Sep 2016 20:34:33 +0000 (20:34 +0000)]
Merge "resolve merge conflicts of
491bc2b to nyc-dr1-dev am:
45bf970ebc" into nyc-mr1-dev
smain@google.com [Tue, 20 Sep 2016 20:33:57 +0000 (20:33 +0000)]
resolve merge conflicts of
491bc2b to nyc-dr1-dev
am:
45bf970ebc
Change-Id: I12ce82b5faa5fc050e7f30b3aae06e9f022d36f0
Scott Main [Tue, 20 Sep 2016 20:33:06 +0000 (20:33 +0000)]
Merge changes from topic 'n-versioncode' into nyc-dev
am:
99ec81ab46
Change-Id: I9b658d156929e6d958bc517d4fc38c8cd987eb2f
TreeHugger Robot [Tue, 20 Sep 2016 20:33:01 +0000 (20:33 +0000)]
Merge "Protect against crash on user switch" into nyc-mr1-dev
Dianne Hackborn [Tue, 20 Sep 2016 20:33:01 +0000 (20:33 +0000)]
A little more on issue #
30766518: Document what targeting N does
am:
da6be5b871
Change-Id: I6d08893a3190e7f92c56f4b220e79e8310bb0b2e
TreeHugger Robot [Tue, 20 Sep 2016 20:27:22 +0000 (20:27 +0000)]
Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev
Chris Tate [Tue, 20 Sep 2016 20:08:12 +0000 (20:08 +0000)]
Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev
TreeHugger Robot [Tue, 20 Sep 2016 20:04:05 +0000 (20:04 +0000)]
Merge "Fix data disabled icons in RTL" into nyc-mr1-dev
Jason Monk [Tue, 20 Sep 2016 18:34:26 +0000 (14:34 -0400)]
Protect against crash on user switch
Somehow one of the tiles doesn't have a view yet. Assume that this
is a transient part of the tiles getting recreated and that the skipped
tile will get picked up in the next layout.
Change-Id: Ia1370d66119bfcfa7b00bd087bcb0d72a072666a
Fixes:
31394359
smain@google.com [Tue, 20 Sep 2016 18:40:07 +0000 (11:40 -0700)]
resolve merge conflicts of
491bc2b to nyc-dr1-dev
Change-Id: Ice6c0ba347e0dc0d01b425faec0db37a2d65b8a2
Doris Ling [Tue, 20 Sep 2016 18:26:43 +0000 (18:26 +0000)]
Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev
Jason Monk [Tue, 20 Sep 2016 18:21:19 +0000 (14:21 -0400)]
Fix data disabled icons in RTL
Change-Id: Idfde6cbb3f1e19c44f33fda98c8c94d795a7763b
Fixes:
30130440
Mary Yanchar [Tue, 20 Sep 2016 18:19:21 +0000 (18:19 +0000)]
Merge "Small change for new sample test code" into nyc-dev
Yohei Yukawa [Tue, 20 Sep 2016 17:53:26 +0000 (17:53 +0000)]
Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev
Lorenzo Colitti [Tue, 20 Sep 2016 17:16:19 +0000 (17:16 +0000)]
Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev
am:
59266eec4e
Change-Id: I3cd85b815b1202b9291eacc986b131a020fefcd3
Lorenzo Colitti [Tue, 20 Sep 2016 17:15:50 +0000 (17:15 +0000)]
Add debug output for bad wifi avoidance restrictions.
am:
29bd384f2c
Change-Id: I17e42fb80763a9d48049db9d0785b54bd5005797
Lorenzo Colitti [Tue, 20 Sep 2016 17:14:50 +0000 (17:14 +0000)]
Support "don't ask again" in the avoid bad wifi dialog.
am:
165c51c0eb
Change-Id: Ic6a1917a83e2d847bd673790e2c36f7316ca7acd
Lorenzo Colitti [Tue, 20 Sep 2016 17:04:37 +0000 (17:04 +0000)]
Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev
* changes:
Add debug output for bad wifi avoidance restrictions.
Support "don't ask again" in the avoid bad wifi dialog.
Scott Main [Tue, 20 Sep 2016 16:56:54 +0000 (16:56 +0000)]
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
Yohei Yukawa [Tue, 20 Sep 2016 13:43:03 +0000 (06:43 -0700)]
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
fa1886feea55785f413f5efcd86bccca92f26759
Bug:
31247871
Bug:
31273203
Change-Id: I26479e7aa306e0df91d9911891d5625dd5f99678
Lorenzo Colitti [Tue, 20 Sep 2016 07:03:27 +0000 (16:03 +0900)]
Add debug output for bad wifi avoidance restrictions.
Bug:
31075769
Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203
Sudheer Shanka [Tue, 20 Sep 2016 09:29:59 +0000 (09:29 +0000)]
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
Change-Id: Ibeca0e34b1587bb6c1b9a1af49ea6c91005f7f25
Sudheer Shanka [Tue, 20 Sep 2016 09:27:01 +0000 (09:27 +0000)]
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
Change-Id: Ie0405ab51aaacbcae6363a1ede2ee7c635be867b
Sudheer Shanka [Tue, 20 Sep 2016 09:07:46 +0000 (09:07 +0000)]
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
Change-Id: I9a9e74a408eacfce930d34f49f0679d65ba887de
Sudheer Shanka [Tue, 20 Sep 2016 09:02:39 +0000 (09:02 +0000)]
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
Change-Id: I52e8c249eb598dae1c76ad2034e532d57be030e2
Sudheer Shanka [Tue, 20 Sep 2016 09:01:29 +0000 (09:01 +0000)]
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
Change-Id: If4c85af955349593b5b6bf0ef680b6028abd5761
Sudheer Shanka [Tue, 20 Sep 2016 08:32:59 +0000 (08:32 +0000)]
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
Change-Id: I8ef9e22473b93cc298273be517be4623b9ab1c1f
Sudheer Shanka [Tue, 20 Sep 2016 08:28:41 +0000 (08:28 +0000)]
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
Change-Id: Icaacbd574c72ecdb654dd6055a54032219292ab9
Sudheer Shanka [Tue, 20 Sep 2016 08:28:33 +0000 (08:28 +0000)]
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
Change-Id: I29a75431dd445026efde90f13a6e55fa59ec574d
Lorenzo Colitti [Sun, 18 Sep 2016 16:00:19 +0000 (01:00 +0900)]
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
Sudheer Shanka [Tue, 20 Sep 2016 06:34:19 +0000 (06:34 +0000)]
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
Change-Id: Ic4099ba4eaac6bb50afe5811eacf85dd7759819c
Sudheer Shanka [Tue, 20 Sep 2016 06:33:24 +0000 (06:33 +0000)]
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
Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643
Sudheer Shanka [Tue, 20 Sep 2016 06:32:55 +0000 (06:32 +0000)]
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
Change-Id: Ibca806635a91bda6e7577de3dc1e9a71fa9c4dc6
Sudheer Shanka [Tue, 20 Sep 2016 06:32:39 +0000 (06:32 +0000)]
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
Change-Id: I1d0c04e3c4382f395d10034343240e1bf4bca68f
Sudheer Shanka [Tue, 20 Sep 2016 05:54:37 +0000 (05:54 +0000)]
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
Change-Id: I36eecf20e2fc862daba195738363761b27e9fe8f
Sudheer Shanka [Tue, 20 Sep 2016 05:53:20 +0000 (05:53 +0000)]
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
Change-Id: I2a2e0f481a3a9947f6e5c3b11bf3c4624aca5404
Sudheer Shanka [Tue, 20 Sep 2016 05:53:17 +0000 (05:53 +0000)]
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
Change-Id: I6113993dcd1aed053e5755deca2b115f5df8c5bd
Sudheer Shanka [Tue, 20 Sep 2016 05:51:05 +0000 (05:51 +0000)]
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
Change-Id: Id9ccdcb6bad4eddb355f2035049361c66a3a5f15
Sudheer Shanka [Tue, 20 Sep 2016 05:34:00 +0000 (05:34 +0000)]
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
Change-Id: I389e25a4d5bc24761cc7c2c9e94e45e5e6158453
Sudheer Shanka [Tue, 20 Sep 2016 05:23:59 +0000 (05:23 +0000)]
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
Change-Id: Ib64a0085bfdb4a8e0a4d8d4b69b7434a0f8fdd4e
Sudheer Shanka [Tue, 20 Sep 2016 05:15:00 +0000 (05:15 +0000)]
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
Change-Id: I7fb85ca1dcb08e29d47086ccf35a04798b9a3ead
Sudheer Shanka [Tue, 20 Sep 2016 05:14:33 +0000 (05:14 +0000)]
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
Change-Id: If01f2017d66da002d7e01fb28ffd49f0e84319d1
Sudheer Shanka [Tue, 20 Sep 2016 05:06:39 +0000 (05:06 +0000)]
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
Change-Id: Id93e7f4089d3025702a4f27179eb1e8fbc7bcd36
Sudheer Shanka [Tue, 20 Sep 2016 05:06:22 +0000 (05:06 +0000)]
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
Change-Id: Id2d98d2f695f8884b5854e8fb1fbf406fda8fdb0
Sudheer Shanka [Tue, 20 Sep 2016 04:42:51 +0000 (04:42 +0000)]
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
Change-Id: Ieb72c957f1d58cea635bcd7b9449b19b3341efc8
Sudheer Shanka [Tue, 20 Sep 2016 04:11:52 +0000 (04:11 +0000)]
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
Change-Id: Ia7ea774c55524f67b9174bad90cb85bac034b246
Sudheer Shanka [Tue, 20 Sep 2016 03:26:27 +0000 (03:26 +0000)]
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
Change-Id: I76ee929d11873c4d2b9e55d0c9470b782f52c35d
Sudheer Shanka [Tue, 20 Sep 2016 03:19:49 +0000 (03:19 +0000)]
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
Change-Id: Icd41b479bb5b365173e146791c1ee858f2265128
Sudheer Shanka [Tue, 20 Sep 2016 03:19:01 +0000 (03:19 +0000)]
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
Change-Id: If479be63709943e4b8fb07390220b8b25d971469
TreeHugger Robot [Tue, 20 Sep 2016 02:52:21 +0000 (02:52 +0000)]
Merge "Eliminating the “black hole” effect with location/drop events." into nyc-mr1-dev
Sudheer Shanka [Tue, 20 Sep 2016 02:42:09 +0000 (02:42 +0000)]
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
Change-Id: Ic622fadd075915e1ba78d6795bc9382d0c6bd131
Sudheer Shanka [Tue, 20 Sep 2016 02:42:00 +0000 (02:42 +0000)]
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
Change-Id: I60e0ac94a2f1147ce80419d429a9d4681e3a0c57
Sudheer Shanka [Tue, 20 Sep 2016 02:21:52 +0000 (02:21 +0000)]
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
Change-Id: I58b7a1746647513f96f5dded0f9645dd86256e2f
Sudheer Shanka [Tue, 20 Sep 2016 02:21:48 +0000 (02:21 +0000)]
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
Change-Id: Iadb9309292857ad016a30c5b19c50114efe64890
Sudheer Shanka [Tue, 20 Sep 2016 02:21:46 +0000 (02:21 +0000)]
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
Change-Id: I81c7ffac76c08c12dcefcc5977cc4f01b1dab606
Sudheer Shanka [Tue, 20 Sep 2016 02:21:42 +0000 (02:21 +0000)]
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
Change-Id: Ib7fe0eba9cb3eeb4f42355dde3835753af1c2b5b
Sudheer Shanka [Tue, 20 Sep 2016 02:21:13 +0000 (02:21 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours am:
bab9c1006a am:
e85152c2fc am:
ac143d2dfd -s ours am:
20bafe850d
am:
923f622c15
Change-Id: I2962af1b07cd8102a471d3e0020e64dc50c94a04
Sudheer Shanka [Tue, 20 Sep 2016 02:20:58 +0000 (02:20 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours am:
43a1f74d7f am:
e8e30122e8
am:
fcc3d8fca2 -s ours
Change-Id: I1489cbfc74d97cb5e64cc712c480d556e227285e
Sudheer Shanka [Tue, 20 Sep 2016 02:00:05 +0000 (02:00 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5 am:
5c53e1b8bb am:
271aa24036 -s ours am:
e44f8fcca4 am:
6b77a4ee55
am:
91ff18a1f6
Change-Id: I06ecd096731967b9ab0ad55ebb3fa12b3cea4247
Sudheer Shanka [Tue, 20 Sep 2016 01:44:57 +0000 (01:44 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
b59e73613b am:
2f44f906a6 am:
f4844b3416 am:
6f170618ff -s ours am:
7f99a18e0e
am:
1701a25584
Change-Id: I9519be12a3e3a9d8742f9d1fa715fc1307dfd5cf
Sudheer Shanka [Tue, 20 Sep 2016 01:38:53 +0000 (01:38 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours am:
51bcb058ad
am:
c6d9bdded2
Change-Id: I854127259e85afb06046253c2d767f12439ae819
Kevin Hufnagle [Tue, 20 Sep 2016 01:37:57 +0000 (01:37 +0000)]
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am:
c60146d808
am:
6b4e509c25
Change-Id: Id2792f58b62f8ca8dc03df550fbf8ffa2a3a5708
Sudheer Shanka [Tue, 20 Sep 2016 01:37:28 +0000 (01:37 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours am:
bab9c1006a am:
e85152c2fc am:
ac143d2dfd -s ours
am:
20bafe850d
Change-Id: I58b5b4073af01991d5dc35b68807319a8e3749b1
Sudheer Shanka [Tue, 20 Sep 2016 01:36:48 +0000 (01:36 +0000)]
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
Change-Id: I7e65b0aae28bf10f3c84882990f9c26132709420
Sudheer Shanka [Tue, 20 Sep 2016 01:17:14 +0000 (01:17 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours am:
bab9c1006a am:
e85152c2fc
am:
ac143d2dfd -s ours
Change-Id: I360338620a6607d882ac8dd13ec9cfbfc8381762
Sudheer Shanka [Tue, 20 Sep 2016 01:16:20 +0000 (01:16 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49 am:
94da8023d5 am:
426ba52b42 -s ours am:
1781d2bd3b
am:
f428d49b12
Change-Id: I268ea392d2ebabb0ed5d3d74c02c1340d6067531
Sudheer Shanka [Tue, 20 Sep 2016 01:07:14 +0000 (01:07 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am:
38077274d0 am:
96d70301e6 am:
018d1e7e1e am:
fc2bef0139 -s ours
am:
011172a731
Change-Id: Ieb8e50e27e5b7dc838b4bc567499d03b83ee8a7e
Sudheer Shanka [Tue, 20 Sep 2016 00:59:58 +0000 (00:59 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
b59e73613b am:
2f44f906a6 am:
f4844b3416 am:
6f170618ff -s ours
am:
7f99a18e0e
Change-Id: Ic6e91076e979291bfcbc87bc2e8d71ddd4c700de
Sudheer Shanka [Tue, 20 Sep 2016 00:59:15 +0000 (00:59 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49 am:
94da8023d5 am:
426ba52b42 -s ours
am:
1781d2bd3b
Change-Id: I8a3eb8c29b34e74bad807485767bf4e2083c539d
Sudheer Shanka [Tue, 20 Sep 2016 00:33:59 +0000 (00:33 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5 am:
5c53e1b8bb am:
271aa24036 -s ours am:
e44f8fcca4
am:
6b77a4ee55
Change-Id: I04fdab0c6677eb8c5d6ec50ab82a4e1f9da2180f
Sudheer Shanka [Tue, 20 Sep 2016 00:33:56 +0000 (00:33 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am:
38077274d0 am:
96d70301e6 am:
018d1e7e1e
am:
fc2bef0139 -s ours
Change-Id: Ie957e5ca85ad212891574b0a5a932fde4c565ede
TreeHugger Robot [Tue, 20 Sep 2016 00:23:40 +0000 (00:23 +0000)]
Merge "Allow dismissing ImmersiveModeCling without touch" into nyc-mr1-dev
TreeHugger Robot [Tue, 20 Sep 2016 00:22:39 +0000 (00:22 +0000)]
Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev
Sudheer Shanka [Tue, 20 Sep 2016 00:13:24 +0000 (00:13 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am:
b358ee3558 -s ours am:
43a1f74d7f
am:
e8e30122e8
Change-Id: Ifae0a5532d455931e6f3dd01c2273e6fd21d3f07
Sudheer Shanka [Tue, 20 Sep 2016 00:13:19 +0000 (00:13 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
b59e73613b am:
2f44f906a6 am:
f4844b3416
am:
6f170618ff -s ours
Change-Id: I862c56f9db4ac9161dc155dc9f469909e30b0c61
Sudheer Shanka [Tue, 20 Sep 2016 00:13:13 +0000 (00:13 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am:
38077274d0 am:
96d70301e6
am:
018d1e7e1e
Change-Id: Ide3eaf333a2a1e3ef60ec0fb6e9ead1a0517c327
Sudheer Shanka [Tue, 20 Sep 2016 00:13:07 +0000 (00:13 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours am:
ff9a8d74c7 -s ours
am:
51bcb058ad
Change-Id: If639ceb911ea7cfc977bf053f1e897bd7939564f
Sudheer Shanka [Tue, 20 Sep 2016 00:12:50 +0000 (00:12 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf am:
3fca892d3e -s ours
am:
1d053b3be8 -s ours
Change-Id: I359bae35d6698349370b4f9a51427f10eb2bbdf3
Kevin Hufnagle [Tue, 20 Sep 2016 00:12:00 +0000 (00:12 +0000)]
docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide am:
49ed3eb8bc
am:
cfd0951877
Change-Id: Ie07affe1aab108237c1010696415d6d72e66166b
Sudheer Shanka [Tue, 20 Sep 2016 00:11:54 +0000 (00:11 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49 am:
94da8023d5
am:
426ba52b42 -s ours
Change-Id: I861ed40fa031d4add94e48b2fbbfb965ef1ca7d2
Winson Chung [Mon, 19 Sep 2016 23:54:41 +0000 (23:54 +0000)]
Merge "Workaround for not showing previous tasks when time is set." into nyc-mr1-dev
Kevin Hufnagle [Mon, 19 Sep 2016 23:25:39 +0000 (23:25 +0000)]
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
am:
c60146d808
Change-Id: I9dbf37975dc1aace9711df58f590e2ed049c60ed
Kevin Hufnagle [Mon, 19 Sep 2016 23:25:34 +0000 (23:25 +0000)]
docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide
am:
49ed3eb8bc
Change-Id: Ibb3c02e96183f8db5196292f413ad0955ca547fb
Sudheer Shanka [Mon, 19 Sep 2016 23:25:14 +0000 (23:25 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5 am:
5c53e1b8bb am:
271aa24036 -s ours
am:
e44f8fcca4
Change-Id: I8c985dee46cceb5ad8cf3beb6ac9839d9a9d2058
Sudheer Shanka [Mon, 19 Sep 2016 23:24:48 +0000 (23:24 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am:
d1e3e53d79 am:
a4c9bbefdf
am:
3fca892d3e -s ours
Change-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c
Sudheer Shanka [Mon, 19 Sep 2016 23:23:01 +0000 (23:23 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
b59e73613b am:
2f44f906a6
am:
f4844b3416
Change-Id: Ic9c96ac3d030ebb0ac53a48686b541a0182795cb
Sudheer Shanka [Mon, 19 Sep 2016 23:22:39 +0000 (23:22 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
2d608378f4 -s ours am:
bab9c1006a
am:
e85152c2fc
Change-Id: Iff935eccf136c6c85b2373cfd113e9f6d6d9c9fc
Sudheer Shanka [Mon, 19 Sep 2016 23:22:33 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am:
38077274d0
am:
96d70301e6
Change-Id: I9ec98a60d61bbafd25be9d85f31b3086cef59779
Sudheer Shanka [Mon, 19 Sep 2016 23:04:23 +0000 (23:04 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
e8340a9ed5 am:
5c53e1b8bb
am:
271aa24036 -s ours
Change-Id: Icaccd5612147cad9679f98476cf92bb3216e94f1
Sudheer Shanka [Mon, 19 Sep 2016 23:02:54 +0000 (23:02 +0000)]
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am:
dce4be63bb am:
a437e7f3f1 am:
c1b2e6db98 -s ours
am:
ff9a8d74c7 -s ours
Change-Id: I14d6109858bcf02b5f55eb3e207d6bc1918e746a
Adrian Roos [Mon, 19 Sep 2016 22:47:28 +0000 (22:47 +0000)]
Merge "Hold WakeLock while DreamService starts" into nyc-mr1-dev
Sudheer Shanka [Mon, 19 Sep 2016 22:45:40 +0000 (22:45 +0000)]
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am:
900550de49
am:
94da8023d5
Change-Id: Iedc174184adc89009ce498558a496b72d1c31a05
Kevin Hufnagle [Mon, 19 Sep 2016 22:40:16 +0000 (22:40 +0000)]
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
OSDN Git Service
