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
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
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
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
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
2017-06-08 13:40:56 +00:00
Erik Kline
292157d9cb
Delete legacy "wifi interface name guessing" behaviour am: 9e22554068
...
am: e7d7699381
2017-06-08 13:40:54 +00:00
Erik Kline
e7d7699381
Delete legacy "wifi interface name guessing" behaviour
...
am: 9e22554068
2017-06-08 13:32:57 +00:00
Erik Kline
998e766acc
Delete legacy "wifi interface name guessing" behaviour
...
am: 9e22554068
2017-06-08 13:32:53 +00:00
Erik Kline
f661ef9905
Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe am: 8bc87070f9
...
am: ad652cbcf3
2017-06-08 12:28:58 +00:00
Erik Kline
ad652cbcf3
Merge "Move findPreferredUpstreamType into UNM" am: 32703994fe
...
am: 8bc87070f9
2017-06-08 12:20:31 +00:00
Erik Kline
8bc87070f9
Merge "Move findPreferredUpstreamType into UNM"
...
am: 32703994fe
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
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
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
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
2017-06-08 06:17:14 +00:00
Android Build Merger (Role)
83330b44a8
Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: d88c71a6e2" into oc-dr1-dev-plus-aosp
2017-06-08 06:14:55 +00:00
Mark Rathjen
a29c976872
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376
...
am: d88c71a6e2
2017-06-08 06:14:00 +00:00
Android Build Merger (Role)
f097dc9d20
Merge "Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b am: 43f1ee3ac8" into oc-dr1-dev-plus-aosp
2017-06-08 06:13:41 +00:00
Yuchen He
016ca0a1cd
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b
...
am: 43f1ee3ac8
2017-06-08 06:12:35 +00:00
Android Build Merger (Role)
263b044a1d
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 0fcadeaeb9" into oc-dr1-dev-plus-aosp
2017-06-08 06:12:13 +00:00
Adam Bookatz
7fe6fcbf96
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
...
am: 0fcadeaeb9
2017-06-08 06:09:46 +00:00
Andreas Gampe
ed8e5659cf
Merge "Framework: Remove SamplingProfiler" am: d2ecee2506 am: 3ea0309e39 -s ours
...
am: 76f6da62e6
2017-06-08 06:08:30 +00:00
Felipe Leme
4d579eacec
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
...
am: 9be8c96918
2017-06-08 06:07:15 +00:00
Android Build Merger (Role)
041bb40935
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 23e5a1ee65" into oc-dr1-dev-plus-aosp
2017-06-08 06:05:37 +00:00
Mark Rathjen
d88c71a6e2
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
...
am: 3492ed4376
2017-06-08 06:04:54 +00:00
Todd Kennedy
6f662ea114
Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96
...
am: 23e5a1ee65
2017-06-08 06:04:42 +00:00
Android Build Merger (Role)
d7e9fb62d5
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 7c44479edf" into oc-dr1-dev-plus-aosp
2017-06-08 06:04:19 +00:00
Phil Weaver
fc35c7784b
Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
...
am: 7c44479edf
2017-06-08 06:03:29 +00:00
Android Build Merger (Role)
56f83527ae
Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978 am: de066fd249" into oc-dr1-dev-plus-aosp
2017-06-08 06:03:07 +00:00
Todd Kennedy
14398d764c
Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
...
am: de066fd249
2017-06-08 06:02:07 +00:00
Yuchen He
43f1ee3ac8
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
...
am: 3671e9249b
2017-06-08 06:01:50 +00:00
Android Build Merger (Role)
36e8ee9c1f
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 300ebee8c4" into oc-dr1-dev-plus-aosp
2017-06-08 06:01:43 +00:00
Adam Bookatz
e9e89d0042
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
...
am: 300ebee8c4
2017-06-08 06:00:42 +00:00
Android Build Merger (Role)
ed07898d13
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 4d2a9a9f50" into oc-dr1-dev-plus-aosp
2017-06-08 06:00:19 +00:00
Adam Bookatz
0fcadeaeb9
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
...
am: 6029bce3b4
2017-06-08 05:59:56 +00:00
Todd Kennedy
8cd4502037
Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96
...
am: 4d2a9a9f50
2017-06-08 05:59:13 +00:00
Android Build Merger (Role)
fc7d48e703
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 3d5bf99e7f" into oc-dr1-dev-plus-aosp
2017-06-08 05:58:51 +00:00
Phil Weaver
cd54ff31f0
Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
...
am: 3d5bf99e7f
2017-06-08 05:57:56 +00:00
Android Build Merger (Role)
6e1e2090af
Merge "Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c am: b6a16546b5" into oc-dr1-dev-plus-aosp
2017-06-08 05:57:33 +00:00
