Commit Graph

74866 Commits

Author SHA1 Message Date
TreeHugger Robot
997eafcbf2 Merge "Expose grantPermission via systemApi." 2017-08-18 17:05:19 +00:00
TreeHugger Robot
0f9774e1d9 Merge "Cleaned up the permission checks in NetworkScoreService" 2017-08-18 16:20:43 +00:00
Casey Burkhardt
4262286fda Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev am: 8e74686fb4
am: 58770c5759

Change-Id: I65262bf2903b72d60bb4d9cef5be145d8f1f0acd
2017-08-18 01:11:03 +00:00
Jakub Pawlowski
ab9f2f7dac Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" am: b7cbb2fe49 am: 5d0f5f46ef am: 915c02c96a am: cc1916b54b
am: d6825181d6

Change-Id: Ic6bef3ee6232582843100e40ca01aa5faf01e5c8
2017-08-18 00:40:46 +00:00
Casey Burkhardt
58770c5759 Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev
am: 8e74686fb4

Change-Id: I1db829cce2962e526892ae486ff9567003051a8b
2017-08-18 00:33:16 +00:00
Doris Liu
f374446100 Merge "Expose necessary methods/fields to CTS using testApi" 2017-08-18 00:30:14 +00:00
Siyamed Sinir
f72d320add Merge "Fix email auto link when there are two chars in local part" into oc-mr1-dev
am: 3b0fd066f1

Change-Id: I4e36605dd2d9ee98760db9e9baadc9304c184a60
2017-08-18 00:15:30 +00:00
Jakub Pawlowski
d6825181d6 Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" am: b7cbb2fe49 am: 5d0f5f46ef am: 915c02c96a
am: cc1916b54b

Change-Id: I343937d76693e62a47ece76b2b3c980e485803fd
2017-08-17 23:56:32 +00:00
Casey Burkhardt
8e74686fb4 Merge "Make isAccessibilityButtonSupported public" into oc-mr1-dev 2017-08-17 23:50:43 +00:00
Siyamed Sinir
3b0fd066f1 Merge "Fix email auto link when there are two chars in local part" into oc-mr1-dev 2017-08-17 23:39:10 +00:00
Jakub Pawlowski
ebd94d7cea Merge "Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b am: 94cd5b22c1 am: b77581725f" into oc-mr1-dev-plus-aosp
am: 0374973a74

Change-Id: I862b5e5048c225f84494b8329f3b85fbaa754c20
2017-08-17 23:38:42 +00:00
Jakub Pawlowski
cc1916b54b Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" am: b7cbb2fe49 am: 5d0f5f46ef
am: 915c02c96a

Change-Id: I450e1edba62e39d972dd87fd3fed9d359919b3a8
2017-08-17 23:28:31 +00:00
Jakub Pawlowski
766addf837 Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b am: 94cd5b22c1
am: b77581725f

Change-Id: I4452d4097e59781119c9286e67ecfa94a77d4eab
2017-08-17 23:22:12 +00:00
Jakub Pawlowski
915c02c96a Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" am: b7cbb2fe49
am: 5d0f5f46ef

Change-Id: I063ce05f79b4feb518dc34c9a4651e96f65b324e
2017-08-17 23:16:59 +00:00
Jakub Pawlowski
b77581725f Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b
am: 94cd5b22c1

Change-Id: Ib20ddd31af4653133646b63c07108bcb924b3569
2017-08-17 23:09:32 +00:00
Jakub Pawlowski
5d0f5f46ef Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails"
am: b7cbb2fe49

Change-Id: I5ccf67621134fe1ba9204e2a8f3502ffacef0315
2017-08-17 23:06:14 +00:00
Jakub Pawlowski
94cd5b22c1 Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59
am: e9fe99571b

Change-Id: Ideb592bf11e483494b892f7b04bb156f323746ac
2017-08-17 22:58:02 +00:00
Treehugger Robot
b7cbb2fe49 Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" 2017-08-17 22:51:23 +00:00
Jakub Pawlowski
e9fe99571b Merge "Bluetooth: Fix startAdvertisingSet error handling"
am: ed12213b59

Change-Id: I093e849e910428c521e73072121dfdfdceb28e0d
2017-08-17 22:47:38 +00:00
Hugo Benichi
322df2899b Merge "Add convenience methods to IpPrefix and LinkAddress" into oc-mr1-dev 2017-08-17 22:31:59 +00:00
Jeremy Joslin
1588b3b034 Cleaned up the permission checks in NetworkScoreService
Refactored the existing code into 3 permission check methods
to clear up what was being checked and to centralize the logic.

Bug:64313251
Test: bit services FrameworksServicesTests:com.android.server.NetworkScoreServiceTest
Test: bit FrameworksWifiTests:*
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.netrec.NetRecHostTest
Change-Id: I77457ce7cf98252e83f4dfa6602da0179d638818
2017-08-17 15:19:15 -07:00
Siyamed Sinir
06e9629f00 Fix email auto link when there are two chars in local part
Email auto linking used to accept either a single char or more than 2
chars in the local part. Updated the regular expression to accept 1 or
more chars.

Test: added test to cts.LinkifyTest
Test: bit -t CtsTextTestCases:android.text.util.cts.LinkifyTest
Test: bit -t FrameworksCoreTests:android.util.PatternsTest
Test: bit -t FrameworksCoreTests:android.text.util.LinkifyTest
Test: bit -t CtsWidgetTestCases:android.widget.cts.TextViewTest

Bug: 64467661
Change-Id: I4e28a344ff1bc50da353b9490eaaec99a751bffb
(cherry picked from commit e17c5b478e)
2017-08-17 17:29:55 +00:00
Siyamed Sinir
3bc7b633f3 Merge "Fix email auto link when there are two chars in local part" 2017-08-17 17:20:33 +00:00
Julia Reynolds
33515a25cb Merge changes I36636687,I4c45f787 into oc-mr1-dev am: 54ff7e7582
am: d82e4add2a

Change-Id: I8b3eded4fb3f3e0913db1176aae1197a1020db2b
2017-08-17 16:10:59 +00:00
Julia Reynolds
d82e4add2a Merge changes I36636687,I4c45f787 into oc-mr1-dev
am: 54ff7e7582

Change-Id: I6f368c79acfc92c4ed62e7808ae5c744959069c7
2017-08-17 16:01:30 +00:00
TreeHugger Robot
54ff7e7582 Merge changes I36636687,I4c45f787 into oc-mr1-dev
* changes:
  Doc updates
  Translate default channel on locale change
2017-08-17 15:54:52 +00:00
Philip P. Moltmann
f3189e6836 Expose grantPermission via systemApi.
Test: none
Bug: 64200118
Change-Id: I9aad9959a48fb5dfb31114145c19cae1128cc33c
2017-08-17 08:38:00 -07:00
Daniel Sandler
1b5b4a9b38 Merge changes from topic "revert-injectors" into oc-mr1-dev am: d33fe05c66
am: bb143bafe2

Change-Id: Ifb14907d0ac210a247d3014235193c13c7e20263
2017-08-17 14:50:53 +00:00
Jakub Pawlowski
f73863dc29 Bluetooth: Don't throw exception when stopAdvertisingSet fails
When advertising is stopped while Bluetooth is disabled, we should not
throw any exceptions, just log the failure.
This was the default behaviour before the AdvertisingSet was introduced.

Bug: 63819108
Test: manual
Change-Id: I518e071b77b127973aee6f24fa6ced4f28bc9531
2017-08-17 07:39:02 -07:00
Daniel Sandler
bb143bafe2 Merge changes from topic "revert-injectors" into oc-mr1-dev
am: d33fe05c66

Change-Id: I7e66180252232f22e23e68b8aec7eedbd2bed82b
2017-08-17 14:37:54 +00:00
Jakub Pawlowski
f7bd6b26c7 Bluetooth: Fix startAdvertisingSet error handling
Calls to old advertising API (startAdvertising), should never throw
exceptions. Instead, it used to post failure callback. This behaviour
was accidentally modified when implementing new API. Right now, instead
of posting error callback, we throw IllegalArgumentException if we fail
to obtain BluetoothGatt object, or the call to startAdvertisingSet
fails.

This patch brings back the old behaviour to the API. It also makes new
API post callback instead of throwing exception in this error case.

Bug: 63819108
Test: manual
Change-Id: I897b99839f899ca3f3dc609918d665c8c327b777
2017-08-17 07:36:37 -07:00
Daniel Sandler
d33fe05c66 Merge changes from topic "revert-injectors" into oc-mr1-dev
* changes:
  Revert "Add API to allow apps more control over instantiation"
  Revert "Add plugin to swap out recents"
2017-08-17 14:32:40 +00:00
Casey Burkhardt
02f3b807db Make isAccessibilityButtonSupported public
Bug: 62342696
Test: Builds
Change-Id: I02082f2db349181473b2a7fd367fc8892d495fc1
2017-08-17 02:50:45 -07:00
Lorenzo Colitti
8a977784bb Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev am: c3e7f875b4
am: 9515b36ffa

Change-Id: I2b5027ed54d0847da00dbb749adfb446cb7d784d
2017-08-17 09:29:43 +00:00
Lorenzo Colitti
9515b36ffa Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev
am: c3e7f875b4

Change-Id: I026e6aa9e7b371f316c0d97c3cf5e78abc1f5263
2017-08-17 09:14:27 +00:00
TreeHugger Robot
c3e7f875b4 Merge "Tell the system when tethering offload hits a limit." into oc-mr1-dev 2017-08-17 09:06:57 +00:00
Charles He
478b2b7cbf Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev am: 8b2513e439
am: 337ee0771e

Change-Id: Ib4eca8d5ea79e5ac65496bee8390e5ce4cd8fb64
2017-08-17 08:12:56 +00:00
Charles He
337ee0771e Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev
am: 8b2513e439

Change-Id: Ie511c6f1034b75b4e797dbc0ca31c7c5c30f336e
2017-08-17 08:01:53 +00:00
Charles He
8b2513e439 Merge "Opt-out for always-on VPN: rename API." into oc-mr1-dev 2017-08-17 07:54:05 +00:00
Lorenzo Colitti
d66cf56ba6 Tell the system when tethering offload hits a limit.
Add a new tetherLimitReached method to INetworkManagementService,
and call it when the HAL notifies OffloadController because the
limit has been reached.

Bug: 29337859
Bug: 32163131
Test: builds
Test: OffloadControllerTest passes
Change-Id: I0304e555544ee18c83244672766c767cbad650a1
2017-08-17 15:33:18 +09:00
Felipe Leme
e48324fecd Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev am: 10d176009d
am: d946caaaef

Change-Id: Icff915376a79348074c2b84ef9e52cc15e27d35c
2017-08-17 06:05:30 +00:00
Selim Cinek
3315d9837e Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev am: c4ed76f527
am: c5762848c3

Change-Id: Ie695f07751d32a01c0a119be155fed8865eff486
2017-08-17 05:21:14 +00:00
Philip P. Moltmann
e066ae3661 Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev am: 4c0e55d0fc
am: a6338b9dae

Change-Id: Ia1b71dbcfd9bc5560aaa810faf26ad9c3244f783
2017-08-17 04:17:47 +00:00
Lucas Dupin
1d0eda938a Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
am: fda1152e59

Change-Id: I056fbfc35e8523f50c6194ce4b80e70eb17b8aee
2017-08-17 03:24:34 +00:00
Romain Guy
11159d15ed Merge "Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev am: ee3602595a" into oc-mr1-dev-plus-aosp
am: 9446e27025

Change-Id: Ib0068aee9bc2c4c7b605c5ba024c1fa7c0b59cf4
2017-08-17 03:17:39 +00:00
Felipe Leme
d946caaaef Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev
am: 10d176009d

Change-Id: Iee9b9acf091628992d3ceecb902695d291858438
2017-08-17 03:17:03 +00:00
TreeHugger Robot
10d176009d Merge "Revert "Dismiss Autofill Save UI when a new Activity is launched."" into oc-mr1-dev 2017-08-17 03:07:02 +00:00
Felipe Leme
ee5aa78c2e Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev am: 6598a4ed52
am: e6be222bdf

Change-Id: Ib478276e91d26e5040aa1d9e658c155a0d6224e7
2017-08-17 02:16:10 +00:00
Hugo Benichi
6e833f27aa Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.

Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.

This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.

For instance this test is now broken because hashing for InetAddress
changed.

Bug: 62988545
Bug: 62918393
Test: runtest frameworks-net, added coverage in tests
Merged-In: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Merged-In: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Merged-In: Iddfec82a08f845e728adadfa6ec58a60a078d6af
Merged-In: I8d6dd5efd226a8b1c4b05d1e1102362b58e094a1
Merged-In: Ied0cc53ac34c7c5f5539507b1979cbf9c215262e
Merged-In: I3b2b7dcb1a9a194fc08643b27bbb5a0e84e01412

(cherry picked from commit 1dfb6b6755)

Change-Id: I9a17094bfdc54b9dec671306618e132a4beb59fc
2017-08-17 11:03:24 +09:00
Selim Cinek
c5762848c3 Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev
am: c4ed76f527

Change-Id: I6750f9da0520ae03683d0887283bcb197599b9d1
2017-08-17 01:31:54 +00:00