314553 Commits

Author SHA1 Message Date
TreeHugger Robot
13d03e504d Merge "Address API feedback for new fragment APIs" into oc-dev 2017-04-27 22:18:11 +00:00
TreeHugger Robot
f9dc09f4ea Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev 2017-04-27 22:10:49 +00:00
Sujith Ramakrishnan
b4f21f0482 Merge "Updated intent action name to comply with CTS." into oc-dev 2017-04-27 22:10:09 +00:00
Chris Tate
cfdc7eb87c Merge "Fix 'jobscheduler run' shell command" into oc-dev 2017-04-27 22:03:57 +00:00
TreeHugger Robot
a851b5ae76 Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev 2017-04-27 21:44:56 +00:00
TreeHugger Robot
b71f3ca3f0 Merge "new reset carrier signals/actions" into oc-dev 2017-04-27 21:35:47 +00:00
Evan Rosky
d0c6cf9bc0 Merge "Only restrict arrows out of text fields from keyboard" into oc-dev 2017-04-27 21:28:13 +00:00
TreeHugger Robot
e669ae438f Merge "Use invalid package names for special keys in AccountManager." into oc-dev 2017-04-27 21:23:40 +00:00
Jorim Jaggi
560324cfa0 Merge "Implement API council feedback for dismissKeyguard" into oc-dev 2017-04-27 20:57:11 +00:00
Sudheer Shanka
7e7f7d526d Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev 2017-04-27 20:47:09 +00:00
Bryce Lee
d08c064976 Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev 2017-04-27 20:41:36 +00:00
Sudheer Shanka
8dd177c4e8 Merge "Update VIMS internal state when a packge is modified." into oc-dev 2017-04-27 20:31:09 +00:00
Sujith Ramakrishnan
48e19c8cc9 Updated intent action name to comply with CTS.
- Updated "android.intent.action.GLOBAL_BUTTON" to
	  @SystemApi

Test: manual - Bottom button on Fugu brings up pairing screen
Test: manual - GUIDE button on Fugu brings up TV channels app

Bug: 37499047
Change-Id: I3b92ed99aeb53674fbaac91126e8c5e7fcffa715
2017-04-27 13:26:43 -07:00
Tima Vaisburd
9c14b91aa9 Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev 2017-04-27 20:22:15 +00:00
TreeHugger Robot
3a4987bbe7 Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev 2017-04-27 20:21:49 +00:00
TreeHugger Robot
898b0cb39a Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev 2017-04-27 20:10:54 +00:00
Makoto Onuki
301663a61b Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev 2017-04-27 20:03:22 +00:00
TreeHugger Robot
54e534d6e7 Merge "Use InetAddress instead of String in network events." into oc-dev 2017-04-27 19:53:58 +00:00
Adam Powell
10d69ac250 Address API feedback for new fragment APIs
Framework edition

Bug: 37637473
Bug: 37636731
Bug: 37638276

Test: run fragment tests
Change-Id: I3e77ab51d60f5a550d60701fc81a84e143a53244
2017-04-27 12:35:15 -07:00
Chad Brubaker
a9d0e6b205 Merge "Allow apps to provide the Instant App installer extra information" into oc-dev 2017-04-27 19:30:57 +00:00
Dmitry Dementyev
cbe1bd1d42 Use invalid package names for special keys in AccountManager.
Bug: 37672088
Test: cts, manual.
Change-Id: I7fd40e0646a50f809b5c9b89dfe4242ceb00195d
2017-04-27 19:15:57 +00:00
Christopher Tate
851a35abe8 Fix 'jobscheduler run' shell command
Tidying up the locking + deferred-work shape of the job scheduler's
internal flow inadvertently meant that we were now trying to bind to
a job service while under the shell user's uid when the relevant
shell command was used to kick off the job.  Now we don't do that.

Bug 37744607
Test: manual

Change-Id: Ia4b83f83f9fbd2e5678eaa279f1d86206fb05023
2017-04-27 12:14:20 -07:00
TreeHugger Robot
38439169bd Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev 2017-04-27 19:03:24 +00:00
Andrii Kulian
0dca566677 Merge "Report correct display id in stack info" into oc-dev 2017-04-27 18:18:33 +00:00
Andrii Kulian
bfe5aa23e8 Merge "Hide onMovedToDisplay callback" into oc-dev 2017-04-27 18:09:17 +00:00
fionaxu
982799eb08 new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
2017-04-27 11:07:54 -07:00
Pavel Grafov
a6ea92097c Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.

Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.

Bug: 37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
2017-04-27 18:53:11 +01:00
TreeHugger Robot
e6746726bc Merge "Revise method comment on setFontVariationSettings" into oc-dev 2017-04-27 17:34:48 +00:00
David Farrow
6986e8a1ba Merge "documentation fixes" into nyc-mr1-dev am: 14826e5489 am: b1e3d9ab26
am: 4ea763ad8a

Change-Id: I1b3005ef17b9d54e1f9b9c75138d214e80fc414c
2017-04-27 17:28:28 +00:00
Rubin Xu
71e0fcbf2f Merge "Reduce scrypt time in synthetic password flow" into oc-dev 2017-04-27 17:25:00 +00:00
Doris Liu
f4063d4201 Merge "Refine JavaDocs for AnimatorSet#getCurrentPlayTime()" into oc-dev 2017-04-27 17:20:23 +00:00
David Farrow
4ea763ad8a Merge "documentation fixes" into nyc-mr1-dev am: 14826e5489
am: b1e3d9ab26

Change-Id: I4f2682c11384a9f656054b95cfba56132085634a
2017-04-27 17:19:21 +00:00
David Farrow
b1e3d9ab26 Merge "documentation fixes" into nyc-mr1-dev
am: 14826e5489

Change-Id: I18df5f88d8f72ec74e62b39a056459e4e715b9db
2017-04-27 17:09:26 +00:00
Mady Mellor
aa94a61c56 Merge "Improve swipe to show notification menu gesture" into oc-dev 2017-04-27 17:01:30 +00:00
David Farrow
14826e5489 Merge "documentation fixes" into nyc-mr1-dev 2017-04-27 17:01:15 +00:00
TreeHugger Robot
039dcadc88 Merge "Use ActivityRecord.realActivity when comparing waiting visible" into oc-dev 2017-04-27 16:43:05 +00:00
TreeHugger Robot
b258552a1c Merge "Support profile global restrictions in disclosure messages." into oc-dev 2017-04-27 16:23:06 +00:00
Jorim Jaggi
f41e7664a2 Implement API council feedback for dismissKeyguard
Test: KeyguardLockedTests CTS
Change-Id: Ibc6923ebe8363644e9b52b2b53b45d918124f52d
Fixes: 37673408
2017-04-27 17:58:59 +02:00
Derek Sollenberger
0f89539de6 Disable Vulkan backend when running hwui_unit_tests.
The Vulkan backend fails to run on devices without vulkan drivers.
Until we can stub out the vulkan drivers for those devices we find
an acceptable solution.

Test: hwui_unit_tests on device w/out vulkan
Bug: 37422708
Change-Id: I3d7c21882053459f25ca1eb5648cdf5dfd4c333e
2017-04-27 11:30:20 -04:00
Julia Reynolds
04225787d8 Merge "New constant for new settings screen." into oc-dev 2017-04-27 15:11:37 +00:00
Stefan Ramsauer
ba9ab17434 Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev 2017-04-27 15:09:26 +00:00
Julia Reynolds
80b180761d New constant for new settings screen.
Bug: 36561295
Test: make
Change-Id: I0e2ec6d7b372a9594f8b583540804dde1b79de1a
2017-04-27 14:52:04 +00:00
Jason Monk
24370bfd30 Merge "Revert "Status bar updates" DO NOT MERGE" into oc-dev 2017-04-27 14:43:55 +00:00
Jason Monk
7e6c83c752 Revert "Status bar updates" DO NOT MERGE
Test: runtest systemui
Fixes: 37626598
This reverts commit d1ba5fbb54a02fad0c68f71183078527bfa9bd49.

Change-Id: I12c70b67fafd46ec98b1c1ee28b911e19afbf6e5
2017-04-27 14:24:35 +00:00
George Mount
4a71842dbd Merge "Address API council feedback." into oc-dev 2017-04-27 14:06:16 +00:00
TreeHugger Robot
a97608caa8 Merge "SmartSelection: Use downloaded model file." into oc-dev 2017-04-27 13:50:58 +00:00
Jason Monk
2cddbcaa0f Merge "Guard against incorrect context use." into oc-dev 2017-04-27 13:46:54 +00:00
Narayan Kamath
2e0e7f3c94 Merge "Track libcore change 03e8c7dca78a95ccf719a7." into oc-dev 2017-04-27 13:30:35 +00:00
TreeHugger Robot
28f9ada2ac Merge "Create a metrics events for ag/2085657 (DO disclosure screens)" into oc-dev 2017-04-27 13:26:26 +00:00
Denis Kuznetsov
605beddfee Create a metrics events for ag/2085657 (DO disclosure screens)
Bug: 32692748
Test: Tests for functional changes are in ag/2085657
Change-Id: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
Merged-In: I6988a950ab2aa78dcb3f848b59a5b0905da7b204
(cherry picked from commit 7152a41d25f0296ec5ed41c497f7666e185890eb)
2017-04-27 11:35:01 +00:00