Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,484 Commits 3 Branches 0 Tags
fb19d8d7c142aae0aaa9782db145fee072071fbf
Commit Graph

277484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Zhang
05df69d52a Fix NPE for WifiConfiguration in AccessPoint. 
am: 51365c3b4c

Change-Id: I7d653816e70f38f0cce3a6bc8f0eaade8593866a
 2016-09-21 15:38:08 +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
f2fb7521ab Merge "Tracking unhiding of java.lang.reflect.Parameter APIs" am: 0acc91e4fc am: 2d7008a71c 
am: a70325bced

Change-Id: If4fbdf31e9b6c2cf418acb67866fb4096f1a0049
 2016-09-21 12:03:29 +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
Lorenzo Colitti
3705d91dcc Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev am: 4813790d95 am: 488ca21f0a 
am: ac66b6bd0a

Change-Id: I4cab05a13a1713cb0dbf2bbdbe0aed49101d1309
 2016-09-21 10:03:36 +00:00
Lorenzo Colitti
60892e558a Rematch wifi networks when the avoid bad wifi setting changes. am: 836d8788a8 am: caf1f0bf0e 
am: e913dded2b

Change-Id: Id45ac22c3070de67fb3455c6d8a3c44d22388ff6
 2016-09-21 09:57:56 +00:00
Robin Lee
0c52e556b4 Merge "Merge commit '16a33074d8e38cf3d082c68e972a0e12fb2ad09f' into manual_merge_16a3307" into nyc-mr1-dev-plus-aosp 2016-09-21 09:53:59 +00:00
Lorenzo Colitti
ac66b6bd0a Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev am: 4813790d95 
am: 488ca21f0a

Change-Id: I5284a99c478a77187ce0e115b07248d89e6886a6
 2016-09-21 09:53:25 +00:00
Lorenzo Colitti
e913dded2b Rematch wifi networks when the avoid bad wifi setting changes. am: 836d8788a8 
am: caf1f0bf0e

Change-Id: I6d5fca7707fdc26c953df626c7eddc3f108b949c
 2016-09-21 09:52:30 +00:00
Michal Karpinski
d82fccd368 Rename DnsEventListenerServiceTest to NetdEventListenerServiceTest 
Change-Id: I67e645306444938a4675e91a9db5d716c0bd4881
 2016-09-21 18:48:57 +09:00
Lorenzo Colitti
488ca21f0a Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev 
am: 4813790d95

Change-Id: I1cacc2f888f429932b6506c9e9d216f2a502e354
 2016-09-21 09:47:33 +00:00
Lorenzo Colitti
caf1f0bf0e Rematch wifi networks when the avoid bad wifi setting changes. 
am: 836d8788a8

Change-Id: I589cfdb8792997fe94d22c551c8a53e48e45db1a
 2016-09-21 09:47:28 +00:00
Lorenzo Colitti
4813790d95 Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev 2016-09-21 09:42:08 +00:00
Michal Karpinski
7e1cdbe1fd Merge commit '16a33074d8e38cf3d082c68e972a0e12fb2ad09f' into manual_merge_16a3307 
Change-Id: I0d98f0b7f1bd23c00eaa73ff0a48c75cf8f11199
 2016-09-21 18:29:17 +09: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
bd4ee6e96c 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 am: 6ac86ae1db am: 9030016e5f 
am: d840ae0ffc

Change-Id: I2e982d5680c0d167108b9d3c51e350af27d12d0b
 2016-09-21 06:40:38 +00:00
Ajay Panicker
d840ae0ffc 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 am: 6ac86ae1db 
am: 9030016e5f

Change-Id: I795156bf2fba87dc1969ac60c2fc0225165d8c90
 2016-09-21 06:35:05 +00:00
Ajay Panicker
f422d3d9d5 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 
am: 0eb01572ee

Change-Id: Ic7d6f9255bb4ad82cf423687570d8f97af7dd74b
 2016-09-21 06:22:55 +00:00
Android Build Merger (Role)
680c1388e6 Merge "[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 am: 71831be462 am: 89024c7477 am: d460de187e" into nyc-mr1-dev-plus-aosp 2016-09-21 06:13:18 +00:00
Ajay Panicker
4a7edb8363 [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 am: 71831be462 am: 89024c7477 
am: d460de187e

Change-Id: I1cd15bbe0dc6005e80ac86aa5d01d01b242b8e52
 2016-09-21 06:11:59 +00:00
Android Build Merger (Role)
102578f0d5 Merge "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 am: c96f655395 am: 4a496b0810 am: 03ff2e19cb" into nyc-mr1-dev-plus-aosp 2016-09-21 06:11:39 +00:00
Ajay Panicker
2142fd2b13 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 am: c96f655395 am: 4a496b0810 
am: 03ff2e19cb

Change-Id: I64e383f28438becd8be42a51913f40b1649bdf96
 2016-09-21 06:11:00 +00:00
Lorenzo Colitti
836d8788a8 Rematch wifi networks when the avoid bad wifi setting changes. 
Currently, when the avoid bad wifi setting changes, we rematch
all networks and requests, but do not update any NetworkFactories
with new scores. This means that if a wifi network's score goes
down as a result of enabling bad wifi avoidance, we will not look
for another network (e.g., cell data) to satisfy its requests.

This makes it so that when the user enables avoiding bad wifi,
we will attempt to bring up cell data will if it is not already
connected.

Bug: 31075769
Change-Id: Ie5b685be8676999adea8c9ecbbc1abb92f81a74f
 2016-09-21 15:10:14 +09:00
Ajay Panicker
3227fc31d6 [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 
am: c061dcda05

Change-Id: I213de9a0eda5b374833557d4aed2c1b9184a6a15
 2016-09-21 06:09:47 +00:00
Ajay Panicker
d460de187e [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 am: 71831be462 
am: 89024c7477

Change-Id: I0c48d8983c1b35f406e9fbe15dcc3b8f650bef5f
 2016-09-21 06:04:40 +00:00
Ajay Panicker
03ff2e19cb 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 am: c96f655395 
am: 4a496b0810

Change-Id: I3386d471bc4c242fb769e1f20ff7755281434ed3
 2016-09-21 06:03:44 +00:00
Ajay Panicker
9030016e5f 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 
am: 6ac86ae1db

Change-Id: I3d6994fffb88ca8ba49cb3efa321493661ab33d2
 2016-09-21 05:43:52 +00:00
Ajay Panicker
f32de5554a [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 am: b9cfbef8db am: 7b11b2deff 
am: d58a9e684c

Change-Id: I3c88f4154732f3ed7c32ff102425809dbf0213b4
 2016-09-21 05:42:24 +00:00
Ajay Panicker
89024c7477 [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 
am: 71831be462

Change-Id: I83dc1f6eee420b9aa655f32e70f5a5c618bd552d
 2016-09-21 05:41:26 +00: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
69f1a6e02b 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 am: d9421e7758 am: 48f906c852 
am: 1752ec7e01

Change-Id: Idccb00ef60e713ddeb681f407133f5936186c8f1
 2016-09-21 05:40:03 +00:00
Ajay Panicker
4a496b0810 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 
am: c96f655395

Change-Id: I844fa87398b64854c7655d43339887ea2a7a56ee
 2016-09-21 05:40:01 +00:00
Ajay Panicker
5d4ac106de [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 am: 51c046dae8 am: a33da80306 
am: f64b5f0fc8

Change-Id: If177838a329d61646a6a6f0548b2e33246f9961b
 2016-09-21 05:37:27 +00:00
Elliot Waite
91eec08b09 Merge "Fix some at links." into nyc-dev am: edc31f9593 am: 7072b952c8 am: 00be401c1d 
am: dd7dc1fdfe

Change-Id: Ibba63021169cae7b5cfda75d6e3f9f270f67dcd4
 2016-09-21 05:30:47 +00:00
Elliot Waite
58d582fe75 Fix some at links. am: 28d87163e1 am: f3bbfdaf9d am: 5c8bd2598d 
am: 4b332ffd9f

Change-Id: I1b885fe640837f390ca7a80ecafa0fa45f3bfc50
 2016-09-21 05:29:33 +00:00
Ajay Panicker
d58a9e684c [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 am: b9cfbef8db 
am: 7b11b2deff

Change-Id: Icf0963c53b5684f19a01f72608d8cf83756f32d4
 2016-09-21 05:25:30 +00:00
Ajay Panicker
1752ec7e01 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 am: d9421e7758 
am: 48f906c852

Change-Id: I098c0cdb31cf4ca5da368d57cdf67089fe8a0cf8
 2016-09-21 05:23:32 +00:00
Ajay Panicker
f64b5f0fc8 [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 am: 51c046dae8 
am: a33da80306

Change-Id: I930c52f0167d227766206a6e32712c214ed7855d
 2016-09-21 05:21:16 +00:00
Ajay Panicker
6ac86ae1db 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: I3b271244a7be75f7f652f8192ba337352d946462
 2016-09-21 05:06:53 +00:00
Ajay Panicker
2cba5847db 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 
am: 2828cb3246

Change-Id: Ied4e9ddfaf9893b62d7344ad5a46f5fc70597172
 2016-09-21 04:16:40 +00:00
Ajay Panicker
7b11b2deff [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 
am: b9cfbef8db

Change-Id: I5cd4c1be5362d2d0500afa29ffddc20a541e6ee5
 2016-09-21 04:16:27 +00:00
Ajay Panicker
80a1c68512 [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 
am: eb431d8161

Change-Id: I9fcf88e8003b1a3e116c70d9ec2930805c641f5c
 2016-09-21 04:14:31 +00:00
Ajay Panicker
71831be462 [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: I9cf2a8223db41299b5c4089437a0ff3cc14418e4
 2016-09-21 04:14:28 +00:00