Etan Cohen
7a36073c14
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c am: b32dfa4ef5
...
am: 3fc5b186fa
2017-01-11 23:28:20 +00:00
Etan Cohen
3fc5b186fa
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
...
am: b32dfa4ef5
2017-01-11 23:22:51 +00:00
Etan Cohen
b32dfa4ef5
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
...
am: 2a4e3bef2c
2017-01-11 23:17:19 +00:00
Etan Cohen
2a4e3bef2c
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
...
am: dfe8f5dc13
2017-01-11 23:12:16 +00:00
Felipe Leme
c88368c270
Added BUGREPORT_OPTION_TELEPHONY.
...
am: a561b1f9c0
2017-01-11 23:09:01 +00:00
Etan Cohen
dfe8f5dc13
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
2017-01-11 22:59:25 +00:00
Jeff Schumacher
e5dfa979cb
Merge "Made ActivityManager.forceStopPackage a @SystemApi"
2017-01-11 22:34:31 +00:00
Phil Weaver
9fa89381bf
Merge "Add flag and listener for a11y volume requests."
2017-01-11 21:57:09 +00:00
Makoto Onuki
7f53ac1504
Merge "Expose getApplicationInfo(UserHandle)"
2017-01-11 21:56:24 +00:00
Makoto Onuki
458e54f00f
Merge "@hide RetentionPolicy.SOURCE annotation"
2017-01-11 21:14:20 +00:00
TreeHugger Robot
e12c790464
Merge "Make hidden DevicePolicyManager#getDeviceOwnerComponentOnAnyUser system API."
2017-01-11 21:11:06 +00:00
TreeHugger Robot
8b21542ba3
Merge "Added BUGREPORT_OPTION_TELEPHONY."
2017-01-11 20:45:42 +00:00
Jeremy Joslin
ad9ff9c59a
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95
...
am: ab9eb11e2f
2017-01-11 20:08:49 +00:00
Jeremy Joslin
ab9eb11e2f
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
...
am: 425a0fdc95
2017-01-11 19:59:27 +00:00
Jeremy Joslin
425a0fdc95
Merge "Move getActiveScorerPackage() to the score service."
...
am: b5488ec3b3
2017-01-11 19:52:37 +00:00
Treehugger Robot
b5488ec3b3
Merge "Move getActiveScorerPackage() to the score service."
2017-01-11 19:40:45 +00:00
TreeHugger Robot
772ff11cb5
Merge "Add missing break statement to fix cts test"
2017-01-11 19:39:07 +00:00
TreeHugger Robot
3c6f28aa59
Merge "Added TaskWindowContainerController"
2017-01-11 19:14:55 +00:00
Etan Cohen
6a4b323f08
[AWARE] Unhide Wi-Fi Aware API (baseline)
...
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).
Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
2017-01-11 11:13:26 -08:00
Tao Bai
fe0c0e05be
Merge "Load WebViewChromiumFactoryProviderForO"
2017-01-11 19:01:25 +00:00
TreeHugger Robot
b82e176b55
Merge "Add new system api to pass parameters from Oobconfig to ManagedProvisioning"
2017-01-11 18:56:37 +00:00
Makoto Onuki
a59e4503a1
Merge "Update the javadoc on requestPinShortcut() about multiple..."
2017-01-11 18:13:04 +00:00
Robin Lee
3101b3ad21
Merge changes I3fd28e69,If43820b6
...
* changes:
Lock work tasks from SystemUI instead of ActivityStarter
Bounce work challenge through a WorkLockActivity
2017-01-11 17:41:01 +00:00
Wale Ogunwale
e1fe7fa288
Added TaskWindowContainerController
...
For linking TaskRecord in AMS to Task window container in WMS.
Bug: 30060889
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowContainerControllerTests
Test: bit FrameworksServicesTests:com.android.server.wm.TaskWindowContainerControllerTests
Test: Existing test pass and manual testing.
Change-Id: I16248f3e96e5087ba24198a48a3bd10a12ae76a6
2017-01-11 09:19:35 -08:00
Mark Salyzyn
7a98aee66a
Merge "resolve merge conflicts of 082a1721b5 to master"
2017-01-11 17:13:02 +00:00
Felipe Leme
9606c3bf58
Added BUGREPORT_OPTION_TELEPHONY.
...
This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.
BUG: 32589463
BUG: 26849505
Test: manual
Change-Id: I6f90c02779a1e8aead690428626e3b9f06aa04df
2017-01-11 09:10:57 -08:00
Phil Weaver
74bf350176
Merge "Accessibility support for ClickableSpan"
2017-01-11 16:42:29 +00:00
Mark Salyzyn
db15537e6e
resolve merge conflicts of 082a1721b5 to master
...
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
2017-01-11 08:30:17 -08:00
Mark Salyzyn
082a1721b5
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
...
am: ef8ccc8510
2017-01-11 15:45:46 +00:00
Neil Fuller
261a1dcffd
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 am: 43d53395dc
...
am: 75f84f2261
2017-01-11 15:45:29 +00:00
Mark Salyzyn
ef8ccc8510
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
...
am: 6143cbf1e5
2017-01-11 15:40:24 +00:00
Mark Salyzyn
6143cbf1e5
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
...
am: e7fcbcb991
2017-01-11 15:35:19 +00:00
Mark Salyzyn
e7fcbcb991
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
2017-01-11 15:24:11 +00:00
Jorim Jaggi
d8f2268e3c
Merge "Clean up starting window to prepare for saved surfaces"
2017-01-11 14:58:50 +00:00
Robin Lee
c41f6ec877
Lock work tasks from SystemUI instead of ActivityStarter
...
By adding an onTaskProfileLocked(taskId, userId) RPC to
TaskStackListener and routing that through to a new WorkLockController.
Bug: 31001762
Test: //tests/PoApi/src/com/google/android/afwtest/poapi/WorkChallengeTest
Change-Id: I3fd28e6926c3f928e78b3c6ce0fe27413617695f
2017-01-11 14:13:07 +00:00
Neil Fuller
75f84f2261
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794
...
am: 43d53395dc
2017-01-11 13:54:10 +00:00
Neil Fuller
43d53395dc
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
...
am: f4e236c794
2017-01-11 13:48:14 +00:00
Neil Fuller
f4e236c794
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
...
am: 649a89e524
2017-01-11 13:37:37 +00:00
Neil Fuller
649a89e524
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
2017-01-11 13:27:10 +00:00
Seigo Nonaka
88296d221b
Merge "Introduce full justification."
2017-01-11 08:24:08 +00:00
David Stevens
e97cac4962
Merge "Fix calculation of duration in AnimationSet"
2017-01-11 05:36:25 +00:00
TreeHugger Robot
5f1d1cf744
Merge "YAMAFFR - Yet Another Major AutoFill Framework Refactoring"
2017-01-11 04:20:01 +00:00
Lorenzo Colitti
5bd8014265
Merge "Remove requestRouteToHost and {start,stop}UsingNetworkFeature."
2017-01-11 03:52:21 +00:00
David Stevens
ab9e3b5369
Fix calculation of duration in AnimationSet
...
Unfortunately, AnimationSet.getDuration is defined incorrectly, so
this fix doesn't actually affect any behavior.
Test: None
Change-Id: I8328b603aee23252b5fab4acfd34d3f0e8fe06c0
2017-01-10 19:19:56 -08:00
Santos Cordon
f85ab8306f
Add Brightness setting for VR Mode.
...
am: d6a5660a2c
2017-01-11 03:12:05 +00:00
Santos Cordon
e89ba5222c
Merge "Add Brightness setting for VR Mode."
2017-01-11 03:02:02 +00:00
Jeremy Joslin
99ca0df8d4
Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac
...
am: 11b1311e21
2017-01-11 01:50:13 +00:00
Jeremy Joslin
11b1311e21
Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196
...
am: 5fbd2791ac
2017-01-11 01:45:43 +00:00
Jeremy Joslin
5fbd2791ac
Merge "Moved isCallerActiveScorer() to the score service."
...
am: 663b444196
2017-01-11 01:41:14 +00:00
Treehugger Robot
663b444196
Merge "Moved isCallerActiveScorer() to the score service."
2017-01-11 01:30:03 +00:00
