drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
272,587 Commits 1 Branch 0 Tags
Commit Graph

272587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
78e81ce277 Fix potential NPE in RemoteConnection. am: 9c2c583ad7 
am: 16a2464291

Change-Id: I09c0719a180c58eb690f2eebffb65aa79d0e9f87
 2016-09-21 20:11:29 +00:00
Tyler Gunn
16a2464291 Fix potential NPE in RemoteConnection. 
am: 9c2c583ad7

Change-Id: I12d99b4c374da49c051285db3c5b1a4652db6241
 2016-09-21 20:03:22 +00:00
Andre Eisenbach
d202664314 Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3 am: 9271f57c34 
am: 4ceb8fe4b1

Change-Id: I787be32af00a25c5a22e4e8fa6f7f57d34f48da1
 2016-09-21 18:00:57 +00:00
Andre Eisenbach
4ceb8fe4b1 Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3 
am: 9271f57c34

Change-Id: I3c66beb4f502d967992b2b2070fcb1068744edc5
 2016-09-21 17:55:24 +00:00
Andre Eisenbach
9271f57c34 Merge "Protect REFRESH_BATCHED_SCAN broadcast" 
am: 6eb62f8ee3

Change-Id: I013391d9b75b6a968f5c7c449ce7cac0501448f4
 2016-09-21 17:49:45 +00:00
Andre Eisenbach
6eb62f8ee3 Merge "Protect REFRESH_BATCHED_SCAN broadcast" 2016-09-21 17:38:48 +00:00
Ajay Panicker
707b68c426 Protect REFRESH_BATCHED_SCAN broadcast 
Bug: 29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit 58dd0cd65e7ac9ca0c9ccbf42087baf2df751c61)
 2016-09-21 17:38:08 +00:00
Neil Fuller
025813ad65 Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d am: 3fa8bc066b 
am: 8ed37211bd

Change-Id: I4771be30b206c9f36e5127608c0f27d5bfb6b0ae
 2016-09-21 16:46:25 +00:00
Fan Zhang
57b79a27f7 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 am: 9c4561370d am: 9096780031 
am: 1c49ec372b

Change-Id: I38d7255f965de9a10726aaa04078a5ae4b061421
 2016-09-21 16:36:25 +00:00
Fan Zhang
89b07471e3 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c am: 05df69d52a am: 20370bb9b1 
am: 32edfcd626

Change-Id: I06a590cb7bfef1e39a48d2f9e2e2d4f2b6643920
 2016-09-21 16:35:29 +00:00
Neil Fuller
8ed37211bd Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d 
am: 3fa8bc066b

Change-Id: I4931c55a7390f2d186821f1f734af1f42a0a9798
 2016-09-21 16:28:46 +00:00
Fan Zhang
1c49ec372b Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 am: 9c4561370d 
am: 9096780031

Change-Id: Iddb1191aa59d0466754de8d6f12f9b31e7138985
 2016-09-21 16:27:53 +00:00
Fan Zhang
32edfcd626 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c am: 05df69d52a 
am: 20370bb9b1

Change-Id: I179d99b1025f41387f561745991683ad99034630
 2016-09-21 16:26:53 +00:00
Neil Fuller
3fa8bc066b Merge "Track API changes associated with AbstractMethod refactoring" 
am: 117ef7eb9d

Change-Id: Icceb5e5aa4ba12ac837b838e07d338a805f37614
 2016-09-21 16:18:36 +00:00
Fan Zhang
ccaa2fb862 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 
am: a2d2f7339b

Change-Id: I537519602248894ccb0b99dee4ec31c5a8ebfd8e
 2016-09-21 16:05:43 +00:00
Fan Zhang
9096780031 Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev am: 32bd448cc1 
am: 9c4561370d

Change-Id: I77194b8ef5f71f36020cf02c010d47dd07c12a93
 2016-09-21 16:05:28 +00:00
Neil Fuller
117ef7eb9d Merge "Track API changes associated with AbstractMethod refactoring" 2016-09-21 16:01:56 +00:00
Fan Zhang
23f10408d3 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c 
am: 3005c2f52a

Change-Id: Ie1b12189ac52ddc9358b08d39d354818e5f75c61
 2016-09-21 15:57:19 +00:00
Fan Zhang
20370bb9b1 Fix NPE for WifiConfiguration in AccessPoint. am: 51365c3b4c 
am: 05df69d52a

Change-Id: I963115016cae383f47e4dfbb262200b945fd3b0d
 2016-09-21 15:57:12 +00:00
Fan Zhang
a2d2f7339b Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev 
am: 32bd448cc1

Change-Id: I36857b40705fa91f80bfdff1843a9db7bcb382b1
 2016-09-21 15:38:27 +00:00
Fan Zhang
3005c2f52a Fix NPE for WifiConfiguration in AccessPoint. 
am: 51365c3b4c

Change-Id: I2b06936d69ae65910105dce9327df3920ebbcd60
 2016-09-21 15:38:22 +00:00
Fan Zhang
9c4561370d Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev 
am: 32bd448cc1

Change-Id: I11d2bdcbd0635510ae7a53574749404a96162773
 2016-09-21 15:38:12 +00:00
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