Commit Graph

16021 Commits

Author SHA1 Message Date
The Android Automerger
53095bb5bd Merge commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1' into nyc-mr1-dev-plus-aosp
* commit 'a19056c35d16ddb5a6c1d3343729701b8939f1e1': (35 commits)
  NetworkMonitor: send one DNS probe per web probe
  NetworkMonitor metrics: add first validation information
  APF: also drop any ICMPv6 RSs
  ConnectivityServiceTest: fix testAvoidBadWifiSettings
  Fix ConnectivityServiceTest testRequestBenchmark
  Switch over to new "time.android.com" NTP pool.
  Define API for metering network stats buckets.
  Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
  Use @Ignore to explicitly disable a @Test method.
  Fixed NetworkStatsServiceTest and converted it to JUnit4.
  VPN network stat accounting changes.
  ConnectivityThread: use lazy holder idiom
  ConnectivityManager: use ConnectivityThread looper
  ConnectivityManager: a simpler CallbackHandler
  Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
  Add a null check for the OnStartTetheringCallback.
  TokenBucket for rate-limiting and throttling
  IpConnectivityMetrics reads buffer size in settings
  CaptivePortalLogin: set mixed content policy to compatibility.
  Add IP conn metrics to dumpsys and bug reports
  ...
2017-01-27 06:39:05 +00:00
Jeff Sharkey
06124cc892 Switch over to new "time.android.com" NTP pool.
Also add logging to measure success/failure details.

Test: builds, boots, and NTP fix obtained
Bug: 32969463

(cherry picked from commit d3f689bf14)

Change-Id: I7da416099ae903fd92beb516251ef4e51673eecf
2017-01-26 18:52:11 +09:00
Elliot Waite
28ba4722a9 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: If0d0613362e0ea95cf48eaf9a16d3eea48b589ea
2017-01-26 04:39:57 +00:00
Elliot Waite
ab978c035e Fix @links in reference docs.
am: 54de77470d

Change-Id: Id38c30bad13d6b61ed504a06471b9f197b360f7b
2017-01-26 04:34:57 +00:00
Brad Ebinger
2741442324 Merge "Adding Dynamic ImsService Binding (1/3)" am: 8e6b13a1c0
am: 64057ab972

Change-Id: I901c72a38b522c190e849de55078036adc80d8b6
2017-01-26 01:46:06 +00:00
Brad Ebinger
64057ab972 Merge "Adding Dynamic ImsService Binding (1/3)"
am: 8e6b13a1c0

Change-Id: I8534273da5579b7662e66f80a60348a4665dd65b
2017-01-26 01:41:38 +00:00
Treehugger Robot
8e6b13a1c0 Merge "Adding Dynamic ImsService Binding (1/3)" 2017-01-26 01:34:05 +00:00
Elliot Waite
54de77470d Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
Brad Ebinger
024aaf2388 Adding Dynamic ImsService Binding (1/3)
Adds support for dynamic ImsService Binding (change 1/3). Included
in this change:
- AIDLs for ImsServiceController
- ImsFeature/ImsServiceBase definitions
- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option

Test: Unit Tests in opt/telephony
Bug: 30290416
Change-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3
2017-01-25 15:12:28 -08:00
Torbjorn Eklund
3cd1f5bac7 Merge "Vodafone SIMs should treat Spain as roaming" am: a9c27b348c
am: 8e9cf51db3

Change-Id: I7fbc47d01539202c4a9d022dc6609bc88e1d4621
2017-01-24 22:52:59 +00:00
Torbjorn Eklund
8e9cf51db3 Merge "Vodafone SIMs should treat Spain as roaming"
am: a9c27b348c

Change-Id: Ia57e460220a5f8e53f47f2454f5c1a005830a3e6
2017-01-24 22:49:27 +00:00
Treehugger Robot
a9c27b348c Merge "Vodafone SIMs should treat Spain as roaming" 2017-01-24 22:43:32 +00:00
Torbjorn Eklund
3ff6c5659d Vodafone SIMs should treat Spain as roaming
Since there are unnecessary "config_operatorConsideredNonRoaming" values
in the following file, UE mistakenly recognizes all Spain network as
non-roaming when Vodafone sim from Spain is inserted. Fix the issue by
removing the values.
 - core/res/res/values-mcc214-mnc01/config.xml

Bug: 30147413
Change-Id: I75b3f4a112a625a80824516bb6ea06a43a4567da
2017-01-20 06:06:28 +09:00
Tyler Gunn
d70e5d9317 Merge "Adding self-managed connection service APIs." am: 3a7253a09d
am: 2155be0218

Change-Id: I75319e09f352905ffa45194086b11711f9070c70
2017-01-19 18:34:53 +00:00
Tyler Gunn
2155be0218 Merge "Adding self-managed connection service APIs."
am: 3a7253a09d

Change-Id: I5d7aa094d71e40bc2ce8e6d051c757a82d9c6083
2017-01-19 18:29:54 +00:00
Treehugger Robot
3a7253a09d Merge "Adding self-managed connection service APIs." 2017-01-19 18:23:34 +00:00
Tyler Gunn
f50354363c Adding self-managed connection service APIs.
1. Adding new APIs for self-managed connection services.
2. Adding Telecom package-level documentation.

Test: Manual (unit, cts pending; this is just scaffolding for now)
Bug: 34159263
Change-Id: Ic226ec8bfcb2fbcc02fe802b47499e47aab17d0a
2017-01-18 14:44:43 -08:00
Stephen Chen
62f70c44b8 Merge "Delete old WifiNotificationController strings." am: 6daef4499f
am: f412290e94

Change-Id: I40bfd75b95a299516d08b4fdf699317249156eda
2017-01-11 02:24:26 +00:00
Stephen Chen
f412290e94 Merge "Delete old WifiNotificationController strings."
am: 6daef4499f

Change-Id: I20a68ca904cc0ad8042be61820808f4ff4680bee
2017-01-11 02:20:14 +00:00
Stephen Chen
9a0dd58ec0 Delete old WifiNotificationController strings.
Bug: 33355924
Test: make

Change-Id: Ia7065549168b4f342760e2f77efe4d9eb1851eb9
2017-01-10 10:35:24 -08:00
Jack Yu
9f60453361 Merge commit '5d14d99e434af815ed7fff224d178d3d72c164eb' into manual_merge_5d14d99e434a
Test: manual
Change-Id: I228ed62db45eeb5d384049b5b0fef57b0bcf9ac6
2017-01-09 14:33:59 -08:00
Treehugger Robot
ccda81e58f Merge "Moved implicit intents into explicit intents" 2017-01-09 22:02:37 +00:00
Jeremy Joslin
542f906448 Merge "Make REQUEST_NETWORK_SCORES signature only." am: 1f89f3d1da
am: 99b73c61f2

Change-Id: I5959ba9a45dd3c895421b131fd34db6b37c6e405
2017-01-09 21:09:09 +00:00
Jeremy Joslin
f91d9debef Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: 4c456d7ddf
am: 542aad4c75

Change-Id: I3b35ec04e65f6b14f75f266dfcf15c10a12a4d74
2017-01-09 21:07:48 +00:00
Jeremy Joslin
99b73c61f2 Merge "Make REQUEST_NETWORK_SCORES signature only."
am: 1f89f3d1da

Change-Id: I4fff314194584e78c86e3b0ae1de40fd7f2501f4
2017-01-09 21:00:13 +00:00
Jeremy Joslin
542aad4c75 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am: 4c456d7ddf

Change-Id: I441cae5096b922419763832d5b38faa95818e337
2017-01-09 20:58:50 +00:00
Treehugger Robot
1f89f3d1da Merge "Make REQUEST_NETWORK_SCORES signature only." 2017-01-09 20:51:34 +00:00
Jeremy Joslin
85fcf96e99 Make REQUEST_NETWORK_SCORES signature only.
There are no use cases where it's needed by a privileged app today.

Test: Built and ran
BUG: 33752149
Change-Id: Ia63a86eca1f60644d25f037d395a08c541a06a08
Merged-In: Iae689e878fdb60b506536c918079a4fcff527a71
2017-01-09 11:31:21 -08:00
Jack Yu
6356b6e3c7 Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
Merged-In: I64db3b05400513bacf278ff9f93236495860803e
2017-01-09 11:16:10 -08:00
Jeremy Joslin
186f3339ab Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33752149
Change-Id: I3dd352c98bbc34b128ab9c2a28f81e1261ae2669
Merged-In: I7d91fa9a4f6ef4f9170c6af98567ce443c805e74
2017-01-09 11:03:21 -08:00
Jack Yu
5d14d99e43 Moved implicit intents into explicit intents
Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I64db3b05400513bacf278ff9f93236495860803e
Merged-In: I64db3b05400513bacf278ff9f93236495860803e
2017-01-06 22:03:41 -08:00
Alain Vongsouvanh
e51a76861c bools: fix use_lock_pattern_drawable javadoc.
am: c4046b5542

Change-Id: I381d005e73d6100e619dabf607b27cb18a969d7f
2017-01-06 17:41:43 +00:00
Alain Vongsouvanh
c4046b5542 bools: fix use_lock_pattern_drawable javadoc.
Change-Id: If135544edb499ee64117bf81c6e3d0eebbfcff00
2017-01-05 22:54:07 -08:00
Alain Vongsouvanh
5549258eea resolve merge conflicts of 2fda2ce159 to nyc-mr1-dev-plus-aosp
Change-Id: Ia35164bd4ea262fa72afb7b78a47b0e4f0ef96ba
2017-01-05 15:27:37 -08:00
Alain Vongsouvanh
2fda2ce159 widget: Adding support for custom LockPatternView.
OEMs can overlay the default 9 dots by providing two drawables that represent
those dots:
  * lockscreen_notselected: asset to display when a cell has not been selected.
  * lockscreen_selected: asset to display when a cell has been selected.

BUG: 33755663
Change-Id: Ic595b01f5e1321696b7a3feb0ff73c1acccfb942
2017-01-05 16:16:49 +00:00
Jeremy Joslin
195ac87578 Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f
am: 84fd1e1120

Change-Id: I85279a0185d9191bf81e1088d68f86827fe2d103
2017-01-04 23:16:38 +00:00
Jeremy Joslin
84fd1e1120 Merge "Defining a new REQUEST_NETWORK_SCORES permission."
am: a54d76a81f

Change-Id: I4fc03585c4943712f5c1309a5bfa2995dac1bbe0
2017-01-04 23:10:42 +00:00
Julius D'souza
54a0faa37b DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am: bbfdf7ad23

Change-Id: Iafc7d24b276db9b145709e7af80e03292c1ce735
2017-01-04 23:05:42 +00:00
Treehugger Robot
a54d76a81f Merge "Defining a new REQUEST_NETWORK_SCORES permission." 2017-01-04 23:04:47 +00:00
Julius D'souza
b60eb1a854 Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev 2017-01-04 23:00:00 +00:00
Jeremy Joslin
cb3f75cca7 Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am: 34d46ca94c
am: acbf592683

Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3
2017-01-04 21:47:42 +00:00
Jeremy Joslin
acbf592683 Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
am: 34d46ca94c

Change-Id: I1e6f1751cf3ce690e09e8681c86f744a38c550d6
2017-01-04 21:42:41 +00:00
Jeremy Joslin
97e711139d Defining a new REQUEST_NETWORK_SCORES permission.
This is intended to be a drop-in replacement for the existing
BROADCAST_NETWORK_PRIVILEGED with a more appropriate name.

Test: Built, ran.
BUG: 33752149
Change-Id: Iebe9d1c12f159bd91953ef094d9866eba9ff925a
Merged-In: I12bdba9694fdf2a2e39990736265919edafd865e
2017-01-04 13:30:07 -08:00
Jeremy Joslin
c02fd4ea78 Use the new BIND_NETWORK_RECOMMENDATION_SERVICE.
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.

Test: Built & ran
BUG: 33897544
Change-Id: I43424642a631f58da3a065f8221e351180f4f221
Merged-In: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
2017-01-04 11:46:06 -08:00
Jeremy Joslin
8be80273b8 Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d
am: a169fc3494

Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
2017-01-04 15:34:16 +00:00
Jeremy Joslin
a169fc3494 Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
am: 871beedc6d

Change-Id: I2554ede84b313e66af57e05c59046747c16ec23e
2017-01-04 15:29:57 +00:00
Treehugger Robot
871beedc6d Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." 2017-01-04 15:24:30 +00:00
Pavlin Radoslavov
da3de76bdb Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96
am: 8b46f87e7e

Change-Id: I39e4b90491f646887200649954b652d9f5439925
2017-01-04 03:44:40 +00:00
Pavlin Radoslavov
8b46f87e7e Merge "Add a mechanism for configuring the A2DP Source codecs"
am: 63270f2b96

Change-Id: I289d3b61e29b02bae208c656a6e963ff58248a15
2017-01-04 03:39:50 +00:00
Pavlin Radoslavov
44a4ef0aa9 Add a mechanism for configuring the A2DP Source codecs
* Added a new class BluetoothCodecConfig that contains codec-related
  configuration or capabilities: codec type, priority, sample rate,
  bits per sample, channel mode, and codec specific fields.

* Extended the Bluetooth A2DP AIDL interface to get/set the current
  codec configuration

* Added new call handleBluetoothA2dpDeviceConfigChange() to the Media
  Framework that is called when there are changes in the
  Bluetooth A2DP device configuration - e.g., the A2DP codec is changed.

Test: A2DP streaming to headsets, TestPlans/71390
Bug: 30958229
Change-Id: I9a82716cbc2a5efbe77352a031ac80c88f6a2459
2017-01-03 17:52:52 -08:00