Eugene Susla
7e765db26f
Merge "StopScan before each new Companion device scan" into oc-dev
...
am: 611797073f
2017-04-20 17:57:40 +00:00
Eugene Susla
611797073f
Merge "StopScan before each new Companion device scan" into oc-dev
2017-04-20 17:51:00 +00:00
Felipe Leme
2d0eb5e33c
Merge "Moved getAutofillOptions() logic from SpinnerAbs to AdapterView and Adapter." into oc-dev
...
am: f4af35a5fe
2017-04-20 17:36:31 +00:00
TreeHugger Robot
f4af35a5fe
Merge "Moved getAutofillOptions() logic from SpinnerAbs to AdapterView and Adapter." into oc-dev
2017-04-20 17:25:19 +00:00
Sudheer Shanka
6c7d88c62c
Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev
...
am: 8f40881e3e
2017-04-20 17:01:24 +00:00
Sudheer Shanka
8f40881e3e
Merge "Revert "Add new api Activity.getStartInitiatedTime."" into oc-dev
2017-04-20 16:32:37 +00:00
Phil Weaver
0b3408a369
Merge "Make a11y clickable span work after node recycle" into oc-dev
...
am: 5d25f429bf
2017-04-20 16:22:43 +00:00
Jesse Hall
39368e0f01
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
...
am: 45ff1d1ad3
2017-04-20 16:15:50 +00:00
Bryce Lee
08cda62574
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
...
am: e4b6441198
2017-04-20 16:12:54 +00:00
Abodunrinwa Toki
d5857c4e9f
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
...
am: 06a53d4729
2017-04-20 16:08:24 +00:00
Andrei Stingaceanu
c033cf3a73
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
...
am: 635d9dd864
2017-04-20 16:07:03 +00:00
Abodunrinwa Toki
1ecfa26c90
Merge "TRON: Log "textAssist" actions." into oc-dev
...
am: fa9d889d3e
2017-04-20 16:05:43 +00:00
Clara Bayarri
18d539cd0a
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
...
am: 1ef45a8bed
2017-04-20 16:01:03 +00:00
Phil Weaver
5d25f429bf
Merge "Make a11y clickable span work after node recycle" into oc-dev
2017-04-20 14:51:43 +00:00
Jesse Hall
45ff1d1ad3
Merge "Vulkan compute 0 only requires variable pointers" into oc-dev
2017-04-20 14:51:36 +00:00
Bryce Lee
e4b6441198
Merge "Deprecate Activity#requestVisibleBehind" into oc-dev
2017-04-20 14:19:16 +00:00
Erik Kline
c9ee35581c
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79 am: 6af3dd0fc3
...
am: 3fa8908370
2017-04-20 14:02:24 +00:00
Hugo Benichi
7b8fc6ea79
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69 am: 23ee1621c7
...
am: b51307e12e
2017-04-20 13:59:32 +00:00
Erik Kline
372edc3b7d
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1 am: 0d1f04384f
...
am: d9bfb83d96
2017-04-20 13:52:35 +00:00
Abodunrinwa Toki
06a53d4729
Merge changes from topics 'smartselectconfig', 'langidconfig' into oc-dev
...
* changes:
SmartSelection Config installer.
LangId Config installer.
2017-04-20 13:30:35 +00:00
Hugo Benichi
3ff96e5dd8
resolve merge conflicts of 7bbd03be36 to oc-dev-plus-aosp
...
Conflits were:
- static import section of ConnectivityService
- code deleted in commit a038568676
2017-04-20 22:26:50 +09:00
Andrei Stingaceanu
635d9dd864
Merge "AutoSize TextView - API polish - no RuntimeException in signature" into oc-dev
2017-04-20 13:14:06 +00:00
Abodunrinwa Toki
fa9d889d3e
Merge "TRON: Log "textAssist" actions." into oc-dev
2017-04-20 13:08:52 +00:00
Erik Kline
3fa8908370
Merge "Add local-only hotspot info into tether state change broadcast" am: 4c7a999d79
...
am: 6af3dd0fc3
2017-04-20 13:00:52 +00:00
Hugo Benichi
b51307e12e
Merge "ConnectivityManager: remove obsolete callback types" am: 458f75ef69
...
am: 23ee1621c7
2017-04-20 12:53:22 +00:00
TreeHugger Robot
1ef45a8bed
Merge "Api Council: hide FontsContract.Columns constructor" into oc-dev
2017-04-20 12:52:43 +00:00
Treehugger Robot
4c7a999d79
Merge "Add local-only hotspot info into tether state change broadcast"
2017-04-20 12:47:55 +00:00
Hugo Benichi
458f75ef69
Merge "ConnectivityManager: remove obsolete callback types"
2017-04-20 12:38:29 +00:00
Andrei Stingaceanu
1b59a21c5c
AutoSize TextView - API polish - no RuntimeException in signature
...
Do not mention RuntimeException subclasses in throws clauses in
method signatures.
Bug: 37514926
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t \
android.widget.cts.TextViewTest
Change-Id: Ia5bf4cd64e12c53dd7c409b6e44efec4983ae62e
2017-04-20 12:09:11 +01:00
Clara Bayarri
7fea2e264e
Api Council: hide FontsContract.Columns constructor
...
Bug: 37515256
Test: none
Change-Id: I2a9de7ea30ffa39af5104977f6604ce3bda220fb
2017-04-20 11:56:09 +01:00
Erik Kline
8351faa900
Add local-only hotspot info into tether state change broadcast
...
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug: 31466854
Bug: 32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
2017-04-20 19:44:01 +09:00
Erik Kline
d9bfb83d96
Merge "Make tetherChangePermission to be secured for AppOps permission" am: fe86a197a1
...
am: 0d1f04384f
2017-04-20 04:47:16 +00:00
Hugo Benichi
7bbd03be36
Merge "ConnectivityManager: unify prety printing of callback types." am: 0a4dc6a5d2
...
am: 3a0e92fada
2017-04-20 04:40:34 +00:00
Jocelyn Dang
f29eb24c4e
Merge "Add min and max learned battery capacity to batterystats." into oc-dev
...
am: b2aa0ceb0d
2017-04-20 04:40:10 +00:00
Jocelyn Dang
b2aa0ceb0d
Merge "Add min and max learned battery capacity to batterystats." into oc-dev
2017-04-20 04:34:14 +00:00
Erik Kline
fe86a197a1
Merge "Make tetherChangePermission to be secured for AppOps permission"
2017-04-20 04:28:53 +00:00
Hugo Benichi
addfe673d8
Merge changes Ic029cc9f,Id917f3a2 into oc-dev
...
* changes:
NsdService: minor cleanups
Nsdmanager/NsdService: add logging
2017-04-20 04:27:50 +00:00
Svetoslav Ganov
375d615b30
Merge "Address API council comments" into oc-dev
...
am: fb4fb03cc3
2017-04-20 04:02:40 +00:00
TreeHugger Robot
fb4fb03cc3
Merge "Address API council comments" into oc-dev
2017-04-20 03:53:37 +00:00
Ashutosh Joshi
ae1fb69407
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev
...
am: bf2e5bd0f9
2017-04-20 03:17:54 +00:00
Ashutosh Joshi
bf2e5bd0f9
Merge "Ensure that LLOB sensor is names similr to other android sensors." into oc-dev
2017-04-20 03:10:26 +00:00
Christopher Tate
e56d699a89
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev
...
am: aa6b649a35
2017-04-20 02:21:40 +00:00
TreeHugger Robot
aa6b649a35
Merge "Revert "Introduce PACKAGE_FIRST_ADDED broadcast"" into oc-dev
2017-04-20 02:15:14 +00:00
Hugo Benichi
dba33db572
ConnectivityManager: remove obsolete callback types
...
This patch also:
- suppresses callback triggers from ConnectivityService for these
obsolete callback types.
- marginally refactors callCallbackForRequest().
Test: runtest frameworks-net
Change-Id: Idfb75640732943c599de4975f252f706d21ad594
2017-04-20 10:42:38 +09:00
Hugo Benichi
a038568676
ConnectivityManager: unify prety printing of callback types.
...
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
2017-04-20 10:42:38 +09:00
Martijn Coenen
621c6019e7
Merge "Validate incoming data properly." into oc-dev
...
am: a0aa7c3093
2017-04-20 01:17:12 +00:00
TreeHugger Robot
a0aa7c3093
Merge "Validate incoming data properly." into oc-dev
2017-04-20 01:12:34 +00:00
Ian Lake
2e342f875d
Merge "Move expensive TextClock operations to onAttach" into oc-dev
...
am: 4f3ba1aeed
2017-04-20 00:38:07 +00:00
TreeHugger Robot
4f3ba1aeed
Merge "Move expensive TextClock operations to onAttach" into oc-dev
2017-04-20 00:26:52 +00:00
Selim Cinek
c40344bf86
Merge changes Ic76d996f,Ib9eefacb,If1b63340,I399c66af into oc-dev
...
am: 947be6bed9
2017-04-20 00:15:13 +00:00
