OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add developer setting and system API for inband ringing support"
Jack He [Mon, 10 Apr 2017 22:59:56 +0000 (22:59 +0000)]
Merge "Add developer setting and system API for inband ringing support"
am: 1da38b2bcd

Change-Id: I24f6eccb3a3dcc37fd21ee48d8844bd5a1b112f0

7 years agoMerge "Add developer setting and system API for inband ringing support"
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer setting and system API for inband ringing support"

7 years agoMerge "Add getSelfManagedPhoneAccounts() TelecomManager API."
Tyler Gunn [Mon, 10 Apr 2017 21:58:08 +0000 (21:58 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
am: c4ea961f91

Change-Id: I77e7353fe345fbf17f9499aea9e792a23e8725d4

7 years agoMerge "Add getSelfManagedPhoneAccounts() TelecomManager API."
Treehugger Robot [Mon, 10 Apr 2017 21:49:05 +0000 (21:49 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."

7 years agoAdd getSelfManagedPhoneAccounts() TelecomManager API.
Tyler Gunn [Fri, 7 Apr 2017 21:57:37 +0000 (14:57 -0700)]
Add getSelfManagedPhoneAccounts() TelecomManager API.

This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.

Test: CTS
Bug: 34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0

7 years agoAdd developer setting and system API for inband ringing support
Jack He [Fri, 18 Nov 2016 00:19:43 +0000 (16:19 -0800)]
Add developer setting and system API for inband ringing support

* Add 1 system API to check inband ringing flag in config.xml
static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature

Bug: 19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f

7 years agoMerge "Tethering: support Local-only Hotspot mode for downstreams"
Erik Kline [Mon, 10 Apr 2017 12:02:49 +0000 (12:02 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
am: d3128d4b55

Change-Id: Ic7d5e3e23f9ccc0f094ba5991e2fdefa82865b01

7 years agoMerge "Tethering: support Local-only Hotspot mode for downstreams"
Treehugger Robot [Mon, 10 Apr 2017 11:50:31 +0000 (11:50 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"

7 years agoTethering: support Local-only Hotspot mode for downstreams
Erik Kline [Fri, 10 Mar 2017 10:35:34 +0000 (19:35 +0900)]
Tethering: support Local-only Hotspot mode for downstreams

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 31466854

Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7

7 years agoMerge "Add an API hint for metered multipath traffic."
Lorenzo Colitti [Mon, 10 Apr 2017 05:48:34 +0000 (05:48 +0000)]
Merge "Add an API hint for metered multipath traffic."
am: 7a12f7efc7

Change-Id: Ie0d289460f93d3b93d91545eb3dfa925f0bdee5f

7 years agoMerge "DO NOT MERGE IP connectivity metrics: fix tests."
Hugo Benichi [Mon, 10 Apr 2017 05:43:43 +0000 (05:43 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests."
am: b2adaad26b  -s ours

Change-Id: I47dbd0feaa99ff6018efc8703cfa29a265bc73fd

7 years agoMerge "Add an API hint for metered multipath traffic."
Treehugger Robot [Mon, 10 Apr 2017 05:40:08 +0000 (05:40 +0000)]
Merge "Add an API hint for metered multipath traffic."

7 years agoMerge "DO NOT MERGE IP connectivity metrics: fix tests."
Treehugger Robot [Mon, 10 Apr 2017 05:33:46 +0000 (05:33 +0000)]
Merge "DO NOT MERGE IP connectivity metrics: fix tests."

7 years agoDO NOT MERGE IP connectivity metrics: fix tests.
Hugo Benichi [Mon, 10 Apr 2017 04:12:49 +0000 (13:12 +0900)]
DO NOT MERGE IP connectivity metrics: fix tests.

This patch fixes mismatch between current proto compiler and what is
expected in several IP connectivity metrics unit tests.

Test: built, flashed, $ runtest frameworks-net
Bug: 37126521
Change-Id: I1476c923d61f748ecac1146423127f54ba117502

7 years agoMerge "Improve utility of IntArray and LongArray"
Hugo Benichi [Mon, 10 Apr 2017 01:17:42 +0000 (01:17 +0000)]
Merge "Improve utility of IntArray and LongArray"
am: 35786735df

Change-Id: Id50add8d7e3fc45978752a6a31760bc69df0cc4a

7 years agoMerge "Improve utility of IntArray and LongArray"
Hugo Benichi [Mon, 10 Apr 2017 01:09:02 +0000 (01:09 +0000)]
Merge "Improve utility of IntArray and LongArray"

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values"
Jakub Pawlowski [Fri, 7 Apr 2017 06:57:30 +0000 (06:57 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
am: 7bf58d5975

Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2

7 years agoMerge "Bluetooth 5 fix default AdvertisingSetParameters values"
Treehugger Robot [Fri, 7 Apr 2017 06:44:48 +0000 (06:44 +0000)]
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"

7 years agoMerge "Add NETWORK_STACK permission"
Lorenzo Colitti [Fri, 7 Apr 2017 05:00:15 +0000 (05:00 +0000)]
Merge "Add NETWORK_STACK permission"
am: b23fabf3fd

Change-Id: I20f0278e080ccc957ce6342581f3d0f18dfb4b9a

7 years agoMerge "Add NETWORK_STACK permission"
Lorenzo Colitti [Fri, 7 Apr 2017 04:51:13 +0000 (04:51 +0000)]
Merge "Add NETWORK_STACK permission"

7 years agoImprove utility of IntArray and LongArray
Hugo Benichi [Mon, 27 Mar 2017 04:45:23 +0000 (13:45 +0900)]
Improve utility of IntArray and LongArray

This patch adds several utility methods to IntArray and LongArray to
make them more useful in the context of a Parcelable class.

More specifically, it is now possible to parcel and unparcel a
{Int, Long}Array with the following one liners:
  - mIntArray = IntArray.wrap(parcel.createIntArray());
  - parcel.writeIntArray(mIntArray.toArray());

This patch also
  - adds unit tests for IntArray and LongArray.
  - adds a method for setting a field at a given index.
  - adds a method for changing the effective array length.
  - adds missing bound checks for negative index values.

Test: added test coverage
Bug: 34901696
Change-Id: Ia0febf4dae048b0a45c75310b5d90b56499320da

7 years agoAdd NETWORK_STACK permission
Rebecca Silberstein [Thu, 23 Mar 2017 07:29:28 +0000 (00:29 -0700)]
Add NETWORK_STACK permission

Add a new permission that only allows other system services to call
networking related methods.  This permission is intended to prevent
other apps from calling these methods that might leave networking
services in intermediate states.

Bug: 36538042
Test: build, run wifi unit tests, boots, wifi connects
Change-Id: Icba6ad5280e9a8863bd1c706ca34b7add8de5294

7 years agoMerge "NetworkMonitor: improve captive portal validation logs"
Hugo Benichi [Fri, 7 Apr 2017 02:56:11 +0000 (02:56 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"
am: d6933a6c14

Change-Id: I8f0fd26d6a9f036adc9cc895690aac27d4b8e9cd

7 years agoMerge "NetworkMonitor: improve captive portal validation logs"
Treehugger Robot [Fri, 7 Apr 2017 02:48:55 +0000 (02:48 +0000)]
Merge "NetworkMonitor: improve captive portal validation logs"

7 years agoMerge "ConnectivityService: safer locking"
Hugo Benichi [Fri, 7 Apr 2017 02:21:41 +0000 (02:21 +0000)]
Merge "ConnectivityService: safer locking"
am: b8dc7fbc6d

Change-Id: I88a118bb59f8a870d42d2d665f838f5236ebd21c

7 years agoMerge "ConnectivityService: safer locking"
Hugo Benichi [Fri, 7 Apr 2017 02:10:45 +0000 (02:10 +0000)]
Merge "ConnectivityService: safer locking"

7 years agoMerge "Use hwservicemanager getTransport."
Steven Moreland [Fri, 7 Apr 2017 01:18:36 +0000 (01:18 +0000)]
Merge "Use hwservicemanager getTransport."
am: 562ed84ff4

Change-Id: I39ee473166dce391f3cad4acf62821a4dfb9f444

7 years agoMerge "Use hwservicemanager getTransport."
Steven Moreland [Fri, 7 Apr 2017 01:10:56 +0000 (01:10 +0000)]
Merge "Use hwservicemanager getTransport."

7 years agoNetworkMonitor: improve captive portal validation logs
Hugo Benichi [Thu, 6 Apr 2017 05:36:39 +0000 (14:36 +0900)]
NetworkMonitor: improve captive portal validation logs

This patch adds probe type and url to all validation logs about web
probes sent for captive portal detection.

Test: built, flashed, looked at $ adb shell dumpsys connectivity
Bug: 3683020636532213
Change-Id: Iee2caaf6664f3d097f9d1888ccc5fece0a95994c

7 years agoUse hwservicemanager getTransport.
Steven Moreland [Thu, 6 Apr 2017 16:28:32 +0000 (09:28 -0700)]
Use hwservicemanager getTransport.

libhidl no longer provides a getTransport function. Now, call into the
hwservicemanager which directly interfaces with libvintf.

Test: extensive, see Ia5d1eb41b057ab5d6800f6c3fd22658adecc4be7
Bug: 36377072

Merged-In: I8b0ca845251cd7cd156f3471cbd4b0ce17617be0
Change-Id: I8b0ca845251cd7cd156f3471cbd4b0ce17617be0
(cherry picked from commit f8202e464e09618c2b780d331541f32cc186598e)

7 years agoMerge "Add RecommendationPlugin for Cloud Print"
Philip P. Moltmann [Thu, 6 Apr 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Add RecommendationPlugin for Cloud Print"
am: b2c75d062d

Change-Id: I4b018ac9763d9bf5c69d055b4a9d5ddf6dded3cb

7 years agoMerge "Add RecommendationPlugin for Cloud Print"
Treehugger Robot [Thu, 6 Apr 2017 20:23:13 +0000 (20:23 +0000)]
Merge "Add RecommendationPlugin for Cloud Print"

7 years agoMerge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
Junda Liu [Thu, 6 Apr 2017 18:25:10 +0000 (18:25 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
am: ded8a6b7f6

Change-Id: I12f28266088cd9565d62097477c69dcb5ece54e2

7 years agoMerge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."
Junda Liu [Thu, 6 Apr 2017 18:17:39 +0000 (18:17 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."

7 years agoBluetooth 5 fix default AdvertisingSetParameters values
Jakub Pawlowski [Thu, 6 Apr 2017 14:22:57 +0000 (07:22 -0700)]
Bluetooth 5 fix default AdvertisingSetParameters values

Having advertiser be scannable and connectable by default is a bad
choice for new advertising set.

Bug: 30622771
Test: sl4a Bt5ScanTest
Change-Id: I4fc270e78ca4e62d3077c5cd28aa59b0518d2e77

7 years agoMerge "Update layoutlib to match java library changes"
Colin Cross [Thu, 6 Apr 2017 15:38:45 +0000 (15:38 +0000)]
Merge "Update layoutlib to match java library changes"
am: ac6414524c

Change-Id: If673886a433d1c02ac19646ab8128ad1b36280c8

7 years agoMerge "Update layoutlib to match java library changes"
Colin Cross [Thu, 6 Apr 2017 15:30:44 +0000 (15:30 +0000)]
Merge "Update layoutlib to match java library changes"

7 years agoMerge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b"
Przemyslaw Szczepaniak [Thu, 6 Apr 2017 14:58:11 +0000 (14:58 +0000)]
Merge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b"
am: 443af115ab

Change-Id: Id3eed59b96b9aba2f101bb3910f7eace84a6699e

7 years agoMerge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b"
Treehugger Robot [Thu, 6 Apr 2017 14:49:17 +0000 (14:49 +0000)]
Merge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b"

7 years agoMerge "Canonicalize tz IDs when finding exemplar location"
Neil Fuller [Thu, 6 Apr 2017 10:22:07 +0000 (10:22 +0000)]
Merge "Canonicalize tz IDs when finding exemplar location"
am: 5e603a4b6e

Change-Id: Ib4eb5ce215ec2564d220e1658f2dec4d0dc86d67

7 years agoMerge "Canonicalize tz IDs when finding exemplar location"
Treehugger Robot [Thu, 6 Apr 2017 10:12:00 +0000 (10:12 +0000)]
Merge "Canonicalize tz IDs when finding exemplar location"

7 years agoTrack libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b
Przemyslaw Szczepaniak [Wed, 29 Mar 2017 12:59:46 +0000 (13:59 +0100)]
Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b

Test: make -j 32
Bug: 36461944
Change-Id: I2075d03c3143d0582a76d91bcbaccd83c193a552

7 years agoConnectivityService: safer locking
Hugo Benichi [Thu, 6 Apr 2017 07:01:44 +0000 (16:01 +0900)]
ConnectivityService: safer locking

This path changes a dangerous lock path in reportNetworkConnectivity().
This methods is called outside of the main ConnectivityService handler
and takes a lock on a specific NetworkAgentInfo whose connectivity
status is being reported.

While this lock is held, reportNetworkConnectivity() goes on and query
the network policy state for that network, which may ends into
NetworkPolicyManagerService.

Instead, the lock on NetworkAgentInfo is only held long enough to make a
copy of LinkProperties, which is then passed to
NetworkPolicyManagerService without that lock.

Bug: 36902662
Test: could not repro b/36902662, reportNetworkConnectivity() works.
      $ runtest frameworks-net

Change-Id: Iac4b75bcecbdddb0ac695c8b1a87ae755f62f47f

7 years agoAdd an API hint for metered multipath traffic.
Lorenzo Colitti [Tue, 24 Jan 2017 09:08:41 +0000 (18:08 +0900)]
Add an API hint for metered multipath traffic.

This allows an application that knows how to provide seamless
network connectivity (e.g., using QUIC multipath) to find out if
doing so is desired.

(cherry picked from commit 2de4925f5cc64aeb92e02a8f740d3ff20f36dddd)

Test: builds, boots, runtest frameworks-net passes.
Bug: 34630278
Change-Id: Ic7fd0b9e1cd879fdfaf84009d7125391895e9087

7 years agoAdd RecommendationPlugin for Cloud Print
Philip P. Moltmann [Thu, 6 Apr 2017 02:51:08 +0000 (19:51 -0700)]
Add RecommendationPlugin for Cloud Print

Reuses already existing infrastructure. The mMDNSFilteredDiscovery lambda
is called for every network service that supports #PRIVET_SERVICE. Then
the plugin checks the txt fields to make sure the printer is valid. The
check is not complete but good enough to make sure this is either a
cloud print capable printer or something that tries really hard.

Test: Connected to network with three printers, 2 GCP capable. Found the
      two printers
Fixes: 35766193
Change-Id: I7c9180c8c154fa092fec5b943a94bad77da74c86

7 years agoMerge changes I9ad4ce81,I360d539e
Hugo Benichi [Thu, 6 Apr 2017 02:01:07 +0000 (02:01 +0000)]
Merge changes I9ad4ce81,I360d539e
am: 9680667b1d

Change-Id: I7c64e3db6a1d153339f50db292761131dbfa2ae8

7 years agoMerge changes I9ad4ce81,I360d539e
Treehugger Robot [Thu, 6 Apr 2017 01:51:34 +0000 (01:51 +0000)]
Merge changes I9ad4ce81,I360d539e

* changes:
  NsdService: minor cleanups
  Nsdmanager/NsdService: add logging

7 years agoMerge "Document the fact that StatFs.restat() and ctor can throw."
Tobias Thierer [Wed, 5 Apr 2017 21:03:42 +0000 (21:03 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw."
am: 183c93f6a0

Change-Id: I0c8a4c12495260044be6aac74a505280498a9b44

7 years agoMerge "Document the fact that StatFs.restat() and ctor can throw."
Tobias Thierer [Wed, 5 Apr 2017 20:53:46 +0000 (20:53 +0000)]
Merge "Document the fact that StatFs.restat() and ctor can throw."

7 years agoDocument the fact that StatFs.restat() and ctor can throw.
Tobias Thierer [Tue, 2 Aug 2016 15:41:11 +0000 (16:41 +0100)]
Document the fact that StatFs.restat() and ctor can throw.

StatFs.restat() and the StatFs constructor can throw
IllegalArgumentException. This was not previously documented;
not all callers took this into account, for example:
   http://r.android.com/251290

This CL adds documentation to those methods. It also adds
comments to two of the callers.

Separately from this CL, we may in addition consider adding
new API StatFs.checkedRestat() and StatFs.checkedCreate()
or similar that throw IOException; we cannot change the
existing constructor and method since they are public.

Test: Checked that "make" still completed successfully.

Change-Id: I6a0b3cb7718939408937c61de7c3b000b948fa59

7 years agoMerge "Query geo description in worker thread to prevent ANR"
Hall Liu [Wed, 5 Apr 2017 19:32:07 +0000 (19:32 +0000)]
Merge "Query geo description in worker thread to prevent ANR"
am: eb7c287c71

Change-Id: I0df6d788ff5f8794e03324c3dacf337a7a04c36c

7 years agoMerge "Query geo description in worker thread to prevent ANR"
Hall Liu [Wed, 5 Apr 2017 19:23:29 +0000 (19:23 +0000)]
Merge "Query geo description in worker thread to prevent ANR"

7 years agoCanonicalize tz IDs when finding exemplar location
Neil Fuller [Tue, 4 Apr 2017 16:47:05 +0000 (17:47 +0100)]
Canonicalize tz IDs when finding exemplar location

Canonicalize time zone IDs when looking up exemplar location.

ICU's canonical IDs are not guaranteed the same as IANA's.
Various data files (e.g. timezones.xml, tzdata,
time_zones_by_country.xml) are using IANA IDs. ICU's IDs
are often the same, but because they are guaranteed not to
change and IANAs are not there is some drift.

This fixes an issue with the settings picker for ICU IDs:

America/Buenos_Aires
Asia/Rangoon
Asia/Katmandu
Asia/Calcutta

Which are IANA's:

America/Argentina/Buenos_Aires
Asia/Yangon
Asia/Kathmandu
Asia/Kolkata

introduced by commit b4d003da66.

It could also influence some display names for
automatically-selected time zones outside of this list.

The issues was particularly noticeable in locales that
use non-ASCII scripts; ICU performs a fallback if the ID
isn't canonical and would transform and return the last
part of the ID (e.g. Buenos Aires, Yangon, Kathmandu,
Kolkata).

Bug: 36469833
Test: Manual testing in Japanese
Merged-In: I2febdbee58e474d251d0a33f2c8335664a74581f
Change-Id: Id6598fcf048e924a75db7550d1143ecaa8062e8a

7 years agoNsdService: minor cleanups
Hugo Benichi [Wed, 5 Apr 2017 05:43:29 +0000 (14:43 +0900)]
NsdService: minor cleanups

Minor cleanups in switches of processMessage and handleNativeEvent.

Test: no functional changes
Bug: 33074219
Change-Id: I9ad4ce812c0d2c02a671a7a871ad427e4ce29b4a

7 years agoNsdmanager/NsdService: add logging
Hugo Benichi [Wed, 5 Apr 2017 05:06:11 +0000 (14:06 +0900)]
Nsdmanager/NsdService: add logging

This patch adds basic logging to NsdManager and NsdService, and improves
the facilities for pretty printing the event ids defined in NsdManager.

It also includes a few minor cleanups:
  - adding 'final' on effectively final instance variables of NsdManager
  and NsdService.
  - similarly, adding 'static' on effectively static class fields.
  - regrouping instance variables together.

Test: no functional changes
Bug: 33074219
Change-Id: I360d539e73cc8e4b45d4e0d20b2e345455fdb10c

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS"
Hall Liu [Tue, 4 Apr 2017 23:38:39 +0000 (23:38 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"
am: f6f3c16dfb

Change-Id: I510ed2b8dfdbbb3563cd31c8630973790eae023d

7 years agoMerge "Add @TestApi annotations to CS-side RTT APIs for CTS"
Hall Liu [Tue, 4 Apr 2017 23:31:37 +0000 (23:31 +0000)]
Merge "Add @TestApi annotations to CS-side RTT APIs for CTS"

7 years agoMerge "Add api to retrieve call creation time."
Tyler Gunn [Tue, 4 Apr 2017 21:42:14 +0000 (21:42 +0000)]
Merge "Add api to retrieve call creation time."
am: f19c52d20d

Change-Id: I42313561c2d4e612feb428f79a64c10a64bf011a

7 years agoMerge "Add api to retrieve call creation time."
Tyler Gunn [Tue, 4 Apr 2017 21:35:26 +0000 (21:35 +0000)]
Merge "Add api to retrieve call creation time."

7 years agoMerge "IMS: RTT interface changes"
Hall Liu [Tue, 4 Apr 2017 21:28:10 +0000 (21:28 +0000)]
Merge "IMS: RTT interface changes"
am: 814fdf9312

Change-Id: Ifecb02604cebdd5ae1a16d996940d11bee920ea8

7 years agoMerge "IMS: RTT interface changes"
Hall Liu [Tue, 4 Apr 2017 21:21:16 +0000 (21:21 +0000)]
Merge "IMS: RTT interface changes"

7 years agoMerge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
Hiroki Yamamoto [Tue, 4 Apr 2017 21:05:41 +0000 (21:05 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
am: 4df6c75b99

Change-Id: If1803f92474fbb6a3dc4aa47674e547443942440

7 years agoMerge "Protect CANCEL_HANDOVER_TRANSFER broadcast"
Treehugger Robot [Tue, 4 Apr 2017 20:57:53 +0000 (20:57 +0000)]
Merge "Protect CANCEL_HANDOVER_TRANSFER broadcast"

7 years agoProtect CANCEL_HANDOVER_TRANSFER broadcast
Hiroki Yamamoto [Tue, 28 Mar 2017 02:45:13 +0000 (11:45 +0900)]
Protect CANCEL_HANDOVER_TRANSFER broadcast

Bug: 36662809
Test: cancel AndroidBeam and check if the error log is not shown
Change-Id: Ic442753aacf97f7f5a7e449685c2b1414e77e957

7 years agoMerge "Make some intents public in SubscriptionManager."
Sanket Padawe [Tue, 4 Apr 2017 16:59:13 +0000 (16:59 +0000)]
Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff

7 years agoMerge "Make some intents public in SubscriptionManager."
Treehugger Robot [Tue, 4 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Make some intents public in SubscriptionManager."

7 years agoMerge "Update to latest tzdata / switch back to zones.tab"
Neil Fuller [Tue, 4 Apr 2017 16:47:37 +0000 (16:47 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab"
am: 44aeecc869

Change-Id: I1300ba5bbcca2d6add11ba980dcf211e8d79b4a1

7 years agoMerge "Update to latest tzdata / switch back to zones.tab"
Neil Fuller [Tue, 4 Apr 2017 16:39:56 +0000 (16:39 +0000)]
Merge "Update to latest tzdata / switch back to zones.tab"

7 years agoMerge "Make sure that the device name is not null before returning it"
Ajay Panicker [Tue, 4 Apr 2017 01:27:41 +0000 (01:27 +0000)]
Merge "Make sure that the device name is not null before returning it"
am: d4963e8035

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225

7 years agoMerge "Make sure that the device name is not null before returning it"
Treehugger Robot [Tue, 4 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Make sure that the device name is not null before returning it"

7 years agoMake some intents public in SubscriptionManager.
Sanket Padawe [Mon, 3 Apr 2017 18:17:22 +0000 (11:17 -0700)]
Make some intents public in SubscriptionManager.

+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1

7 years agoMake sure that the device name is not null before returning it
Ajay Panicker [Mon, 3 Apr 2017 19:15:54 +0000 (12:15 -0700)]
Make sure that the device name is not null before returning it

Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c

7 years agoMerge "Add test coverage for NetworkSpecifiers."
Lorenzo Colitti [Mon, 3 Apr 2017 10:45:22 +0000 (10:45 +0000)]
Merge "Add test coverage for NetworkSpecifiers."
am: 9a029b5262

Change-Id: Ia328b945af4c4f55ef560b33b00fa861b8f81b0d

7 years agoMerge "Add test coverage for NetworkSpecifiers."
Treehugger Robot [Mon, 3 Apr 2017 10:37:00 +0000 (10:37 +0000)]
Merge "Add test coverage for NetworkSpecifiers."

7 years agoMerge "ConnectivityService: simplify WakeLock management"
Hugo Benichi [Mon, 3 Apr 2017 09:03:13 +0000 (09:03 +0000)]
Merge "ConnectivityService: simplify WakeLock management"
am: c98db5caa2

Change-Id: I1e0ae930cd7a329febf21ff3fc83ad2d0a3be69b

7 years agoMerge "ConnectivityService: simplify WakeLock management"
Hugo Benichi [Mon, 3 Apr 2017 08:56:23 +0000 (08:56 +0000)]
Merge "ConnectivityService: simplify WakeLock management"

7 years agoAdd test coverage for NetworkSpecifiers.
Lorenzo Colitti [Mon, 3 Apr 2017 08:46:35 +0000 (17:46 +0900)]
Add test coverage for NetworkSpecifiers.

Tests various combinations of empty / non-empty NetworkSpecifiers
and changing specifiers on the fly.

Test: ConnectivityServiceTest passes
Bug: 27533960
Change-Id: Ibd6b4efc861dc51689e46f3882ba859223411bf0

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 3 Apr 2017 02:11:39 +0000 (02:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoConnectivityService: simplify WakeLock management
Hugo Benichi [Thu, 30 Mar 2017 14:18:10 +0000 (23:18 +0900)]
ConnectivityService: simplify WakeLock management

This patch simplifies wakelock management by acknowledging that only one
acquisition at most is in flight at any time. This allows to remove the
serial number associated with wakelock acquisition and to avoid double
release when regaining a default network.

Example of $ adb shell dumpsys connectivity logs:
  NetTransition WakeLock activity (most recent first):
    03-31 00:15:13.816 - RELEASE (EVENT_CLEAR_NET_TRANSITION_WAKELOCK)
    03-31 00:14:59.216 - ACQUIRE for NetworkAgentInfo [WIFI () - 101]
    03-31 00:09:05.799 - RELEASE (EVENT_EXPIRE_NET_TRANSITION_WAKELOCK)
    03-31 00:08:05.738 - ACQUIRE for NetworkAgentInfo [WIFI () - 100]

Test: watched wakelock section $ adb shell dumpsys connectivity while
      turning on and off Wifi (with no other network).
Bug: 36703718
Change-Id: I899b0816c0e41b3991d9540e9b9a604914ff673a

7 years agoMerge "ConnectivityService: log wakelock activity in dumps"
Hugo Benichi [Sun, 2 Apr 2017 23:47:15 +0000 (23:47 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"
am: db104b2367

Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910

7 years agoMerge "ConnectivityService: log wakelock activity in dumps"
Hugo Benichi [Sun, 2 Apr 2017 23:40:25 +0000 (23:40 +0000)]
Merge "ConnectivityService: log wakelock activity in dumps"

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:47:36 +0000 (08:47 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:44:19 +0000 (08:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:43:33 +0000 (08:43 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:42:52 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:42:10 +0000 (08:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:41:34 +0000 (08:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:41:04 +0000 (08:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:39:42 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:39:13 +0000 (08:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:38:19 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 08:36:16 +0000 (08:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 06:06:04 +0000 (23:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Id8d5a50ec7d04eb45dd55d333a178b9a214d05d5

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 06:02:20 +0000 (23:02 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I967ca7ee9e12c4bc83e8bd4bcf9eec0cce0ed031

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:30:30 +0000 (22:30 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I896e874391b7951f14ccb3138c21399d4dd0a6e6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:26:48 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I8fe57933ecbc106945b72f306cd10346e4b754a9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:23:03 +0000 (22:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6b319f5bbeccf3aeb0b8e68279add98a03389dea

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:19:25 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ib67a94c0268dbfcf32025179010422410b19157e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 2 Apr 2017 05:10:25 +0000 (22:10 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ic79825620336a148791f1d88e8744a8dff669b2c