Commit Graph

288811 Commits

Author SHA1 Message Date
Michael Wright
515bf17cd2 Track generics in API definition.
Bug: 24265043
Test: make
Change-Id: Ida05c3eeb069a1e8db02cf024cec11536636b68d
2016-09-26 15:20:17 +01:00
Etan Cohen
471227d547 Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131 am: 10132fb994
am: 60aad2a2ba

Change-Id: I0b58a49cb980fb799b1e69ccc8e672ed8745fb2c
2016-09-26 13:20:17 +00:00
Etan Cohen
60aad2a2ba Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131
am: 10132fb994

Change-Id: I0be79dd5b8d21a94fd6a40fd08d054ed30003a8b
2016-09-26 13:15:38 +00:00
Etan Cohen
b061d444ea [NAN] Remove failure reason codes from API per API review [DO NOT MERGE]
am: 4b47c3f5b8  -s ours

Change-Id: I1f279ebad6a8cbebb5e89762107d80b4e83e942c
2016-09-26 13:15:26 +00:00
Etan Cohen
10132fb994 Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a
am: a6c2aa4131

Change-Id: I2520b4d4f59b6e94c655c7769b6a02382eeae7ad
2016-09-26 13:11:02 +00:00
Kirill Grouchnikov
4b1983a379 Merge "Mark a hidden MotionEvent method to be visible for tests" 2016-09-26 13:07:14 +00:00
Etan Cohen
a6c2aa4131 Merge "[NAN] Reorder parameters of send message method(s) per API review"
am: 1dd012a41a

Change-Id: I6b32b5fde71753bed0a16250065551dc3f218f54
2016-09-26 13:06:05 +00:00
Etan Cohen
1dd012a41a Merge "[NAN] Reorder parameters of send message method(s) per API review" 2016-09-26 12:58:14 +00:00
Michal Karpinski
f53ed53db1 Fix naming of the service in NetdEventListenerServiceTest
am: 0d54a95b62

Change-Id: If4b50bf104dddcaf14fd6b138239cfc94967f389
2016-09-26 11:38:37 +00:00
Michal Karpinski
0d54a95b62 Fix naming of the service in NetdEventListenerServiceTest
Bug: 29748723
Change-Id: I285cb77fba824036df80a9ed2560ee95d1d1919c
(cherry picked from commit 4f26103fdd)
2016-09-26 10:43:56 +00:00
TreeHugger Robot
1bac1ab427 Merge "Fix naming of the service in NetdEventListenerServiceTest" 2016-09-26 10:41:27 +00:00
Nicolas Prévot
c2932692a0 Merge "Mention that setMasterVolumeMuted has no effect when set on a managed profile." 2016-09-26 10:22:59 +00:00
Narayan Kamath
5786162605 Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 am: c1d97c9250 am: 5e7dd0999e
am: c4108d2f24

Change-Id: Idcf4f8c41c1b83cd6d668ed6d9bc7d1d0c4e567a
2016-09-26 10:16:52 +00:00
Narayan Kamath
c4108d2f24 Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3 am: c1d97c9250
am: 5e7dd0999e

Change-Id: I45e2c290cbed1fcf917d54f6a50a60bfa7540f44
2016-09-26 10:11:57 +00:00
Narayan Kamath
5e7dd0999e Merge "Remove (now) unnecessary reference to core-lambda-stubs." am: 68e91852c3
am: c1d97c9250

Change-Id: I7eb80947c4a0170af7e6af4f878f3d15c8587949
2016-09-26 10:07:19 +00:00
Narayan Kamath
c1d97c9250 Merge "Remove (now) unnecessary reference to core-lambda-stubs."
am: 68e91852c3

Change-Id: I43ac61098a1dd8986385d61b702459c63e640c73
2016-09-26 10:02:48 +00:00
Treehugger Robot
68e91852c3 Merge "Remove (now) unnecessary reference to core-lambda-stubs." 2016-09-26 09:55:36 +00:00
Etan Cohen
cd607bf5e1 Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 am: c8f03c33df am: 3c94a1c56c
am: 7fa6ab7f9a

Change-Id: I0d4e3abc35213a0c8eae5a764e73d59e1b336596
2016-09-26 09:36:05 +00:00
Dimitry Ivanov
150ddfc6ca Merge "Add missing liblog dependency" am: 6a7c807d65 am: 247fe92207 am: be037cba4c
am: 01a1375cef

Change-Id: I3c86c770ac9477024a2fd70f60f1bba26553d80d
2016-09-26 09:32:16 +00:00
Adrian Roos
6419acf02d Merge "Show PLMN on CryptKeeper" into nyc-mr1-dev am: c3fddb984c am: c33c91ffd9
am: 3c228087d7

Change-Id: I80a7a2c7d58b1704580a8f6a6a5d11413eb6775f
2016-09-26 09:31:18 +00:00
Adrian Roos
8740e37939 Show PLMN on CryptKeeper am: 316bf54484 am: 3b09d5028c
am: 8249ef437c

Change-Id: Ifaa93b7d4772c46ecb4a301606f29acc2aa8139e
2016-09-26 09:30:25 +00:00
Vadim Tryshev
9b61bf29c3 Merge "Adding compatibility note for drag/drop in N." into nyc-mr1-dev am: 6b4a9f6d54 am: bb5985b9a5
am: 0931b0132c

Change-Id: I2f2419b657734fda7d4711e2591d32ba097d3e2f
2016-09-26 09:29:37 +00:00
Vadim Tryshev
75ce3c4a1b Adding compatibility note for drag/drop in N. am: 06b9b60c6d am: 360031a944
am: 68f8fe590f

Change-Id: Ie6c383dfa97521ca8ce3884cde41d2bcd489eeea
2016-09-26 09:28:38 +00:00
Daniel Nishi
55fe7c336b Merge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev am: 83479600cb am: 391ff5f898
am: d6ea8ba53a

Change-Id: I4b3a33d618529c2b8586c295dd4764ed6649219b
2016-09-26 09:19:54 +00:00
Daniel Nishi
eebe1dc1ba Add a hidden action to trigger the storage manager settings. am: 4bd88df1fb am: c5cd99dd09
am: 3ece845253

Change-Id: If8a37606379e8b8eb1bb575f4f7aa34320707127
2016-09-26 09:18:58 +00:00
Vadim Tryshev
b2537a2098 Merge "Update/correct Drag and Drop docs." into nyc-mr1-dev am: 1bc452b5a5 am: 9b8e25027b
am: 1b879a482f

Change-Id: I7fd0cc28c1c71dfda1093c4668b26906694e8edf
2016-09-26 09:16:59 +00:00
Vadim Tryshev
4a30e888da Update/correct Drag and Drop docs. am: c5109b3f6e am: db56a09d00
am: 066004d674

Change-Id: I01c06cb3a25bc4ef05675b56b45513b2d516d7cc
2016-09-26 09:15:58 +00:00
Mark Lu
0a24de9ee5 Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c am: f2f2d48a0e am: aaac8120d0 am: c230323d7a
am: 9132ca4e25

Change-Id: Id5d838ed71ecb0939cc7b33c86fac09c9edb52b6
2016-09-26 09:15:04 +00:00
Mark Lu
c50f42a674 docs: update javadoc description for View.setVisibility() method am: ae0459f532 am: 66192078c5 am: 357dfd039a am: cd980ffb7d
am: 0001115ea5

Change-Id: Ibba1ebd37f0d56d68f8bcbef55c1df9487b2e3f7
2016-09-26 09:13:58 +00:00
Mark Lu
affb554ea7 Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 83e283b22f am: 0b18f94cbc am: a29091a0eb
am: 577285dd35

Change-Id: I957dd148cf00be527e651a0208ad1a49c699157a
2016-09-26 09:13:06 +00:00
Mark Lu
0171afdb94 docs: update docs for uses-feature element am: b463a6db08 am: a6f0c7f99f am: 5344c7df8f am: 31490b407d
am: 929a107bc7

Change-Id: Ic2b6916860bb737f9f6aff444240cd7b47d49131
2016-09-26 09:12:03 +00:00
Mark Lu
e47c45f6d6 Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: f5eeb28a42 am: 362db8e6a5 am: 8db6b5cb2e
am: ae46311c98

Change-Id: I69eb88cce0f711f815d4d06858ebe6299b33cf2c
2016-09-26 09:11:01 +00:00
Mark Lu
ef5ebb5940 docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 544e899559 am: d1bb5fad4e am: 100c1ffe2a
am: 9020d2844c

Change-Id: I67fea21f8b37a30746f645e05376325ecfd23436
2016-09-26 09:10:04 +00:00
Adrian Roos
adf4089ca1 Merge "Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev am: 27eb169db0 am: 3217986886" into nyc-mr1-dev-plus-aosp
am: e835fe7755

Change-Id: I0821b721ab3ef090161e671ccd4a32d85739e315
2016-09-26 09:08:28 +00:00
Adrian Roos
da51e71f74 Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev am: 27eb169db0 am: 3217986886
am: 764f1eed03

Change-Id: I4114bff16fc7044593e79252fab723253f938759
2016-09-26 09:08:19 +00:00
Mark Lu
d77a047bbc Merge "Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c am: 92391ed7e2" into nyc-mr1-dev-plus-aosp
am: d79ad318c3

Change-Id: I5edf2c43abbcf3af0936c05eb9e02bc1da778c41
2016-09-26 09:06:53 +00:00
Mark Lu
bd628f9e1a Merge "docs: update javadoc description for View.setVisibility() method" into nyc-dev am: d91c303e6c am: 92391ed7e2
am: 0bb6f218a1

Change-Id: Ic89b626fe985d2cde308dc4739f8661ff7255300
2016-09-26 09:06:48 +00:00
Mark Lu
dd2dfcaae4 Merge "docs: update javadoc description for View.setVisibility() method am: ae0459f532 am: 56be5c1ae0" into nyc-mr1-dev-plus-aosp
am: d3eb743f56

Change-Id: I985d05e06e065ef3730d6b8724fa28c425d82001
2016-09-26 09:05:15 +00:00
Mark Lu
12e182a99e docs: update javadoc description for View.setVisibility() method am: ae0459f532 am: 56be5c1ae0
am: 41f36a5264

Change-Id: I107738e4c4322c8189aa84a94c3fca12c6980323
2016-09-26 09:05:12 +00:00
Mark Lu
e2aaee7e1e Merge "Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 229daadefc" into nyc-mr1-dev-plus-aosp
am: 83f6414527

Change-Id: If538a3635fa08e0e4c7bed936d51207bf36562e7
2016-09-26 09:03:46 +00:00
Mark Lu
6e3b752302 Merge "docs: update docs for uses-feature element" into nyc-dev am: dc24613bf3 am: 229daadefc
am: b7ca62e1bf

Change-Id: I72c45cdcdee9ee0f278aade9ef97da06236fc6a2
2016-09-26 09:03:40 +00:00
Mark Lu
af4632df0c Merge "docs: update docs for uses-feature element am: b463a6db08 am: 1beb4c4cc3" into nyc-mr1-dev-plus-aosp
am: 5f2585ce80

Change-Id: Ic33cb07f7223b8be976ae128f52ac59c215da966
2016-09-26 09:02:11 +00:00
Mark Lu
88e706a155 docs: update docs for uses-feature element am: b463a6db08 am: 1beb4c4cc3
am: 3ed2e79292

Change-Id: Icac8f7e1776b4a252448196f8262231a89946ffb
2016-09-26 09:02:06 +00:00
Mark Lu
41aa3c6651 Merge "Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: 5a418d40ba" into nyc-mr1-dev-plus-aosp
am: a154cba6e6

Change-Id: I166ecce6f746c8d799141d92a0cec73c3557f22e
2016-09-26 09:00:45 +00:00
Mark Lu
e0a7f350ef Merge "docs: Add param info to TextView.setTextColor" into nyc-dev am: 7df8927691 am: 5a418d40ba
am: a199bf4f88

Change-Id: Ie492ab2fb39069745b8f48fc682c227b22a6c81e
2016-09-26 09:00:40 +00:00
Adrian Roos
449c5f2c68 Merge "Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6" into nyc-mr1-dev-plus-aosp
am: e055d54715

Change-Id: I736ae286248e63eac5f3aa273bfea022810f7db7
2016-09-26 08:59:16 +00:00
Adrian Roos
35afe2d8de Fix wake lock logic during Dream startup am: 9ede1d2602 am: 042c2349c6
am: 4ffff73947

Change-Id: If3c1dd67f402bc549cad76e5072817a1d1104463
2016-09-26 08:59:08 +00:00
Mark Lu
efc86a0b81 Merge "docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 5080a2c5e1" into nyc-mr1-dev-plus-aosp
am: 69ed95d1a3

Change-Id: I779e32a973ff50b505e6d0e73ca2ae59bbfb41b4
2016-09-26 08:57:46 +00:00
Mark Lu
d9576c7945 docs: Add param info to TextView.setTextColor am: 193879a8b6 am: 5080a2c5e1
am: 7bfb1e7f46

Change-Id: I434c524c07559b848f2ffe1e9d56237a5e5a686b
2016-09-26 08:57:40 +00:00
Mark Lu
9cb7445962 Merge "docs: Mention SwitchCompat in Switch and toggle documentation" into nyc-dev am: c6a1076e40 am: 95ca35f4ff am: 824fc38439 am: d1cd0a23d2
am: 430e8edd64

Change-Id: Ib633f977d568d8b6a7eab87b6c533bfcb704b7de
2016-09-26 08:56:36 +00:00