Commit Graph

82374 Commits

Author SHA1 Message Date
Stephen Chen
4efd1ca536 Check contents of Bundle for ScoredNetwork.equals
Bundle just uses object equality, so this improves the equality of
ScoredNetwork by checking the contents of the bundle.

Bug: 34824590
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/ScoredNetworkTest.java

Change-Id: I1c39e574d4e1e23e0155467302be5e34076fe9a0
2017-08-22 11:09:02 -07:00
Bryce Lee
96a91f11c1 Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev am: 1327cdc53d
am: 004f9a3066

Change-Id: Ifcbb0d3fbde8f87052509d5ef0a0b57e013e2245
2017-08-18 21:55:35 +00:00
Bryce Lee
004f9a3066 Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev
am: 1327cdc53d

Change-Id: I18e0a89f4afcdaa61da289566c275a29dadc9c28
2017-08-18 21:40:44 +00:00
Bryce Lee
1327cdc53d Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev 2017-08-18 21:33:46 +00:00
Makoto Onuki
8ee6ecc1d0 Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev am: edda7ebdd9
am: 4558b89ca2

Change-Id: I0094396111cccaa5210252bbc2b9fa3eaa4d859a
2017-08-18 21:23:52 +00:00
Makoto Onuki
4558b89ca2 Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev
am: edda7ebdd9

Change-Id: Ide5189580c7b930e4aa86aa68b52460b91d6f8d7
2017-08-18 21:02:54 +00:00
TreeHugger Robot
a7d4e1d2f6 Merge "[Companion] Synchronize state access in CallbackProxy" 2017-08-18 20:56:50 +00:00
TreeHugger Robot
edda7ebdd9 Merge "Avoid potential reboot loop due to package cache" into oc-mr1-dev 2017-08-18 20:50:07 +00:00
Makoto Onuki
48e931659f Avoid potential reboot loop due to package cache
Bug: 64295061

Test: Boot (write package cache) and reboot (read package cache)
Change-Id: I5de712c9666bac71ff6121001163ebc90c4b62d0
2017-08-18 11:00:19 -07:00
Wale Ogunwale
58cb974e4e Merge "Introducing WindowConfiguration" 2017-08-18 17:46:25 +00:00
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
Wale Ogunwale
822e512127 Introducing WindowConfiguration
Used to house configurations that don't affect resources and that
we don't want to communicate to apps, but need to be propagated
along side Configuration.

Test: bit FrameworksServicesTests:com.android.server.wm.WindowConfigurationTests
Test: adb shell am instrument -w -e package com.android.server.wm com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I97de3efbe6d5e1d3b07156a8cfbce9be5eae5cb5
2017-08-18 07:57:06 -07:00
Hugo Benichi
fde112a2eb Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev 2017-08-18 11:46:22 +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
TreeHugger Robot
4a5fd86da3 Merge "Bluetooth: Fix startAdvertisingSet error handling" into oc-mr1-dev 2017-08-18 00:30:13 +00:00
TreeHugger Robot
c6e9d29308 Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails" into oc-mr1-dev 2017-08-18 00:16:46 +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
Julia Reynolds
433d3ab9f8 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0 am: 4796cf6b43
am: 30e9c9c973

Change-Id: I02a3ace673e19f738450112a9c06b1483fa648a4
2017-08-17 23:31:57 +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
Android Build Merger (Role)
0374973a74 Merge "Merge "Bluetooth: Fix startAdvertisingSet error handling" am: ed12213b59 am: e9fe99571b am: 94cd5b22c1 am: b77581725f" into oc-mr1-dev-plus-aosp 2017-08-17 23:26:08 +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
Julia Reynolds
30e9c9c973 Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0
am: 4796cf6b43

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f
2017-08-17 23:20:57 +00:00
Android Build Merger (Role)
d80b81ff83 Merge "Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5d0" into oc-dr1-dev-plus-aosp 2017-08-17 23:19:13 +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
Julia Reynolds
4796cf6b43 Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am: 6614a2e5d0

Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6
2017-08-17 23:13:29 +00:00
Julia Reynolds
a1bd36ada7 Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am: 6614a2e5d0

Change-Id: I5d1e93740b2a53c7cb85fc105bca6863f7e27577
2017-08-17 23:13:26 +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
Bryce Lee
8558ec7dbe Don't resume activity if user is locked and encryption is unsupported
Previously we were not checking if to see if this condition was met
when determining the top running activity. As a result we could get
in a loop where we force stop the process since the app doesn't
support encryption yet try to start it again due to the
ActivityRecord being on top.

This changelist addresses the issue by checking this condition when
determining whether it is okay to show.

Change-Id: I868f97ce8b3ea4220019b8570407e33f27ea88bc
Fixes: 64259425
Test: go/wm-smoke
2017-08-17 15:37:26 -07:00
Jakub Pawlowski
d56a8bec5c 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
Merged-In: I897b99839f899ca3f3dc609918d665c8c327b777
(cherry picked from commit f7bd6b26c7)
2017-08-17 22:34:40 +00:00
Jakub Pawlowski
4cf705e17e 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
Merged-In: I518e071b77b127973aee6f24fa6ced4f28bc9531
(cherry picked from commit f73863dc29)
2017-08-17 22:34:31 +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
Julia Reynolds
c23a2e67ac Let the foreground service channel be blocked
And update the channel name

Change-Id: Ic4b909d31b38b9e1ee05f9b3e4e5c91efc6752b1
Fixes: 36891897
Test: manual
2017-08-17 14:11:45 -04: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