OSDN Git Service
Wale Ogunwale [Thu, 22 Jun 2017 19:58:40 +0000 (19:58 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I50d3778a7874656803a38594c0cdb1a5f95be123
TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
Christopher Ferris [Thu, 22 Jun 2017 18:40:30 +0000 (18:40 +0000)]
Merge "Add a common call when wrapping an app." am:
12e0975963
am:
bb6cf84a40
Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd
Christopher Ferris [Thu, 22 Jun 2017 18:32:22 +0000 (18:32 +0000)]
Merge "Add a common call when wrapping an app."
am:
12e0975963
Change-Id: I81830a6d826cd109c99f6e857204f96da9d4a656
Christopher Ferris [Thu, 22 Jun 2017 18:22:07 +0000 (18:22 +0000)]
Merge "Add a common call when wrapping an app."
Lucas Dupin [Thu, 22 Jun 2017 17:42:17 +0000 (17:42 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: I6eb862d98fb45a07ce07894e4afd5e0b33befa5d
Wale Ogunwale [Thu, 22 Jun 2017 16:08:14 +0000 (09:08 -0700)]
Added more systrace points to window manager
To help debug performance issues
Test: external/chromium-trace/systrace.py -t 3
Bug:
62796190
Change-Id: Ie6012a895174053c4732fb58b9365546fdb979de
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Jason Monk [Thu, 22 Jun 2017 15:45:37 +0000 (15:45 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: If4957d57dd68bbbd459245c35ca8d049504e12bd
TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
Paul Duffin [Thu, 22 Jun 2017 14:39:08 +0000 (14:39 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8
am:
34dc5a58b3
Change-Id: I546ea542d0781f825e131eb94bc54e22adadfc4e
Paul Duffin [Thu, 22 Jun 2017 14:29:01 +0000 (14:29 +0000)]
Merge "Ensure that android.test tests pass"
am:
156775fea8
Change-Id: I7fe4f45bd98acea016e02b44a4df38f0e907c0e4
Treehugger Robot [Thu, 22 Jun 2017 14:17:16 +0000 (14:17 +0000)]
Merge "Ensure that android.test tests pass"
Jason Monk [Thu, 22 Jun 2017 13:19:54 +0000 (09:19 -0400)]
Fix ConcurrentModificationException from LocationController
Test: runtest systemui
Change-Id: I0b7db7344217b3b7ad91f315100d1873e8167baf
Fixes:
62859544
Paul Duffin [Thu, 22 Jun 2017 11:52:18 +0000 (12:52 +0100)]
Ensure that android.test tests pass
It looks as though the tests in test-runner/tests have not actually been
run successfully for over 7 years. As a result they have degraded. This
change fixes the tests so that they will pass and provides instructions
on how to run them.
TestCaseUtilTest.testGetTestCaseNamesForTestSuiteWithSuiteMethod
This fails because it expected 2 names to be returned but only
returns 0. The reason for that is although TwoTestsInTestSuite has a
Test suite() method that does create a TestSuite with two tests the
TestCaseUtil method does not actually call suite(). Instead, because
TwoTestsInTestSuite is a TestSuite it just calls the tests() method
on it which returns an empty Enumeration because TwoTestsInTestSuite
is empty.
The support for "static Test suite() {}" is broken but fixing this
will affect the behavior of InstrumentationTestRunner which is used
in thousands of different places both in and outside Google and so
could cause untold problems.
TestSuiteBuilderTest.testIncludeAllPackagesUnderHere
Reformat the list, one per line and then add missing name
"testPublicConstructor".
ErrorTest/FailingTest
These tests are not meant to be run on their own, only as part of a
separate test. The RunAsPartOfSeparateTest annotation was added to
allow these to be excluded using notAnnotation as shown in the
instructions for running the tests.
Bug:
30188076
Test: followed new instructions in test-runner/tests/Android.mk
Change-Id: I60e7bee9cd08a9ab7777a2578fc58da772de5c1f
Erik Kline [Thu, 22 Jun 2017 11:34:29 +0000 (11:34 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038 -s ours
Change-Id: I1e1df0a71687c7156adcb2dd38016e07bb908713
TreeHugger Robot [Thu, 22 Jun 2017 11:27:28 +0000 (11:27 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
Narayan Kamath [Thu, 22 Jun 2017 10:37:47 +0000 (10:37 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: I8314fcf2fc2fab8f8b4db84cec89efbc6c08660e
Narayan Kamath [Thu, 22 Jun 2017 10:32:28 +0000 (10:32 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
Erik Kline [Thu, 22 Jun 2017 09:46:13 +0000 (09:46 +0000)]
Only disable Wi-Fi IP serving on specific interface, if available
am:
c8b180116d -s ours
Change-Id: If6064345828691ffcad1f1498a0d7940eff5486d
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
(cherry picked from commit
b912c50b197cc0fc49bb7897130581dd02d2af01)
Hugo Benichi [Thu, 22 Jun 2017 08:03:46 +0000 (08:03 +0000)]
Merge "ConnectivityManager: fix style issue" am:
e74f3adba5
am:
ec54a40339
Change-Id: I5a420534268a0daec19f1f0677dcfe7abd8faf73
Hugo Benichi [Thu, 22 Jun 2017 07:56:32 +0000 (07:56 +0000)]
Merge "ConnectivityManager: fix style issue"
am:
e74f3adba5
Change-Id: I0c41dedac1d1e947a3d614ccea85ef48dc011c34
Treehugger Robot [Thu, 22 Jun 2017 07:46:34 +0000 (07:46 +0000)]
Merge "ConnectivityManager: fix style issue"
Joel Scherpelz [Thu, 22 Jun 2017 06:48:09 +0000 (06:48 +0000)]
Merge "Use RFC 7217 stable privacy addresses" am:
a88b12ce5e
am:
4c4d5477d4
Change-Id: I7f286484a31c7209e48e93a94d2a16849af6dace
Joel Scherpelz [Thu, 22 Jun 2017 06:41:01 +0000 (06:41 +0000)]
Merge "Use RFC 7217 stable privacy addresses"
am:
a88b12ce5e
Change-Id: I3b79ecd87233db0b4242e8c02355d83686d27e6e
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: Id8d9c3f67f7a850af69069abee86adfc62841b28
Merged-In: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Merged-In: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
(cherry picked from commit
218c226b0882640a351deb0dd945a30b8bc32fff)
Joel Scherpelz [Thu, 22 Jun 2017 06:34:28 +0000 (06:34 +0000)]
Merge "Use RFC 7217 stable privacy addresses"
Brian Carlstrom [Thu, 22 Jun 2017 05:14:40 +0000 (22:14 -0700)]
_exit(0) on clean shutdown, not _exit(1)
Test: m -j32 checkbuild
Bug:
36066697
Change-Id: Iaed45a86f9603badf26041212dfc5e9399bc0a0c
Erik Kline [Thu, 22 Jun 2017 04:59:53 +0000 (04:59 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
am:
c0af382a25 -s ours
Change-Id: I20a865bc4e652757acfe2c7a6680fdc2b4f5ea2a
TreeHugger Robot [Thu, 22 Jun 2017 04:52:32 +0000 (04:52 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
Joel Scherpelz [Wed, 7 Jun 2017 06:38:38 +0000 (15:38 +0900)]
Use RFC 7217 stable privacy addresses
Ask Netd to setup WiFi interfaces to use stable privacy addresses. This
should fail benignly on devices with kernels lacking RFC 7217 support.
Test: as follows
- built
- flashed
- booted
- Manually observed persistent stable secret
- Manually observed randomized IPv6 addresses (with flags = 800)
Bug:
17613910
Change-Id: I9465de16685b1eb0fd842446a530cf98d77a0c28
Felipe Leme [Thu, 22 Jun 2017 03:16:42 +0000 (03:16 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
am:
6358cdcd28
Change-Id: I57f715b886515d53c25104b9952597a961fb3ca2
TreeHugger Robot [Thu, 22 Jun 2017 03:11:17 +0000 (03:11 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
Erik Kline [Wed, 26 Apr 2017 02:11:07 +0000 (11:11 +0900)]
Refactor TISM add/remove code
This de-duplicates all the TISM adding and teardown code.
It does not yet change the locking or threading semantics.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
- manual tethering of WiFi and USB start normally
Bug:
32163131
Bug:
36216864
Bug:
62343300
Merged-In: I8ed82272183022a0469011a1f993704ecf771e3f
Merged-In: Ic1bcb3ca011bdc886086f34be18409eb5b12f521
Merged-In: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
Change-Id: I44a57660d23e76a7c13368cb8f60eaeac5830a0a
(cherry picked from commit
4dd9bb83e2779b309dcc7a7db389b16fa3cb05be)
Amith Yamasani [Thu, 22 Jun 2017 01:20:36 +0000 (01:20 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
am:
78f3a0f722
Change-Id: Ib58abc3ef4eb3c525af9ec2bb6f66e794b659030
TreeHugger Robot [Thu, 22 Jun 2017 01:14:12 +0000 (01:14 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
Felipe Leme [Thu, 22 Jun 2017 00:33:41 +0000 (17:33 -0700)]
Autofill fixes for secondary users:
- Display the SaveUI on all users.
- Dismiss the UI when switching users.
- Fix security check on disableOwnedAutofillServicesLocked()
Test: manual verification
Change-Id: I4e9167314f1feeda618db6c57735cc31d84486c1
Fixes:
62828906
Christopher Ferris [Tue, 20 Jun 2017 23:13:40 +0000 (16:13 -0700)]
Add a common call when wrapping an app.
When an application is wrapped using setprop wrap.<application>, it
doesn't set the special zygote flag, or make the mallopt call. This
means that a wrapped application will behave differently, and not
be able to track zygote native allocations versus app native allocations.
This CL adds a nativePreApplicationInit call that is used after the
Zygote is forked, and when a wrapped application is called.
Bug:
62068500
Test: Booted sailfish system. Verified that the zygote has not called
Test: the new function. Verified the function is called when a wrapper
Test: is used. Verified the function is called when the Zygote forks
Test: a process.
Change-Id: I392e1b5429be77def63f7815b072d68e9408cc7f
(cherry picked from commit
2980de4a59db048851fbbac9cd847a96a12fa4ec)
fionaxu [Wed, 21 Jun 2017 21:50:47 +0000 (21:50 +0000)]
resolve merge conflicts of
4ff3cf1eca71 to stage-aosp-master
am:
ec573fddcb
Change-Id: I2a561ee6c35b339f5e1790a6995dc56e53933207
Pavel Grafov [Wed, 21 Jun 2017 21:24:47 +0000 (21:24 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5
Pavel Grafov [Wed, 21 Jun 2017 21:18:31 +0000 (21:18 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
Rob Carr [Wed, 21 Jun 2017 21:08:31 +0000 (21:08 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I9ed40cbf0724627bcc89a2dd305ba61f206570e0
Amith Yamasani [Wed, 21 Jun 2017 21:06:44 +0000 (14:06 -0700)]
Clarify startScan API on how to get results
Make it clear in BluetoothLeScanner on how to get results
when starting a scan for a PendingIntent.
Bug:
38365430
Test: make offline-sdk-docs
Change-Id: I0bf88d751c89a8a478db985713357e153ac08595
Rob Carr [Wed, 21 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
Lucas Dupin [Wed, 21 Jun 2017 18:58:31 +0000 (11:58 -0700)]
Ensure icon contrast on the shelf
Change-Id: Ie9251ae4bdb4b590ce93c7f2f092476d5f895b5a
Fixes:
62591326
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
fionaxu [Wed, 21 Jun 2017 20:50:51 +0000 (13:50 -0700)]
resolve merge conflicts of
4ff3cf1eca71 to stage-aosp-master
Change-Id: Id8b10a739e6a313d74908d7fd7068d53ccf994a5
Bill Yi [Wed, 21 Jun 2017 20:25:08 +0000 (20:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: I219b010519c5efae20ca065ca29257a1f876fd7e
TreeHugger Robot [Wed, 21 Jun 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Iaa7d2555bdcab5be052515f8f5d9c5c38360b4e9
TreeHugger Robot [Wed, 21 Jun 2017 19:51:45 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Evan Laird [Wed, 21 Jun 2017 19:42:21 +0000 (19:42 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev
am:
6a651f81b5
Change-Id: Ie1fc63cf41efbe8006dad8ab80217f7d945b2de7
Evan Laird [Wed, 21 Jun 2017 19:31:22 +0000 (19:31 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev
Evan Laird [Tue, 20 Jun 2017 20:10:44 +0000 (16:10 -0400)]
Fix mobile signal icon when in airplane mode
1. Empty state was drawing a line too thing and not dark enough to be
seen.
2. Airplane mode should be the slashed, full signal, not the
empty one
Going into airplane mode now draws the full signal, lighter than normal,
with a slash. And the empty state now has a thicker line.
Test: runtest systemui
Fixes:
62794461
Change-Id: Ic5e40d2e0f6ebe0d270129f10883a1fcb146d717
Selim Cinek [Wed, 21 Jun 2017 19:07:12 +0000 (19:07 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
am:
e8dceabd98
Change-Id: I8f6b3e2f853ff5a066de02ae0a006ebb4f157078
Selim Cinek [Wed, 21 Jun 2017 18:58:02 +0000 (18:58 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
am:
b792f98446
Change-Id: I7d4a437367d40492effa95fcd0970389da7db592
TreeHugger Robot [Wed, 21 Jun 2017 18:57:42 +0000 (18:57 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
Selim Cinek [Wed, 21 Jun 2017 18:48:53 +0000 (18:48 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
Jean-Michel Trivi [Wed, 21 Jun 2017 17:23:30 +0000 (17:23 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am:
9f1494368b
Change-Id: Iaa671d4c7008609f0be7430b8f6c35f1021c7586
Chen Xu [Wed, 21 Jun 2017 17:21:37 +0000 (17:21 +0000)]
Merge "migrate roaming operator configs to carrierconfig"
fionaxu [Fri, 2 Jun 2017 01:52:17 +0000 (18:52 -0700)]
migrate roaming operator configs to carrierconfig
Bug:
37885668
Test:runtest --path
packages/apps/CarrierConfig/tests/src/com/android/carrierconfig/CarrierConfigTest.java
Change-Id: Ic669581243a7a640f9ac1b5155954514168cd14b
Merged-In: Ic669581243a7a640f9ac1b5155954514168cd14b
Jean-Michel Trivi [Wed, 21 Jun 2017 17:15:31 +0000 (17:15 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
Bill Yi [Wed, 21 Jun 2017 16:53:11 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieea78949e86d21bf8be5b0ef974a74c53b6cd63c
Auto-generated-cl: translation import
Selim Cinek [Wed, 21 Jun 2017 16:44:52 +0000 (09:44 -0700)]
Fixed a bug where the panel could be stuck
Test: collapse the panels, let go, tap quickly, panel isn't stuck
Bug:
62602000
Change-Id: I449bcd4a6207c054eb5d536ba48ff8f05e26eb9a
Selim Cinek [Wed, 21 Jun 2017 16:01:26 +0000 (09:01 -0700)]
Fixed a a11y regression to click notifications
Test: add notification, try clicking it on the lockscreen with talkback
Change-Id: I27dd75cab6bfdff3f534c31ebfb4df7a43129a6d
Fixes:
62767220
Paul Duffin [Wed, 21 Jun 2017 09:18:01 +0000 (09:18 +0000)]
Merge "Cleanup a.t.TestGrouping" am:
01dcf54e9a
am:
e6ac3a4efc
Change-Id: Id41ba23de38e5131460cad283fd5d7bea66d2156
Paul Duffin [Wed, 21 Jun 2017 09:11:24 +0000 (09:11 +0000)]
Merge "Cleanup a.t.TestGrouping"
am:
01dcf54e9a
Change-Id: I58a278b7c45afe27309cf0029e9fb8fd452b22f2
Treehugger Robot [Wed, 21 Jun 2017 09:03:26 +0000 (09:03 +0000)]
Merge "Cleanup a.t.TestGrouping"
Android Build Merger (Role) [Wed, 21 Jun 2017 08:20:47 +0000 (08:20 +0000)]
Merge "Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am:
88f98985d5" into oc-dev-plus-aosp
Chad Brubaker [Wed, 21 Jun 2017 08:19:51 +0000 (08:19 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
am:
88f98985d5
Change-Id: Ifc85ffb37f139cd499fd2ebef4cfc6f6d9fcd932
Paul Duffin [Wed, 21 Jun 2017 08:16:42 +0000 (08:16 +0000)]
Merge "Remove unused a.t.InstrumentationUtils" am:
0e4f1358d6
am:
08c12d21f5
Change-Id: I46ab06228623aa4e350b1285761e062e1d7393c0
TreeHugger Robot [Wed, 21 Jun 2017 08:14:06 +0000 (08:14 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
Paul Duffin [Wed, 21 Jun 2017 08:13:05 +0000 (08:13 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner" am:
9d5576e081
am:
66b8ef6615
Change-Id: I3ca3f23c2f8a741daf867aad08f57bac373e5d91
Paul Duffin [Wed, 21 Jun 2017 08:07:14 +0000 (08:07 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder" am:
1935dce8eb
am:
a4d2464189
Change-Id: I88278d5cfd8fc3466cce39de3de54e34d67cbe0f
Paul Duffin [Wed, 21 Jun 2017 08:03:58 +0000 (08:03 +0000)]
Merge "Remove unused a.t.InstrumentationUtils"
am:
0e4f1358d6
Change-Id: Id4f1845ec46d9b79fbfbc8a7ca6f75279fef69f0
Paul Duffin [Wed, 21 Jun 2017 08:03:56 +0000 (08:03 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils" am:
3724e7e5e9
am:
e6e0601862
Change-Id: I2c5e4c7af30893d9183ee35326814fcb4506d0e8
Paul Duffin [Wed, 21 Jun 2017 08:00:45 +0000 (08:00 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner"
am:
9d5576e081
Change-Id: I376079be6f5e56adf51fec62ed3f89969029c0a1
Paul Duffin [Wed, 21 Jun 2017 07:57:54 +0000 (07:57 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
am:
1935dce8eb
Change-Id: If6e86d76bd8dfca6e91cc6eeda20cd1492980b1e
Paul Duffin [Wed, 21 Jun 2017 07:55:06 +0000 (07:55 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils"
am:
3724e7e5e9
Change-Id: Iebf38b15aaae0317935fe00e07d00cf806ab5942
Paul Duffin [Wed, 21 Jun 2017 07:46:41 +0000 (07:46 +0000)]
Merge "Remove unused a.t.InstrumentationUtils"
Paul Duffin [Wed, 21 Jun 2017 07:46:04 +0000 (07:46 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner"
Paul Duffin [Wed, 21 Jun 2017 07:46:02 +0000 (07:46 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
Paul Duffin [Wed, 21 Jun 2017 07:46:00 +0000 (07:46 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils"
Erik Kline [Wed, 21 Jun 2017 07:20:54 +0000 (07:20 +0000)]
Merge "Always allow Ethernet to be an upstream" am:
ecbe6fa147
am:
9cec380720
Change-Id: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Erik Kline [Wed, 21 Jun 2017 07:13:46 +0000 (07:13 +0000)]
Merge "Always allow Ethernet to be an upstream"
am:
ecbe6fa147
Change-Id: Ic9fd4bfd6ba7ecc00552019f804b87bc203ea98a
Treehugger Robot [Wed, 21 Jun 2017 07:06:47 +0000 (07:06 +0000)]
Merge "Always allow Ethernet to be an upstream"
Chad Brubaker [Wed, 21 Jun 2017 06:13:21 +0000 (23:13 -0700)]
Allow Instant Apps to call getPermissionControllerPackageName
This is needed for requesting permissions to work.
Bug:
62791664
Test: Requesting a runtime permission doesn't crash the app
Change-Id: If18ac8e4c903f3804ec24df39d169fa9145f449e
Erik Kline [Thu, 9 Mar 2017 02:44:11 +0000 (11:44 +0900)]
Always allow Ethernet to be an upstream
If there are any upstream types defined at all, make sure that
either TYPE_ETHERNET is included somewhere within the sorted list
or force it to be at the front.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
Felipe Leme [Wed, 21 Jun 2017 04:02:25 +0000 (04:02 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am:
4f7fd183eb
Change-Id: Id26a5cdd53035eb94d4de3c0acf4378268b24c2e
Felipe Leme [Wed, 21 Jun 2017 04:00:28 +0000 (04:00 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc.
am:
2e30c6f371
Change-Id: Ib4722f448f977e79d6d9dd8e3132db7167e91b03
TreeHugger Robot [Wed, 21 Jun 2017 03:45:42 +0000 (03:45 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
* changes:
Don't add FillEventHistory events to the wrong session.
Fixed how FillEventHistory is reset and clarified javadoc.
Bill Yi [Wed, 21 Jun 2017 02:17:54 +0000 (19:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib1ae1095e37590fb2fa8091a17d37ea233ac1dc3
Auto-generated-cl: translation import
Dianne Hackborn [Wed, 21 Jun 2017 02:02:48 +0000 (02:02 +0000)]
Merge "Small doc fix." into oc-dev
am:
0f98ddaa01
Change-Id: Ib0da1db5f79b054f3826e0b3b3d0d3e4716530f2
TreeHugger Robot [Wed, 21 Jun 2017 01:58:56 +0000 (01:58 +0000)]
Merge "Small doc fix." into oc-dev
Rob Carr [Wed, 21 Jun 2017 01:56:41 +0000 (01:56 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev
am:
70f1565b55
Change-Id: Id6fa287aa7c7edb2fd59a3bcbeef2aade35961e7
Rob Carr [Wed, 21 Jun 2017 01:47:51 +0000 (01:47 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev
Svetoslav Ganov [Wed, 21 Jun 2017 01:19:42 +0000 (01:19 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
am:
324c41ba89
Change-Id: Ia774a4f3bd1af7c334b2844f87fa8850de48f2f7
Svetoslav Ganov [Wed, 21 Jun 2017 01:06:14 +0000 (01:06 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev
Felipe Leme [Wed, 21 Jun 2017 00:15:45 +0000 (17:15 -0700)]
Don't add FillEventHistory events to the wrong session.
The AutofillSession.getFillEventHistory() method returns only the event history
for the last onFillRequest(). In the scenario where the user switches
activities and the server has multiple sessions open, only the events for the
last session should be recorded.
Test: existing CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.checkFillSelectionFromPreviousSessionIsDiscarded
Fixes:
62802026
Change-Id: I447ed77c2167095867b35d616b5cf2ae43aa28db
Robert Carr [Wed, 21 Jun 2017 00:26:06 +0000 (17:26 -0700)]
Create Splash Screen context with CONTEXT_RESTRICTED.
It seems we need to do this to prevent loading and parsing
of downloadable fonts.
Bug:
62813533
Test: go/wm-smoke
Change-Id: I9bf9cfac7feba955217e0f3a0fcaa0d7e09d5991