Commit Graph

253914 Commits

Author SHA1 Message Date
Sudheer Shanka
1dc5592be3 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e am: 1701a25584
am: bac21c0a99

Change-Id: I13dd3f85735873d86b2c196d8280740c9289fc51
2016-09-20 06:01:07 +00:00
Kevin Hufnagle
f06a9469dd Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808 am: 6b4e509c25
am: 5505296760

Change-Id: Id1b1f6f7365ae8fdf441876fc1df8d31df7a3c39
2016-09-20 05:53:24 +00:00
Adrian Roos
d6d1187612 Merge "Allow dismissing ImmersiveModeCling without touch" into nyc-mr1-dev
am: 0b85c6ee78

Change-Id: I49138edc5228e0e8cbde69922c3a209380293dd1
2016-09-20 05:05:59 +00:00
Adrian Roos
74fde83ae7 Allow dismissing ImmersiveModeCling without touch
am: dab1516994

Change-Id: Ie563bac05bd2f3f6dacfc6083ba5c3cde176c973
2016-09-20 05:05:54 +00:00
Andreas Gampe
7044eb33de Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev
am: 99fcdd96da

Change-Id: Idb46f1f021486fe413c975e2595f82c73b586dd7
2016-09-20 04:55:15 +00:00
Andreas Gampe
3a38623360 OtaDexopt: Fix after-ota space measure
am: 8d1d2ab5b9

Change-Id: I82df8c8a4e53a4448a5eac6392b1a5005af3d589
2016-09-20 04:55:12 +00:00
Kevin Hufnagle
ed42f35825 docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide am: 49ed3eb8bc am: cfd0951877
am: aadfcbb116

Change-Id: Ia2ac8507eea2b76cb83da099b727a8def719e772
2016-09-20 04:48:37 +00:00
Winson Chung
8d3cef887b Merge "Workaround for not showing previous tasks when time is set." into nyc-mr1-dev
am: 65383622b7

Change-Id: I5d12c52ddb2cea46834b432d2b4bc25ea2105fd9
2016-09-20 04:44:06 +00:00
Winson
71a61dce0e Workaround for not showing previous tasks when time is set.
am: a4fab41e8b

Change-Id: I6c9e293218f649dd4ab860b061af020d97b042d2
2016-09-20 04:44:02 +00:00
Adrian Roos
5c9c551668 Merge "Hold WakeLock while DreamService starts" into nyc-mr1-dev
am: f940aa3ea1

Change-Id: Id05685819dfa550431f25f65ba0bba030ff1f54f
2016-09-20 04:25:44 +00:00
Adrian Roos
5e18c826f3 Hold WakeLock while DreamService starts
am: 7445c0bb86

Change-Id: Ifbb5a3d392bf7222718eab306dc435ec569a3ae9
2016-09-20 04:25:38 +00:00
Svetoslav Ganov
1e33ed490f Merge "Add access tracker to renamed accounts" into nyc-mr1-dev
am: 85a93a0cc9

Change-Id: I90fa6299f263edce8b94852bc58f6f48522c7f78
2016-09-20 04:16:55 +00:00
Svetoslav Ganov
3efa214606 Add access tracker to renamed accounts
am: b9f84fb6f4

Change-Id: I3ab01b658a85fc828665abc56a5f10c0228de28e
2016-09-20 04:16:52 +00:00
Chao Chen
4d4a61f2cd Merge "In AccessibilityGestureDetector.clear(), dispatch a MotionEvent.ACTION_CLEAR event to mGestureDetector to cancel the ongoing gesture." into nyc-mr1-dev
am: 944dc5a40e

Change-Id: I58830897c49bfb11371390590fdd2b68fda69ecc
2016-09-20 04:12:06 +00:00
chchao
60948808a8 In AccessibilityGestureDetector.clear(), dispatch a MotionEvent.ACTION_CLEAR event to mGestureDetector to cancel the ongoing gesture.
am: 37ee5c796e

Change-Id: I0f76484c70e08435494f9e9ff1223082c9a3ceac
2016-09-20 04:12:02 +00:00
Sudheer Shanka
dedfa06a62 Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b am: 91064a0ed3
am: 729759f8c9

Change-Id: Ib6e8748b5c55a2a4b13806cf8439789fa2744a90
2016-09-20 03:27:48 +00:00
Sudheer Shanka
be9002a86d Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf" into nyc-mr1-dev
am: 8402a17417

Change-Id: Ia085a05cebbc91edb0467edef72afa08c83287c4
2016-09-20 03:20:20 +00:00
Sudheer Shanka
911f86e817 Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf
am: b4ecfb9df1

Change-Id: I5f544bbba63ff7176db49b689cfa1794a512767b
2016-09-20 03:20:17 +00:00
Amith Yamasani
2e70f62f0a Merge "Fix reporting of network connectivity when parole changes" into nyc-mr1-dev
am: 4bbca649fc

Change-Id: Ide96bd6761c170e1b3c004fac92a11e932e70ff7
2016-09-20 02:23:37 +00:00
Sudheer Shanka
bac21c0a99 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e
am: 1701a25584

Change-Id: I9519be12a3e3a9d8742f9d1fa715fc1307dfd5cf
2016-09-20 01:44:57 +00:00
Kevin Hufnagle
5505296760 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
2016-09-20 01:37:57 +00:00
Sudheer Shanka
1701a25584 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
am: 7f99a18e0e

Change-Id: Ic6e91076e979291bfcbc87bc2e8d71ddd4c700de
2016-09-20 00:59:58 +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
Amith Yamasani
94a3a21bf7 Fix reporting of network connectivity when parole changes
am: 0938f2fa98

Change-Id: I8c3326a4afeeb3cc8d22d846518a866ee3fad3e5
2016-09-20 00:14:04 +00:00
Sudheer Shanka
7f99a18e0e DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416
am: 6f170618ff  -s ours

Change-Id: I862c56f9db4ac9161dc155dc9f469909e30b0c61
2016-09-20 00:13:19 +00:00
Kevin Hufnagle
aadfcbb116 docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide am: 49ed3eb8bc
am: cfd0951877

Change-Id: Ie07affe1aab108237c1010696415d6d72e66166b
2016-09-20 00:12:00 +00: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
Eric Schmidt
849d4b2464 Merge "docs: Fixed language directory issue localization" into nyc-dev am: 52fd8f88e1 am: 357b9d9816
am: 3652ae7d6d

Change-Id: Ie84b95b14a41f043bd6b3d979abcb0f9a165f322
2016-09-19 23:26:55 +00:00
Kevin Hufnagle
6b4e509c25 Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
am: c60146d808

Change-Id: I9dbf37975dc1aace9711df58f590e2ed049c60ed
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

Change-Id: Ibb3c02e96183f8db5196292f413ad0955ca547fb
2016-09-19 23:25:34 +00:00
Sudheer Shanka
6f170618ff DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6
am: f4844b3416

Change-Id: Ic9c96ac3d030ebb0ac53a48686b541a0182795cb
2016-09-19 23:23:01 +00:00
TreeHugger Robot
728ebf1ad8 Merge "Make VrManager service optional." into cw-f-dev 2016-09-19 23:07:06 +00:00
Adrian Roos
f940aa3ea1 Merge "Hold WakeLock while DreamService starts" into nyc-mr1-dev 2016-09-19 22:47:30 +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
Wei Liu
ef89d21a1b Make VrManager service optional.
b/31244699

Change-Id: I7d276e6945f19b575f880df16f140b84b03052a9
2016-09-19 15:18:53 -07: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
Julia Reynolds
f1476d9189 Merge "Null check action cloning." into nyc-mr1-dev
am: d0f20c2bbd

Change-Id: I4f966ac751eea4ae6f49cf47b0f26e6ec17c40a8
2016-09-19 22:15:32 +00:00
Julia Reynolds
f459b5ee8a Null check action cloning.
am: 53c934cb75

Change-Id: I8cfdd960327c517df28eb7b00a8edac330f6b32f
2016-09-19 22:15:29 +00:00
Svetoslav Ganov
85a93a0cc9 Merge "Add access tracker to renamed accounts" into nyc-mr1-dev 2016-09-19 22:15:18 +00:00
Eric Schmidt
0c2d51c098 docs: Fixed language directory issue localization am: 8350cbf824 am: 6be384bcf3
am: 4b7c8d0c6b

Change-Id: I7f71093af144ceeb8a842efb14c2a0e7f9e5d22a
2016-09-19 22:05:58 +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
729759f8c9 Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b
am: 91064a0ed3

Change-Id: I70b73f8783c338a9b98a70c23f354352606adc14
2016-09-19 21:50:33 +00: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

Change-Id: I22ce07b7b273cef869ddcebee029c15316ec9c1c
2016-09-19 21:03:18 +00:00
Sudheer Shanka
f4844b3416 DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b
am: 2f44f906a6

Change-Id: I389ab319b133296296f3e7fe6aa44b9f208748bd
2016-09-19 21:03:16 +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
Eric Schmidt
3652ae7d6d Merge "docs: Fixed language directory issue localization" into nyc-dev am: 52fd8f88e1
am: 357b9d9816

Change-Id: I3b72750294d722eba9d6403011c1b43a1e25a5b3
2016-09-19 20:47:40 +00:00
Sudheer Shanka
91064a0ed3 Merge "Fix deadlock in AcitivityManagerService." into nyc-dev
am: e70ebd694b

Change-Id: I95bfe3e8ae3508f5c4696165320738e896a90405
2016-09-19 20:45:54 +00:00
Sudheer Shanka
44c9e2f4bf Fix deadlock in AcitivityManagerService.
am: 67e05b4d28

Change-Id: I3dd3a1eb43bb3da17ff13a41c1b847b51f6701d6
2016-09-19 20:45:49 +00:00