Hugo Benichi
|
2cd8c2e7e6
|
DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest am: 5d2654124e -s ours am: 2a2e22ab23 -s ours am: a053ead6a9
am: 8cc63f2554 -s ours
Change-Id: I6716477bad69ed0b490bde2e05a3b209899cbc36
|
2016-12-08 17:52:03 +00:00 |
|
Lorenzo Colitti
|
22cb5351a5
|
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1 -s ours am: efd928fe56 -s ours am: 5cf18abca9
am: fb636d1faa -s ours
Change-Id: Ie3baf79632bf6556e6a44ebbd2cb8d634a39755e
|
2016-12-08 17:50:46 +00:00 |
|
Lorenzo Colitti
|
005e721532
|
DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net. am: 7ceef950a0 -s ours am: d1e22a3f07 -s ours am: 4c4a86fd4d
am: 3cf39b018c -s ours
Change-Id: I3613a50627a6722e3c337caaa2880d96f1b39beb
|
2016-12-08 17:49:56 +00:00 |
|
Lorenzo Colitti
|
0c84d9d916
|
DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils. am: 3c295b59f5 -s ours am: bcb7e32954 -s ours am: eb7b7664cb
am: 77852d0a9f -s ours
Change-Id: I07d5fdbb7285da095676aa1612df232d77d41b48
|
2016-12-08 17:49:10 +00:00 |
|
Lorenzo Colitti
|
76c8b9f549
|
DO NOT MERGE: Move FakeSettingsProvider to a common location. am: b8df76e413 -s ours am: a84ede299c -s ours am: 33b238bd42
am: 0c34c32534 -s ours
Change-Id: I53d3ceb607580cc0a04d414cef11f69d6877be21
|
2016-12-08 17:48:25 +00:00 |
|
Hugo Benichi
|
1a1d84e557
|
DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such am: 5d540d1410 -s ours am: e47b0886ad -s ours am: 412e89fe9f
am: 80587a02cc -s ours
Change-Id: Ia5e678bc4297f8d6531d7b8fb6cc1085d2877947
|
2016-12-08 17:47:03 +00:00 |
|
Calvin On
|
46dcc1d6d1
|
DO NOT MERGE: Add option to skip and avoid captive portals. am: 1f64f3fd14 -s ours am: 8006bd5c66 -s ours am: 573880a198
am: c39a37c0d6 -s ours
Change-Id: I6af06157789b0eed11588d697e42776cdaafdb11
|
2016-12-08 17:46:08 +00:00 |
|
Hugo Benichi
|
70ede1cfa4
|
DO NOT MERGE: ApfFilter: use elapsedRealTime for RA lifetime am: dafc44ea11 -s ours am: d063978acf -s ours am: 9c37634688
am: 52587963ca -s ours
Change-Id: Ic497dc3dc3a63fc8ac7f482b41205f58bdc10999
|
2016-12-08 17:45:17 +00:00 |
|
Hugo Benichi
|
8f08847233
|
DO NOT MERGE: Do not synchronize boolean reads/writes am: 94dcb3c3fd -s ours am: eb98bc95d2 -s ours am: a63d5e5fd8
am: 9a686a26c6 -s ours
Change-Id: Ic1f722f233f9f1a3a4180916289e52d2f5983469
|
2016-12-08 17:44:30 +00:00 |
|
Hugo Benichi
|
881023122a
|
DO NOT MERGE: ApfFilter: systematically use u8, u16, u32 getters am: 4104ff9220 -s ours am: 2889968553 -s ours am: 02f1650458
am: eaf63414bf -s ours
Change-Id: Icee82b54b504671ab2c8220c16cf3aed29c65bfa
|
2016-12-08 17:43:13 +00:00 |
|
Hugo Benichi
|
1424e0a34c
|
DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing am: 0668a61d82 -s ours am: 976ef7538a -s ours am: 046c5a3119
am: 796a0babf9 -s ours
Change-Id: I001ef66f27b46d9aec5f3ec3c376c107547ab6f2
|
2016-12-08 17:42:09 +00:00 |
|
Erik Kline
|
f9d636adbb
|
DO NOT MERGE: Support timeouts for requestNetwork() invocations. am: 3841a48d0a -s ours am: eb6be2c826 -s ours am: e8dda0f7e4
am: cea7843c61 -s ours
Change-Id: I380a34e414f13ff1e55eb872090d2ebc1b81ba7a
|
2016-12-08 17:41:23 +00:00 |
|
Pierre Imai
|
ef41e7f2b5
|
DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network. am: accd5fcb79 -s ours am: 8a73b2896d -s ours am: a8500b7efc
am: 59d46341c8 -s ours
Change-Id: I35db4c3ff6b38ba0813f35158a65f519b1b40468
|
2016-12-08 17:40:19 +00:00 |
|
Svetoslav Ganov
|
5b4b66d567
|
Merge "Revert "Fix vulnerability in MemoryIntArray" am: 1f06508bc6 am: 64b5725900 am: 60357eb6bd am: 590b77da13 am: 061d2b6cad" into nyc-mr2-dev-plus-aosp
am: 430e097e3f
Change-Id: I85d663a8d467af7547b8025b3fd8a344a3e5f0ab
|
2016-12-08 17:38:53 +00:00 |
|
Svetoslav Ganov
|
deec2f9d2d
|
Revert "Fix vulnerability in MemoryIntArray" am: 1f06508bc6 am: 64b5725900 am: 60357eb6bd am: 590b77da13 am: 061d2b6cad
am: 90cf2c30df
Change-Id: I01e40a7500d1595745a5cc6379b202f743c5bab9
|
2016-12-08 17:38:42 +00:00 |
|
Svetoslav Ganov
|
9368c4b702
|
Revert "Fix vulnerability in MemoryIntArray" am: 1f06508bc6 am: 64b5725900 am: 60357eb6bd am: 590b77da13 am: fe9fc973bd
am: 58e132a3c4 -s ours
Change-Id: If98b0a9b00eeb083d996d92a2c2717460987bf17
|
2016-12-08 17:37:26 +00:00 |
|
Android Build Merger (Role)
|
7892ea03f2
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: 462d9a3335 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:35:39 +00:00 |
|
Bill Yi
|
b598499070
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours
am: 462d9a3335 -s ours
Change-Id: Ief4d72109f3d90b434db85f03246c8bc59946816
|
2016-12-08 17:34:49 +00:00 |
|
Android Build Merger (Role)
|
314938f9bd
|
Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:34:27 +00:00 |
|
Bill Yi
|
2781850054
|
Import translations. DO NOT MERGE am: b004945727 -s ours
am: f1a5ffbf99 -s ours
Change-Id: Ia88146fcb745621d2af59dd81817beb9d7f3e9a2
|
2016-12-08 17:33:31 +00:00 |
|
Android Build Merger (Role)
|
9861c20962
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f014d755a1 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:33:14 +00:00 |
|
Bill Yi
|
54ba91b55e
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours
am: f014d755a1 -s ours
Change-Id: I17a78777cffd4fa0083555c9c073daa26c9df6fa
|
2016-12-08 17:32:27 +00:00 |
|
Android Build Merger (Role)
|
f65de74901
|
Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:32:12 +00:00 |
|
Android Build Merger (Role)
|
0d31f6d669
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours am: d6c831513f -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:31:38 +00:00 |
|
Bill Yi
|
4f294c5d90
|
Import translations. DO NOT MERGE am: c30efc0214 -s ours
am: a40b64efdd -s ours
Change-Id: I22920b6cf6235adc4e478c14f86cd12d8e918d61
|
2016-12-08 17:31:27 +00:00 |
|
Android Build Merger (Role)
|
1aec82e5ba
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: a62eff1f94 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:31:06 +00:00 |
|
Bill Yi
|
b3eebe072c
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c0b7e766b0 -s ours
am: d6c831513f -s ours
Change-Id: Id6708aa60a9d2d91381f89258465c6e967dbdf6d
|
2016-12-08 17:30:52 +00:00 |
|
Android Build Merger (Role)
|
1290cbde22
|
Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: 6919758aba -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:30:37 +00:00 |
|
Bill Yi
|
80d94130f8
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours
am: a62eff1f94 -s ours
Change-Id: Ib0df8eaec53f178059678eb321fc1680df4ea1fe
|
2016-12-08 17:30:19 +00:00 |
|
Android Build Merger (Role)
|
c047919893
|
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: 83810d0665 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:30:00 +00:00 |
|
Bill Yi
|
e4a8541b3e
|
Import translations. DO NOT MERGE am: b004945727 -s ours
am: 6919758aba -s ours
Change-Id: Ia27b6a752d65e8c5aea0b20021f2dfa760da593e
|
2016-12-08 17:29:55 +00:00 |
|
Android Build Merger (Role)
|
aec40ad476
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours am: f0ed05f4b7 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:29:39 +00:00 |
|
Bill Yi
|
fcb1291179
|
Import translations. DO NOT MERGE am: c300be1cf4 -s ours
am: 83810d0665 -s ours
Change-Id: Ib23bd71cdaba249d28e0f4db1c96a7080225165c
|
2016-12-08 17:29:11 +00:00 |
|
Bill Yi
|
d62f14af4c
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1 -s ours
am: f0ed05f4b7 -s ours
Change-Id: I2462d7371daa03493727933129e27b843595079b
|
2016-12-08 17:28:56 +00:00 |
|
Android Build Merger (Role)
|
529383ef3b
|
Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:28:43 +00:00 |
|
Bill Yi
|
587eb37902
|
Import translations. DO NOT MERGE am: c30efc0214 -s ours
am: 3831df7485 -s ours
Change-Id: I84cb859818840bee500d1609d0e42889f51cf628
|
2016-12-08 17:27:56 +00:00 |
|
Android Build Merger (Role)
|
2231f7a3fc
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours am: 71398a5624 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:27:42 +00:00 |
|
Bill Yi
|
14052df083
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873 -s ours
am: 71398a5624 -s ours
Change-Id: Iccc5b334aac187fe563a9f4789eb9a7501de2969
|
2016-12-08 17:26:54 +00:00 |
|
Android Build Merger (Role)
|
5a8f26382f
|
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:26:37 +00:00 |
|
Bill Yi
|
174ba61ad9
|
Import translations. DO NOT MERGE am: c300be1cf4 -s ours
am: e7aa31539d -s ours
Change-Id: I77eefff10c0e60b33b0d1398d86c25f85354b98b
|
2016-12-08 17:25:49 +00:00 |
|
Android Build Merger (Role)
|
738dddae72
|
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours am: 217e5fc476 -s ours" into nyc-mr2-dev-plus-aosp
|
2016-12-08 17:25:44 +00:00 |
|
Diego Perez
|
579a04fd59
|
Merge "Adding missing SurfaceView methods"
|
2016-12-08 17:25:40 +00:00 |
|
Android Build Merger (Role)
|
a5626d7430
|
Merge "Merge "Support multiple caches in NetworkScoreService." am: 78f3f0049e am: a7c0b73971 am: b45a4a5d1b am: 5456cdbc27"
|
2016-12-08 17:25:14 +00:00 |
|
Bill Yi
|
8daef56a1c
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours
am: ceb0716eba -s ours
Change-Id: Ic8232735cc2584df7c164ce48b2dfc505638f84f
|
2016-12-08 17:24:57 +00:00 |
|
Bill Yi
|
237b2c3d55
|
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: df9a47a79f -s ours
am: 217e5fc476 -s ours
Change-Id: I8acb3bbd7511e7d861592e851f0f0ec97b1160ca
|
2016-12-08 17:24:56 +00:00 |
|
Amin Shaikh
|
38724a234d
|
Merge "Support multiple caches in NetworkScoreService." am: 78f3f0049e am: a7c0b73971 am: b45a4a5d1b
am: 5456cdbc27
Change-Id: I421cff1c47959c40088a31f72556630a8acd007e
|
2016-12-08 17:24:32 +00:00 |
|
Android Build Merger (Role)
|
e691e4ff56
|
Merge "Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8" into nyc-mr2-dev-plus-aosp am: 7e789f3f5c"
|
2016-12-08 17:24:12 +00:00 |
|
Bill Yi
|
5966efe1cd
|
Import translations. DO NOT MERGE am: ef89f62670 -s ours
am: 42318626f2 -s ours
Change-Id: I22220f722e4292777d8fa3413ed65f5be4ca4aec
|
2016-12-08 17:23:55 +00:00 |
|
Android Build Merger (Role)
|
e4fe7f6e7d
|
Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8 am: 6a6516c57e"
|
2016-12-08 17:23:48 +00:00 |
|
Svetoslav Ganov
|
7f8f7da7d2
|
Merge "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0 am: 638134c1d8" into nyc-mr2-dev-plus-aosp
am: 7e789f3f5c
Change-Id: I251405ec0b0b64c5ebac4efbc025b48b9f381541
|
2016-12-08 17:22:57 +00:00 |
|