Commit Graph

74531 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
c4ed76f527 Merge "Reducing the image sizes further for low-ram devices" into oc-mr1-dev 2017-08-17 01:27:06 +00:00
Julia Reynolds
222941267d Merge "Optionally append managed service approvals" into oc-dr1-dev
am: 445a6d42ef

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

Change-Id: I9e4770632d233d0b05d6892b5a69f2020ff908e8
2017-08-17 00:37:54 +00:00
TreeHugger Robot
445a6d42ef Merge "Optionally append managed service approvals" into oc-dr1-dev 2017-08-17 00:31:42 +00:00
David Stevens
70d1217543 Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev
am: 341cd735cb

Change-Id: Ibc06854ff0382055f1cff814f2e707531875e714
2017-08-17 00:13:06 +00:00
Philip P. Moltmann
4c0e55d0fc Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev 2017-08-16 23:49:21 +00:00
Lucas Dupin
fda1152e59 Merge "API Council feedback" into oc-mr1-dev
am: 07c83d00c9

Change-Id: I115e1145b47d97b29a988133d9ec94ebe6e39637
2017-08-16 23:38:38 +00:00
Felipe Leme
cf1ff6ca3d Revert "Dismiss Autofill Save UI when a new Activity is launched."
This reverts commit 05ea98a3f9.

Bug: 64693551

Change-Id: I8e7a7b2c5f575cee28f977ae7f3c10752a15d49c
2017-08-16 23:34:06 +00:00
Romain Guy
7d513b6538 Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev
am: ee3602595a

Change-Id: Iee7c4a40a545eefeeac0729a825e208fb03eb1b0
2017-08-16 23:24:55 +00:00
David Stevens
341cd735cb Merge "DO NOT MERGE Let external activities run when the primary display is off" into oc-mr1-dev 2017-08-16 23:15:05 +00:00
TreeHugger Robot
07c83d00c9 Merge "API Council feedback" into oc-mr1-dev 2017-08-16 22:55:52 +00:00
Felipe Leme
e6be222bdf Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev
am: 6598a4ed52

Change-Id: I525f68f43616d758ef8f9c4e21afd191d7325917
2017-08-16 22:51:52 +00:00
TreeHugger Robot
ee3602595a Merge "Hide shared buffer mode/auto refresh on Surface" into oc-mr1-dev 2017-08-16 22:49:49 +00:00
TreeHugger Robot
6598a4ed52 Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev 2017-08-16 22:10:46 +00:00
Julia Reynolds
00004c44d7 Optionally append managed service approvals
If the backup comes from a pre O device, don't wipe
preexisting managed service grants (which were introduced in O).


Merged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a
Merged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987
Test: manual, restore from N to O DR
Bug: 64232609
Change-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d
2017-08-16 20:58:49 +00:00
Lucas Dupin
69bb2bae90 Merge "Do not filter out some colors" into oc-mr1-dev
am: a9774680f8

Change-Id: I3208d426529d434a8ef3a1145e16fc6db566a874
2017-08-16 19:52:34 +00:00
TreeHugger Robot
a9774680f8 Merge "Do not filter out some colors" into oc-mr1-dev 2017-08-16 19:38:45 +00:00
Kevin Hufnagle
817b77489c Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5 am: d6d6d2cf79
am: 9c43a77971

Change-Id: I920e9f89984245a435edb3c4b28f019d8516c734
2017-08-16 19:26:45 +00:00
Kevin Hufnagle
0df906d279 Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
am: b9db19de6a

Change-Id: Ie9c9c24f0e7dc8423633e61f72473824d8ed83d1
2017-08-16 19:16:12 +00:00
Kevin Hufnagle
9c43a77971 Merge "docs: Updated ShortcutManager API reference guide." into oc-dev am: 80376a98a5
am: d6d6d2cf79

Change-Id: I63af60b006618bdd8bb74d351f9c17432f411b63
2017-08-16 19:16:10 +00:00
Kevin Hufnagle
d6d6d2cf79 Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
am: 80376a98a5

Change-Id: Iae8814e722f7861ecd96980d16c06a676c6ad1dc
2017-08-16 19:01:36 +00:00
Kevin Hufnagle
b9db19de6a Merge "docs: Updated ShortcutManager API reference guide." into oc-dev
am: 80376a98a5

Change-Id: I651865861984671961a44a21f72246f8e0ae12b8
2017-08-16 19:01:35 +00:00