255075 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fan Zhang	3005c2f52a	Fix NPE for WifiConfiguration in AccessPoint. ... am: 51365c3b4c Change-Id: I2b06936d69ae65910105dce9327df3920ebbcd60	2016-09-21 15:38:22 +00:00
Fan Zhang	32bd448cc1	Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev	2016-09-21 15:29:59 +00:00
Neil Fuller	a70325bced	Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc ... am: 2d7008a71c Change-Id: I931f4f0f5d9be7b11725ab42f5eefcb2770d70b6	2016-09-21 11:58:27 +00:00
Neil Fuller	3243958460	Track API changes associated with AbstractMethod refactoring ... No actual API change. Bug: 28666126 Bug: 31052885 Test: make test-art-host and cts run of CtsLibcoreTestCases Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04	2016-09-21 12:57:41 +01:00
Neil Fuller	2d7008a71c	Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" ... am: 0acc91e4fc Change-Id: I5833ef112d1d9031a48b899723cc4f10703d062d	2016-09-21 11:52:17 +00:00
Neil Fuller	0acc91e4fc	Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"	2016-09-21 11:45:19 +00:00
Neil Fuller	3ead539c01	Tracking unhiding of java.lang.reflect.Parameter APIs ... Bug: 28666126 Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040	2016-09-21 09:21:10 +00:00
Michal Karpinski	16a33074d8	Merge "Rename the DnsEventListenerService to NetdEventListenerService" am: 1e3f586c10 ... am: e2f6138710 Change-Id: I001724d2145058df0b51e581855fd663f815c209	2016-09-21 08:47:59 +00:00
Michal Karpinski	e2f6138710	Merge "Rename the DnsEventListenerService to NetdEventListenerService" ... am: 1e3f586c10 Change-Id: Ie83aa7e6225a42c11c03eae45f593e74b94efc82	2016-09-21 08:39:42 +00:00
Michal Karpinski	1e3f586c10	Merge "Rename the DnsEventListenerService to NetdEventListenerService"	2016-09-21 08:34:39 +00:00
Michal Karpinski	cc6b37d9e2	Rename the DnsEventListenerService to NetdEventListenerService ... The service will be extended to include listening for connect events as well. Test: this is just a renaming change Bug: 29748723 Change-Id: I4e50e24d1bfb0b5ead4010cc7df3434d38b753d8	2016-09-21 16:17:26 +09:00
Ajay Panicker	0eb01572ee	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b am: a7176293fd am: e60aa74d44 -s ours ... am: e053061edd Change-Id: Idb4e7d7bbbfa5ba491a4e938dc2f20aa89e8fa87	2016-09-21 05:40:13 +00:00
Ajay Panicker	e053061edd	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b am: a7176293fd ... am: e60aa74d44 -s ours Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf	2016-09-21 04:13:46 +00:00
Ajay Panicker	e60aa74d44	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac am: be2651bb6b ... am: a7176293fd Change-Id: I480a3e8cfc363570ecb10d5cca2b0e1a95472f51	2016-09-21 04:02:02 +00:00
Ajay Panicker	c061dcda05	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 am: bd752f7d88 -s ours ... am: da12b4b0f0 Change-Id: I2a86abe82aada0a2a965a8eebdecbd7d72d1a61c	2016-09-21 04:00:14 +00:00
Ajay Panicker	2828cb3246	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 am: 232824e01c -s ours ... am: 257cf16de3 Change-Id: Id2ba962d9bb6341fab608b8c19fe295c7bddaaa8	2016-09-21 03:52:52 +00:00
Ajay Panicker	eb431d8161	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a am: ec220f645f -s ours ... am: e460ea15e6 Change-Id: I13e1a58832d60fb8b89c8cc32f51de3dc5e19210	2016-09-21 03:50:33 +00:00
Ajay Panicker	04ff2b888b	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 am: 3e238e3396 -s ours ... am: 998001b4b2 Change-Id: Idce49a38c881ce3b41e29e01665b1b0135bd76f5	2016-09-21 03:48:17 +00:00
Ajay Panicker	af280fb4c1	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a am: 93a622150f -s ours ... am: 834f982c97 Change-Id: Ied7524231b911717f832c226b5cda10c53275fb7	2016-09-21 03:45:35 +00:00
Ajay Panicker	a7176293fd	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours am: 3a20f7ceac ... am: be2651bb6b Change-Id: I7ffc9b61fbfe670a68049b94a05415abec38e36e	2016-09-21 03:44:15 +00:00
Ajay Panicker	da12b4b0f0	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 am: cdf3126615 ... am: bd752f7d88 -s ours Change-Id: I5657111479e2ac6df3f856c7a624421e37ec731d	2016-09-21 03:26:15 +00:00
Elliot Waite	2b5e6d1551	Merge "Fix some at links." into nyc-dev ... am: edc31f9593 Change-Id: I0a4fa551123a46f3de8323deca72f6582ecba33a	2016-09-21 03:26:01 +00:00
Elliot Waite	13145b6f9a	Fix some at links. ... am: 28d87163e1 Change-Id: Ibaa18eee9bf406eccda03e3b5425f72b8fb51037	2016-09-21 03:25:49 +00:00
Ajay Panicker	be2651bb6b	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 am: fe616288dc -s ours ... am: 3a20f7ceac Change-Id: I10c29e499b19e247dedc4e65b3d1d4bd42a7eb03	2016-09-21 03:23:38 +00:00
Ajay Panicker	257cf16de3	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d am: 853e39d3d9 ... am: 232824e01c -s ours Change-Id: Ic4636b08ecc94720c7b013769436668167b6fca8	2016-09-21 03:17:36 +00:00
Ajay Panicker	e460ea15e6	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 am: 13ac17ab3a ... am: ec220f645f -s ours Change-Id: If90aff1167803a965e938f9e174ec1df09401b85	2016-09-21 03:15:14 +00:00
Ajay Panicker	998001b4b2	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79 ... am: 3e238e3396 -s ours Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec	2016-09-21 03:13:20 +00:00
Ajay Panicker	bd752f7d88	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 am: dddb99f020 ... am: cdf3126615 Change-Id: I37fdf0eb48bd07dc07b8716040d2f286304bce70	2016-09-21 03:12:09 +00:00
Ajay Panicker	834f982c97	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 am: fc7822f58a ... am: 93a622150f -s ours Change-Id: If89cb759ef536ee618a3ab6121fde4e3dbc6dac3	2016-09-21 03:12:02 +00:00
Ajay Panicker	3a20f7ceac	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 am: 95b604ccb5 ... am: fe616288dc -s ours Change-Id: I858b0c0f7d1b9e723857169bd7f29a55d82e0136	2016-09-21 03:10:15 +00:00
Ajay Panicker	cdf3126615	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours am: 6b16f71975 ... am: dddb99f020 Change-Id: Ie45bd66830e6e3e68be7e3f2692911ea4fa82fa9	2016-09-21 02:56:53 +00:00
Ajay Panicker	fe616288dc	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev am: 60bf672485 ... am: 95b604ccb5 Change-Id: I78d80c17e2b7a0b6d0d611f738a3b880dd74dab0	2016-09-21 02:55:36 +00:00
Ajay Panicker	232824e01c	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 am: 3ed9e7693d ... am: 853e39d3d9 Change-Id: I1f1f4f44161525bb4ee7fbbcabdd5a6e346d3b8a	2016-09-21 02:54:19 +00:00
Ajay Panicker	ec220f645f	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 am: 1682f67177 ... am: 13ac17ab3a Change-Id: I495579b3cca396dd5fb6a628bedb5e5be4916b26	2016-09-21 02:40:31 +00:00
Ajay Panicker	3e238e3396	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa am: b2e8361c50 ... am: c147db7a79 Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6	2016-09-21 02:38:56 +00:00
Ajay Panicker	93a622150f	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e am: d46605ab09 ... am: fc7822f58a Change-Id: I7b744f3d3c5e816a1722b20bad66b924911b8a36	2016-09-21 02:37:38 +00:00
Ajay Panicker	dddb99f020	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 am: b2094f7c37 -s ours ... am: 6b16f71975 Change-Id: I2f7ec847c4d781a80e950c3ede965456163c90f9	2016-09-21 02:37:35 +00:00
Ajay Panicker	853e39d3d9	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours am: dcb78c9cf1 ... am: 3ed9e7693d Change-Id: Ie6c2f8cf182d0787ffc401800134f30fde903e3b	2016-09-21 02:35:59 +00:00
Ajay Panicker	13ac17ab3a	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours am: 0f464f9d77 ... am: 1682f67177 Change-Id: I75da25a30cc7be28b3a2d332fa5ca7fc18322dfc	2016-09-21 02:24:44 +00:00
Ajay Panicker	3ed9e7693d	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-dev am: 19b09dd0d3 -s ours am: 5977c8b5bc am: cdff42091b am: 9a66565324 -s ours ... am: dcb78c9cf1 Change-Id: I196204c683a0eacbe08103b383dcd9cb1435a43d	2016-09-21 02:24:08 +00:00
Ajay Panicker	c147db7a79	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours am: 2ef2d90eaa ... am: b2e8361c50 Change-Id: I679522909e4498442cb2e227ac0b7c45fbc47ebf	2016-09-21 02:23:37 +00:00
Ajay Panicker	95b604ccb5	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into lmp-mr1-dev ... am: 60bf672485 Change-Id: Iba3b6ff14fdab510e1e0c8fae7298be290e93bf1	2016-09-21 02:22:08 +00:00
Ajay Panicker	fc7822f58a	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours am: afafdff50e ... am: d46605ab09 Change-Id: Icc3905c1133d4ed3b3ea40f95bde021933adcd02	2016-09-21 02:21:15 +00:00
Elliot Waite	edc31f9593	Merge "Fix some at links." into nyc-dev	2016-09-21 02:15:17 +00:00
Ajay Panicker	6b16f71975	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 am: cc4fd13113 ... am: b2094f7c37 -s ours Change-Id: I202fe25cf207a5063f897d13617fc0a03fe2ca83	2016-09-21 02:09:09 +00:00
Ajay Panicker	1682f67177	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: 0ea21bc70e -s ours am: 050b9170db am: b367200be4 am: ef74f3b079 -s ours ... am: 0f464f9d77 Change-Id: I0c7d7db1dcc585477d5f7841137b5603270eabe6	2016-09-21 02:03:46 +00:00
Ajay Panicker	b2e8361c50	Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f -s ours am: 4f77ca16e4 -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349 -s ours ... am: 2ef2d90eaa Change-Id: Iff03e10920f3d42246b7b7e2c172ac30b3beaccb	2016-09-21 02:02:47 +00:00
Marie Janssen	7e593bdf0d	Merge "Fix setPairingConfirmation permissions issue (2/2)" into mnc-dev am: 22046e7323 am: e4f60787f3 am: ce8032ebbb am: 0ed17e5c8d ... am: 9013d67f0c Change-Id: Iad8274630b38aa53c565e4229dfcb1904593fdd1	2016-09-21 02:02:04 +00:00
Ajay Panicker	d46605ab09	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5 am: 3758253ae8 -s ours am: cb970f408e -s ours am: fafa73a8ac am: 0639d05e55 am: a701b1b6f6 -s ours ... am: afafdff50e Change-Id: I33b393b32af485c4bb96d723a44e24d1acefaadc	2016-09-21 02:01:38 +00:00
Ajay Panicker	b2094f7c37	[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: bb9b38b957 ... am: cc4fd13113 Change-Id: I0b99176d0bc750dd824f0cd7b9663c87a6424143	2016-09-21 02:00:25 +00:00