Commit Graph

326561 Commits

Author SHA1 Message Date
Svetoslav Ganov
72fc8a5f09 Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e
am: 50859b50a6

Change-Id: I90ab9c9d83901f2ddcf646635364664a8fb51a93
2017-06-08 16:19:02 +00:00
Svetoslav Ganov
454b310090 Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e
am: 62031b8937

Change-Id: Ic5de35a7a93432c0984759ee415828cee9501e13
2017-06-08 16:14:34 +00:00
Bill Yi
10455769d6 Import translations. DO NOT MERGE
Change-Id: Ia22276dc15f3b81471bb4061fc9080c1a117fa8a
Auto-generated-cl: translation import
2017-06-08 09:13:11 -07:00
Jesse Hall
203f7efb59 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am: 9cf8c281d2 am: 00c6c3be77
am: 72a6853b9e

Change-Id: I6c4a6759d492a3db4d3ca3cab76e57333efe1a33
2017-06-08 16:04:45 +00:00
Svetoslav Ganov
50859b50a6 Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e

Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
2017-06-08 16:04:17 +00:00
Bill Yi
5fa0db0a37 Import translations. DO NOT MERGE
Change-Id: If81fd2fdf1a8be8da0741c76a166466bf6680a4b
Auto-generated-cl: translation import
2017-06-08 09:03:09 -07:00
Svetoslav Ganov
62031b8937 Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e

Change-Id: I5f07488ba286cb3d01c75d96e1003edba845daf8
2017-06-08 16:01:54 +00:00
Jesse Hall
72a6853b9e Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am: 9cf8c281d2
am: 00c6c3be77

Change-Id: I15b4288df07fe2f1fb5d0b4f6404708c116149ff
2017-06-08 15:56:17 +00:00
TreeHugger Robot
053fb9120e Merge "Ensure only test print services enabled - framework" into oc-dev 2017-06-08 15:55:14 +00:00
Jesse Hall
00c6c3be77 Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am: 9cf8c281d2

Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
2017-06-08 15:41:46 +00:00
Jesse Hall
9cf8c281d2 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" 2017-06-08 15:34:44 +00:00
Android Build Merger (Role)
7547884008 Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1 am: 35d1ab4281" into oc-dr1-dev-plus-aosp 2017-06-08 14:56:45 +00:00
Android Build Merger (Role)
a001cfe4ec Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1 am: 9a06d4bc77" into oc-dr1-dev-plus-aosp 2017-06-08 14:56:14 +00:00
Andrei Stingaceanu
e539813fad Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1
am: 35d1ab4281

Change-Id: I2303d47c828d654eb0be87d2a1dbb3ca69636985
2017-06-08 14:55:33 +00:00
Android Build Merger (Role)
02def68a68 Merge "Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2ad am: 5e1f15a89d" into oc-dr1-dev-plus-aosp 2017-06-08 14:55:10 +00:00
Andrei Stingaceanu
2a133b6194 Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1
am: 9a06d4bc77

Change-Id: I52602b7bea349fd455eaff7591e4b3f4e153ce63
2017-06-08 14:54:55 +00:00
Wale Ogunwale
30700e46f5 Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2ad
am: 5e1f15a89d

Change-Id: Ifb7664c7ade59390d682d0bebb6055097e653342
2017-06-08 14:53:01 +00:00
Wale Ogunwale
51c34f7ef3 Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2ad
am: bc4f4e5be6

Change-Id: I9877ba7613b9a41cb2b48df2ab0ac49be460961d
2017-06-08 14:52:26 +00:00
Bill Yi
013c46df9e Import translations. DO NOT MERGE
Change-Id: I425ed8791fdbbe1047353b9dae225080bbee78d8
Auto-generated-cl: translation import
2017-06-08 07:49:22 -07:00
Andrei Stingaceanu
35d1ab4281 Merge "Fix unexpected DatePicker validation" into oc-dev
am: cd603221e1

Change-Id: Id06c3a8d76954f40c99673db034342c9023cc408
2017-06-08 14:44:55 +00:00
Andrei Stingaceanu
9a06d4bc77 Merge "Fix unexpected DatePicker validation" into oc-dev
am: cd603221e1

Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54
2017-06-08 14:44:20 +00:00
Wale Ogunwale
bc4f4e5be6 Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am: 13059cc2ad

Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5
2017-06-08 14:41:34 +00:00
Wale Ogunwale
5e1f15a89d Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am: 13059cc2ad

Change-Id: Iccf433dd506f42ae07531fe9cd0fa239882d4cf2
2017-06-08 14:41:31 +00:00
TreeHugger Robot
cd603221e1 Merge "Fix unexpected DatePicker validation" into oc-dev 2017-06-08 14:36:13 +00:00
Wale Ogunwale
13059cc2ad Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev 2017-06-08 14:33:10 +00:00
Android Build Merger (Role)
46c8c8dadf Merge "Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am: b18f65a168 am: ef711976c8" into oc-dr1-dev-plus-aosp 2017-06-08 14:26:25 +00:00
Selim Cinek
8dbeb33bd8 Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am: b18f65a168
am: 1c28e96bf0

Change-Id: I68ac5b61d9e943346a62ed72fffe5650ce9cd2dd
2017-06-08 14:23:29 +00:00
Selim Cinek
4e1394ade6 Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am: b18f65a168
am: ef711976c8

Change-Id: I8cf63a193d9b4cbf1cf62b48f051849d4e7158af
2017-06-08 14:23:27 +00:00
Selim Cinek
ef711976c8 Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am: b18f65a168

Change-Id: I53abb4f31f8dc660ba9b140475bbd121df524613
2017-06-08 14:15:33 +00:00
Selim Cinek
1c28e96bf0 Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am: b18f65a168

Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a
2017-06-08 14:15:29 +00:00
Selim Cinek
b18f65a168 Merge "Fixed a bug where the navigation notification would flicker" into oc-dev 2017-06-08 14:07:23 +00:00
Android Build Merger (Role)
8b2422176e Merge "Delete legacy "wifi interface name guessing" behaviour am: 9e22554068 am: 998e766acc" into oc-dr1-dev-plus-aosp 2017-06-08 13:44:05 +00:00
Erik Kline
10bb7932f9 Delete legacy "wifi interface name guessing" behaviour am: 9e22554068
am: 998e766acc

Change-Id: I7c4f88c27fae3a5d3730822a4ed25fdb2afaeeac
2017-06-08 13:40:56 +00:00
Erik Kline
292157d9cb Delete legacy "wifi interface name guessing" behaviour am: 9e22554068
am: e7d7699381

Change-Id: Iddfd2e5f81b80f311896e8eb4019d7ebd7c1c1c0
2017-06-08 13:40:54 +00:00
Erik Kline
e7d7699381 Delete legacy "wifi interface name guessing" behaviour
am: 9e22554068

Change-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646
2017-06-08 13:32:57 +00:00
Erik Kline
998e766acc Delete legacy "wifi interface name guessing" behaviour
am: 9e22554068

Change-Id: I25e3814f979dbe65055498c85b34411cf6d3c996
2017-06-08 13:32:53 +00:00
Erik Kline
ab6439b0f8 Convert IControlsTethering from interface into callback
Additionally:
    - add updateLinkProperties() method to new callback
    - skeletally connect LinkProperties updates through
      to OffloadController

TODOs liberally sprinkled through out.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 29337859
Bug: 32163131
Change-Id: I631d17b26be153534551a1615931fc98b598b953
2017-06-08 22:28:57 +09:00
Erik Kline
f661ef9905 Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe am: 8bc87070f9
am: ad652cbcf3

Change-Id: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b
2017-06-08 12:28:58 +00:00
Erik Kline
ad652cbcf3 Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe
am: 8bc87070f9

Change-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
2017-06-08 12:20:31 +00:00
Erik Kline
8bc87070f9 Merge "Move findPreferredUpstreamType into UNM"
am: 32703994fe

Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff
2017-06-08 12:11:59 +00:00
Treehugger Robot
32703994fe Merge "Move findPreferredUpstreamType into UNM" 2017-06-08 12:03:02 +00:00
Erik Kline
9e22554068 Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).

Test: as follows
    - built
    - flashed
    - booted
    - TetheringTest passes
Bug: 32163131
Bug: 62343300

Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
2017-06-08 18:51:33 +09:00
Erik Kline
a1d368af2f Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.

Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.

Test: as follows
    - built
    - flashed
    - booted
    - runtest framework-net passed
Bug: 32163131

Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
2017-06-08 16:50:17 +09:00
Android Build Merger (Role)
d20b1c96d7 Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 07d2221218" into oc-dr1-dev-plus-aosp 2017-06-08 06:26:13 +00:00
Felipe Leme
1a89393991 Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918
am: 07d2221218

Change-Id: If47f67c7bf291e44015c92708eca0ff00a2a14b8
2017-06-08 06:20:24 +00:00
Android Build Merger (Role)
1fa70d7a3e Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: 53bdeb1a46" into oc-dr1-dev-plus-aosp 2017-06-08 06:20:05 +00:00
Android Build Merger (Role)
5f7c800fbf Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918 am: 4d579eacec" into oc-dr1-dev-plus-aosp 2017-06-08 06:19:33 +00:00
Mark Rathjen
1644c2927c Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376
am: 53bdeb1a46

Change-Id: If4ba8d279d1bafbcb606f703a0f7498954c73e62
2017-06-08 06:19:10 +00:00
Felipe Leme
0f66e5f368 Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am: 9be8c96918
am: 4d579eacec

Change-Id: I5824d83e8a5043766aa062ff023d5ad82be28d28
2017-06-08 06:18:37 +00:00
Yuchen He
692fee87c6 Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b
am: c592c63a2d

Change-Id: If1a4ac40d340b9bd59fda0924bbbc313dbe810c1
2017-06-08 06:17:14 +00:00