The Android Open Source Project
|
a33592c387
|
[automerger skipped] am 9bd03ece: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: 6fc25cfd15 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I3e7b2076fdf65935e37cc9af623022d926fd1a47
|
2021-05-31 06:21:20 +00:00 |
|
Wink Saville
|
ff2efcc2d8
|
am 7d8ad734: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev am: c137d87017
Original change: undetermined
Change-Id: Ic551594fb25e12ad1e6f60fac133bcd811b31d95
|
2021-05-31 06:21:07 +00:00 |
|
The Android Open Source Project
|
3d1d067a08
|
[automerger skipped] am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge am: 5c0dd380d0 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I9c5077481945f8d7fcc034399d64676310206e55
|
2021-05-31 06:18:57 +00:00 |
|
The Android Open Source Project
|
41f367116d
|
[automerger skipped] am d25b6b73: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge am: 013df9a0a7 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ibd7f7e9173948e2fec1357efb978dcb05450503e
|
2021-05-31 06:18:49 +00:00 |
|
Wink Saville
|
f5aa1759c4
|
am ef5c31ae: am db011499: am 753d754c: Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into jb-mr2-dev am: b72702da1f
Original change: undetermined
Change-Id: I1da8d500af399d7d947768c2f80ce96bd62de230
|
2021-05-31 06:18:40 +00:00 |
|
Wink Saville
|
6aee687710
|
Merge commit '68513498' into fix-merge-conflict am: 2e63bb7ef5
Original change: undetermined
Change-Id: If2b9f04d2bd5a0cb24a6a63f875e19c08aa17470
|
2021-05-31 06:18:27 +00:00 |
|
Lorenzo Colitti
|
afdd755504
|
464xlat: use a gatewayed route, not point-to-point am: 25f5af234f
Original change: undetermined
Change-Id: Ia53eb50f6b52abd5a1c3dde8de87883feea9310d
|
2021-05-31 06:18:13 +00:00 |
|
John Spurlock
|
ca1f3c5205
|
Move battery stats call from SystemUI to system server. am: 4ba7e413e7
Original change: undetermined
Change-Id: I5d7d56379154c2e1a5b05c60a494515bafcd5ebe
|
2021-05-31 06:18:00 +00:00 |
|
Jeff Sharkey
|
6cff4bbde8
|
Explicit locale when formatting machine strings. am: cf6e4d80e8
Original change: undetermined
Change-Id: I440be4a7292fc6001c41338b8c310e5eaf653c9b
|
2021-05-31 06:17:46 +00:00 |
|
Jeff Sharkey
|
a927525c3e
|
Accumulate network statistics based on deltas. am: e9bda1dd68
Original change: undetermined
Change-Id: I083ce7b00e544ee3295b895ba22f52fc9d84160b
|
2021-05-31 06:17:33 +00:00 |
|
Andreas Huber
|
7aa9add892
|
Merge "Fix parsing of global:http_proxy value." am: 36b169250b
Original change: undetermined
Change-Id: I09b7aa410c9d05d3b2688f08a5e4041d7e5a3c7c
|
2021-05-31 06:17:20 +00:00 |
|
The Android Open Source Project
|
215672c3f1
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: fb878f87a7 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I456d9868cfada42bc68ad2d1617924f5e8956423
|
2021-05-31 06:16:58 +00:00 |
|
The Android Open Source Project
|
0a69105a4e
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: 4edec272e4 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Id704e68bb4fdd458a2f9068b8f8d12c1c63e8ae6
|
2021-05-31 06:16:50 +00:00 |
|
Robert Greenwalt
|
63777c6540
|
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev am: 3a004ee4a0
Original change: undetermined
Change-Id: I8f07781b0dc4658c4779439a6c8718d6cf458a45
|
2021-05-31 06:16:41 +00:00 |
|
The Android Open Source Project
|
ed176483c3
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: b2aa01c0dc -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ia408e33bff21dd667114c26d6bf1ae0bce3b14c2
|
2021-05-31 06:16:28 +00:00 |
|
Wink Saville
|
a30e89a482
|
am d292caf4: Merge "Support WiFi only device at runtime." into jb-mr2-dev am: 7d72bf5622
Original change: undetermined
Change-Id: I620b1b28e0766904d4b629918f6a7d72307a9985
|
2021-05-31 06:16:20 +00:00 |
|
Robert Greenwalt
|
94a5246b80
|
am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev am: 7a8f0658c6
Original change: undetermined
Change-Id: I429a400cfff8b6ed51db23b1cf72cdd4856903dc
|
2021-05-31 06:16:07 +00:00 |
|
Robert Greenwalt
|
2867672999
|
am a07f1f2d: Remove STOPSHIP and defer removal. am: f95bfb1fa5
Original change: undetermined
Change-Id: I1173d88598b9dbe25fa630d04b0d13761c76dd7c
|
2021-05-31 06:15:53 +00:00 |
|
The Android Open Source Project
|
9593be7e3b
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: 7174487090 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I70b154654605b7490cc05b931ff537c849b4dffc
|
2021-05-31 06:15:40 +00:00 |
|
Robert Greenwalt
|
a8c113def7
|
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev am: 46976c9027
Original change: undetermined
Change-Id: Ib525b99399b015c0ec98422daf2c50e86b350c58
|
2021-05-31 06:15:31 +00:00 |
|
Robert Greenwalt
|
029def1a58
|
am 10572edb: Merge "Routing workaround." into jb-mr2-dev am: 44bdc908ca
Original change: undetermined
Change-Id: I7912b19f844b5c8da8df8b534a250f8c19736e76
|
2021-05-31 06:15:17 +00:00 |
|
Robert Greenwalt
|
974e41ded8
|
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev am: c5976600f8
Original change: undetermined
Change-Id: I930ecb2320b1e50707282371b0eacdf60d6e9833
|
2021-05-31 06:15:04 +00:00 |
|
The Android Open Source Project
|
84f5bb9480
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: c680df2b0b -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ie172aaaf19995dcd75df9ca032869c6625d7100f
|
2021-05-31 06:14:52 +00:00 |
|
Robert Greenwalt
|
1a71027fbc
|
am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev am: 215018f6e2
Original change: undetermined
Change-Id: I9b570cddaa33b95b0f2ba6ab953164cd73de34bc
|
2021-05-31 06:14:41 +00:00 |
|
The Android Open Source Project
|
c2c7341061
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: ebff3ebaba -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I476ec54f852e69a622c923418e3274dda7cbf945
|
2021-05-31 06:14:29 +00:00 |
|
Lorenzo Colitti
|
4d963b44a9
|
am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev am: 79f58996c5
Original change: undetermined
Change-Id: I388ad232ad8fd1e98255cead8358d1636c2de9e6
|
2021-05-31 06:14:20 +00:00 |
|
The Android Open Source Project
|
a1c2573efa
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: 02af5ba496 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I64336217b527eea81bf3bf9948309a66172e9486
|
2021-05-31 06:14:07 +00:00 |
|
The Android Open Source Project
|
19fc9ac102
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: 9b48b90c6f -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Icdcb1164313506c73c4a2cec349bf94675d10f59
|
2021-05-31 06:13:58 +00:00 |
|
Lorenzo Colitti
|
a13720be8d
|
am d40130ab: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev am: 76fcb627ae
Original change: undetermined
Change-Id: I352856ed9b078cb01b621a8ebd48db70de11d487
|
2021-05-31 06:13:49 +00:00 |
|
Robert Greenwalt
|
32877f571b
|
am 2e3f7f04: Merge "Add BT - DataTracker connection" into jb-mr2-dev am: baee17e854
Original change: undetermined
Change-Id: I49464909406a15c721cdb617c935a6c963b0c3ea
|
2021-05-31 06:13:34 +00:00 |
|
Wink Saville
|
c4fc0db221
|
am f98a515f: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev am: 157e5bf119
Original change: undetermined
Change-Id: I6590a56c4782645cda831b143fe523866c7a56ad
|
2021-05-31 06:13:21 +00:00 |
|
Lorenzo Colitti
|
9aeb1e2b50
|
am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev am: faac152a2d
Original change: undetermined
Change-Id: Ia5a61337c20f52ea5e0cd2b20cb52a87f74b971c
|
2021-05-31 06:13:08 +00:00 |
|
The Android Open Source Project
|
4baad9b65f
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: a4712d353f -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I21a6877a17a0dca179e8addc324e7f75396693ba
|
2021-05-31 06:12:55 +00:00 |
|
Robert Greenwalt
|
68f4d9375f
|
am e1b73b79: Prevent NPE in new API. am: f92734e168
Original change: undetermined
Change-Id: Ifc08981965885104ccc7a4d29acea5b67c44e3fa
|
2021-05-31 06:12:46 +00:00 |
|
Lorenzo Colitti
|
0e53732896
|
am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev am: 97f2e96382
Original change: undetermined
Change-Id: Idc4a1e42711c63be0fb6496ed8f15db77d32d99d
|
2021-05-31 06:12:32 +00:00 |
|
The Android Automerger
|
f2e200fb46
|
merge in jb-mr2-release history after reset to jb-mr2-dev am: 095035b66a
Original change: undetermined
Change-Id: I8ab1d268ecfd3271cde599b49630b4ae4d566cc0
|
2021-05-31 06:12:19 +00:00 |
|
Lorenzo Colitti
|
3c10be9588
|
Merge "Framework changes for 464xlat." into jb-mr2-dev am: 82217ba580
Original change: undetermined
Change-Id: Ia9f0ace07f42fa25b11be01270514ef340b59a07
|
2021-05-31 06:12:04 +00:00 |
|
Robert Greenwalt
|
db69f970b7
|
Revert of Ifd0c4081a. Turning off logging. am: fa4e867061
Original change: undetermined
Change-Id: I460abf0ea9f2e570b0ea70d078828107fbd02590
|
2021-05-31 06:11:42 +00:00 |
|
Robert Greenwalt
|
3db8cac025
|
Don't return an unmod collection. am: 26ce4b57d5
Original change: undetermined
Change-Id: I196bc866530fa36229bd0be249eba725f46d192a
|
2021-05-31 06:11:27 +00:00 |
|
Lorenzo Colitti
|
c2f0534221
|
Merge "Don't update routes if Dhcp fails." into jb-mr2-dev am: 2d17281ca7
Original change: undetermined
Change-Id: I1a0a1673c297a7b277cb5c129fdb273145a889a6
|
2021-05-31 06:11:14 +00:00 |
|
Lorenzo Colitti
|
15c203341c
|
Fix build. am: 50e2b43ce1
Original change: undetermined
Change-Id: I47a944128de763423391817aaeff5cedf17cd789
|
2021-05-31 06:10:51 +00:00 |
|
Lorenzo Colitti
|
cb6a7aad80
|
Merge "Set routes from stacked links as well." into jb-mr2-dev am: 8c9e75757f
Original change: undetermined
Change-Id: I40020d79a725fed6ff8afe885411443c3066dab0
|
2021-05-31 06:10:37 +00:00 |
|
Lorenzo Colitti
|
74cbe6c1a2
|
Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev am: 79c3dfdf0e
Original change: undetermined
Change-Id: I346c8aa0c1aac70ace58ddcfbd54f31470fff7ff
|
2021-05-31 06:10:14 +00:00 |
|
Wink Saville
|
dae77c7893
|
Revert "Fail fast if somebody is adding default routes" am: 4235ce5640
Original change: undetermined
Change-Id: I0f89f2624033299de09550d622ce10e819190573
|
2021-05-31 06:09:52 +00:00 |
|
Robert Greenwalt
|
611616cafc
|
Fail fast if somebody is adding default routes am: f2f0430d40
Original change: undetermined
Change-Id: I550c1ddf580ae48e5c685538ab2b22bec26e6092
|
2021-05-31 06:09:38 +00:00 |
|
Robert Greenwalt
|
cb73d7669a
|
Add logging to track down bug am: b9f53aa687
Original change: undetermined
Change-Id: Ib7bd83a2fb5c000a1ed29a6528b9b07f06374f6e
|
2021-05-31 06:09:24 +00:00 |
|
Lorenzo Colitti
|
c47a20b443
|
Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev am: 90fbffb1e9
Original change: undetermined
Change-Id: I8a67e3e858800565c6740d9199a29f9c16506d02
|
2021-05-31 06:09:08 +00:00 |
|
Lorenzo Colitti
|
8c3de70db5
|
Remove redundant parameter to modifyRoute am: f7020e29fe
Original change: undetermined
Change-Id: Ic8c8057c5c645458ca13bda802004e11b860346c
|
2021-05-31 05:57:05 +00:00 |
|
Lorenzo Colitti
|
6ba0b9d46f
|
Unbreak documentation build. am: ab7ad3a458
Original change: undetermined
Change-Id: If9841b6dcff51e43cbd8b1806bf2e81e3c66e103
|
2021-05-31 05:56:52 +00:00 |
|
Lorenzo Colitti
|
fd9943aec1
|
Always specify an interface for host routes. am: 697e1c0748
Original change: undetermined
Change-Id: I4d0321d92ebdd6b66dafb107a738c7d9ab437a8a
|
2021-05-31 05:56:38 +00:00 |
|