TreeHugger Robot
8b21542ba3
Merge "Added BUGREPORT_OPTION_TELEPHONY."
2017-01-11 20:45:42 +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
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
Alison Cichowlas
0f642d2709
Merge "Add a required main category for multi logs."
2017-01-11 17:54:13 +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
TreeHugger Robot
3b6bcfb65d
Merge "Require InputContentInfo.requestPermission()"
2017-01-11 06:30:22 +00:00
David Stevens
e97cac4962
Merge "Fix calculation of duration in AnimationSet"
2017-01-11 05:36:25 +00:00
Andreas Gampe
e19589fbe8
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1 am: e4cff36099
...
am: 3b51506c5c
2017-01-11 04:53:19 +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
Andreas Gampe
3b51506c5c
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1
...
am: e4cff36099
2017-01-11 03:01:40 +00:00
Andreas Gampe
e4cff36099
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5
...
am: 140b9b65a1
2017-01-11 02:46:57 +00:00
Andreas Gampe
140b9b65a1
Merge "Zygote: Add fdsToIgnore"
...
am: 5b22a826d5
2017-01-11 02:33:05 +00:00
Treehugger Robot
5b22a826d5
Merge "Zygote: Add fdsToIgnore"
2017-01-11 02:20:37 +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
Sunny Goyal
256dac14e2
Merge "Adding API to allow async inflaiton of AppWidget"
2017-01-11 01:19:33 +00:00
Santos Cordon
3107d29c8f
Add Brightness setting for VR Mode.
...
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.
Test: runtests frameworks-core
Test: Turn vr mode on and change brightness (should remain separate from
normal brightness)
Bug: 30984614
Change-Id: If3c3e81b592e0c6fd037e5783559683e5cb58379
2017-01-10 17:16:04 -08:00
Treehugger Robot
60d10ea0f4
Merge changes I559eb049,I52425b84
...
* changes:
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
2017-01-11 01:06:57 +00:00
Andreas Gampe
8dfa178efb
Zygote: Add fdsToIgnore
...
Add file descriptors that should be ignored in the file descriptor
table check.
Use this to ignore the pipe file descriptors when starting an app
with invoke-with (wrapper).
Bug: 32607405
Test: m
Test: Device boots
Test: Apps start
Test: adb root && adb shell setprop wrap.com.android.calculator2 logwrapper && adb shell am start -S -n com.android.calculator2/.Calculator
Change-Id: I4a30dfc9382d3172cc815bd41b17a123799354f6
2017-01-10 16:55:34 -08:00
Jeremy Joslin
9b442faa91
Moved isCallerActiveScorer() to the score service.
...
Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e
2017-01-10 16:11:33 -08:00
TreeHugger Robot
917bb57021
Merge "Move getActiveScorerPackage() to the score service."
2017-01-11 00:11:28 +00:00
Robert Sesek
15fe73846c
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e
...
am: df781cc514
2017-01-10 23:52:13 +00:00
Amith Yamasani
61019113c4
Add missing break statement to fix cts test
...
Fix CTS test LocalVoiceInteractionTest#testLifecycle
Fixes: 34194821
Test: cts-tradefed run commandAndExit cts --skip-device-info
--skip-system-status-check --abi=armeabi-v7a -m
CtsVoiceInteractionTestCases -t
android.voiceinteraction.cts.LocalVoiceInteractionTest#testLifecycle
Change-Id: If14126e645b2d0a1307404e2f50088b3994abce2
2017-01-10 15:45:00 -08:00
Alison Cichowlas
5cc5d8a3e9
Add a required main category for multi logs.
...
Test: updated LogBuilderTest
Change-Id: Ia5359e12a7a84af31d9a966f2c81fc943aadfbdb
2017-01-10 18:44:09 -05:00
