Sudheer Shanka
21d4b84547
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b
...
am: f428d49b12
2016-09-20 01:16:20 +00:00
Sudheer Shanka
647cd7545b
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours
...
am: 011172a731
2016-09-20 01:07:14 +00:00
Sudheer Shanka
1701a25584
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
...
am: 7f99a18e0e
2016-09-20 00:59:58 +00:00
Sudheer Shanka
f428d49b12
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours
...
am: 1781d2bd3b
2016-09-20 00:59:15 +00:00
Sudheer Shanka
91ff18a1f6
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4
...
am: 6b77a4ee55
2016-09-20 00:33:59 +00:00
Sudheer Shanka
011172a731
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e
...
am: fc2bef0139
2016-09-20 00:33:56 +00:00
TreeHugger Robot
0b85c6ee78
Merge "Allow dismissing ImmersiveModeCling without touch" into nyc-mr1-dev
2016-09-20 00:23:43 +00:00
TreeHugger Robot
99fcdd96da
Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev
2016-09-20 00:22:42 +00:00
Sudheer Shanka
fcc3d8fca2
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f
...
am: e8e30122e8
2016-09-20 00:13:24 +00:00
Sudheer Shanka
7f99a18e0e
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416
...
am: 6f170618ff
2016-09-20 00:13:19 +00:00
Sudheer Shanka
fc2bef0139
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6
...
am: 018d1e7e1e
2016-09-20 00:13:13 +00:00
Sudheer Shanka
c6d9bdded2
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours
...
am: 51bcb058ad
2016-09-20 00:13:07 +00:00
Sudheer Shanka
af97c8805f
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours
...
am: 1d053b3be8
2016-09-20 00:12:50 +00:00
Kevin Hufnagle
aadfcbb116
docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide am: 49ed3eb8bc
...
am: cfd0951877
2016-09-20 00:12:00 +00:00
Sudheer Shanka
1781d2bd3b
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5
...
am: 426ba52b42
2016-09-20 00:11:54 +00:00
Ben Lin
5e1e779098
DO NOT MERGE ANYWHERE
...
Remove onBeforePop() logic so back no longer opens/closes drawer.
Bug: 30814333
Change-Id: I4f6fc2a353286f69b88e5340145f7f9b3a97e819
2016-09-19 17:10:20 -07:00
Winson Chung
65383622b7
Merge "Workaround for not showing previous tasks when time is set." into nyc-mr1-dev
2016-09-19 23:54:44 +00:00
Kevin Hufnagle
d00481bef2
docs: Fixed constants in manifest sample related to battery level.
...
Bug: 31064851
Change-Id: Ia4b07172984773dc8a0cac8fbe85e412f3381886
2016-09-19 16:53:52 -07:00
Kevin Hufnagle
6b4e509c25
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
...
am: c60146d808
2016-09-19 23:25:39 +00:00
Kevin Hufnagle
cfd0951877
docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide
...
am: 49ed3eb8bc
2016-09-19 23:25:34 +00:00
Sudheer Shanka
6b77a4ee55
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours
...
am: e44f8fcca4
2016-09-19 23:25:14 +00:00
Sudheer Shanka
1d053b3be8
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf
...
am: 3fca892d3e
2016-09-19 23:24:48 +00:00
Sudheer Shanka
6f170618ff
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6
...
am: f4844b3416
2016-09-19 23:23:01 +00:00
Sudheer Shanka
ac143d2dfd
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a
...
am: e85152c2fc
2016-09-19 23:22:39 +00:00
Sudheer Shanka
018d1e7e1e
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0
...
am: 96d70301e6
2016-09-19 23:22:33 +00:00
Sudheer Shanka
e44f8fcca4
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb
...
am: 271aa24036
2016-09-19 23:04:23 +00:00
Sudheer Shanka
51bcb058ad
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours
...
am: ff9a8d74c7
2016-09-19 23:02:54 +00:00
Adrian Roos
f940aa3ea1
Merge "Hold WakeLock while DreamService starts" into nyc-mr1-dev
2016-09-19 22:47:30 +00:00
Sudheer Shanka
426ba52b42
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49
...
am: 94da8023d5
2016-09-19 22:45:40 +00:00
Kevin Hufnagle
c60146d808
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
2016-09-19 22:40:18 +00:00
Mary Yanchar
acb3eb39da
Small change for new sample test code
...
Making a very small change to mention the example instrumented tests,
since the new code now matches the setup described in this tutorial.
Bug: 28932254
Change-Id: I1bcaa858a1e51609f0ab2863e2738f7aed96c01a
2016-09-19 22:38:15 +00:00
Sudheer Shanka
271aa24036
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5
...
am: 5c53e1b8bb
2016-09-19 22:35:55 +00:00
Andreas Gampe
8d1d2ab5b9
OtaDexopt: Fix after-ota space measure
...
Actually measure the available space.
Bug: 31458900
Change-Id: I16ecee6c275229bc21e908b88b24152484025bc8
2016-09-19 15:18:46 -07:00
Svetoslav Ganov
85a93a0cc9
Merge "Add access tracker to renamed accounts" into nyc-mr1-dev
2016-09-19 22:15:18 +00:00
Chao Chen
944dc5a40e
Merge "In AccessibilityGestureDetector.clear(), dispatch a MotionEvent.ACTION_CLEAR event to mGestureDetector to cancel the ongoing gesture." into nyc-mr1-dev
2016-09-19 21:52:08 +00:00
Sudheer Shanka
ff9a8d74c7
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1
...
am: c1b2e6db98
2016-09-19 21:50:49 +00:00
Sudheer Shanka
3fca892d3e
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79
...
am: a4c9bbefdf
2016-09-19 21:50:47 +00:00
Sudheer Shanka
729759f8c9
Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b
...
am: 91064a0ed3
2016-09-19 21:50:33 +00:00
Sudheer Shanka
e8e30122e8
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours
...
am: 43a1f74d7f
2016-09-19 21:49:26 +00:00
Makoto Onuki
6ad5f92512
Fix DPM unit tests, also fix a log message.
...
Bug 31446501
Change-Id: I37debbe2f4e983fb8bad026f8dd9bd91b7448dce
2016-09-19 14:23:02 -07:00
Christopher Tate
a611fdc66b
Always store wallpaper metadata to backup
...
By gating this on system/lock wallpaper imagery state we were
inadvertently missing backup state for some live-wallpaper use
cases.
Bug 31023198
Change-Id: Ie53000453e6618844be7c01766c1b715d14cc713
2016-09-19 14:05:44 -07:00
Android Build Merger (Role)
8402a17417
Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf" into nyc-mr1-dev
2016-09-19 21:03:55 +00:00
Sudheer Shanka
b4ecfb9df1
Fix deadlock in AcitivityManagerService. am: 67e05b4d28
...
am: 44c9e2f4bf
2016-09-19 21:03:18 +00:00
Sudheer Shanka
f4844b3416
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b
...
am: 2f44f906a6
2016-09-19 21:03:16 +00:00
Sudheer Shanka
c1b2e6db98
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb
...
am: a437e7f3f1
2016-09-19 21:02:53 +00:00
Amith Yamasani
4bbca649fc
Merge "Fix reporting of network connectivity when parole changes" into nyc-mr1-dev
2016-09-19 21:01:52 +00:00
Sudheer Shanka
e85152c2fc
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours
...
am: bab9c1006a
2016-09-19 20:58:08 +00:00
Vadim Tryshev
45bee6b24c
For pre-N apps, cascade LOCATION and DROP events.
...
To restore the pre-N behavior, if a view returns false from its
LOCATION or DROP event handler, the event goes to its parent.
Bug: 31559942
Change-Id: I322099ae1e8a5cbbcf8814f2cd274fbae53b6848
2016-09-19 13:55:46 -07:00
Eric Schmidt
3652ae7d6d
Merge "docs: Fixed language directory issue localization" into nyc-dev am: 52fd8f88e1
...
am: 357b9d9816
2016-09-19 20:47:40 +00:00
Sudheer Shanka
94da8023d5
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
...
am: 900550de49
2016-09-19 20:47:39 +00:00
