OSDN Git Service

android-x86/frameworks-base.git
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:10:45 +0000 (02:10 +0000)]
Merge "ConnectivityService: safer locking"

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"
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:17:39 +0000 (18:17 +0000)]
Merge "Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key."

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"
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"
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 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
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 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: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: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: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:21:16 +0000 (21:21 +0000)]
Merge "IMS: RTT interface changes"

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

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

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I7b31b10f7d84ab10587b50e6a3d1831a3e71886b

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

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I87e870cdcec90e173ab587cc65afb8841e9a6411

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

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I811c247c477f0e53e060d721b7d9b9ba954f3c8b

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

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6c846a034570454310571a442fb55eec8295139b

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

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3732af38b0e535528297ee18e772afd087a4c9c6

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

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I4afbbdb8355c77f409d59a2ad77430ca73e49ca3

7 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Sun, 2 Apr 2017 04:00:42 +0000 (04:00 +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 03:56:26 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

7 years agoMerge changes from topic 'ipsec-transport-impl'
nharold [Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)]
Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f

7 years agoIpSecManager and IpSecTransform API Cleanup
Nathan Harold [Sun, 2 Apr 2017 00:18:42 +0000 (00:18 +0000)]
IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d

7 years agoMerge changes from topic 'ipsec-transport-impl'
nharold [Sun, 2 Apr 2017 00:10:33 +0000 (00:10 +0000)]
Merge changes from topic 'ipsec-transport-impl'

* changes:
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Apr 2017 23:18:41 +0000 (16:18 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3213f09cb1ad99844c7d745b14ccbbc1f0b4c05f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Apr 2017 23:11:07 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I61b5291fe0b6b1e6c421756adac398e76566ca5f

7 years agoMerge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
Robert Sesek [Sat, 1 Apr 2017 06:53:03 +0000 (06:53 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
am: c04b06dc81

Change-Id: I781b676d273738101a6aaf27d523c7b5d7d06596

7 years agoMerge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
Treehugger Robot [Sat, 1 Apr 2017 06:46:31 +0000 (06:46 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Sat, 1 Apr 2017 04:42:45 +0000 (04:42 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06

7 years agoMerge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Sat, 1 Apr 2017 04:40:10 +0000 (04:40 +0000)]
Merge "Bluetooth LE Advertising minor improvements"
am: 3d84362412

Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a

7 years agoMerge "Bluetooth 5 advertising duration refactoring (4/4)"
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:50 +0000 (04:34 +0000)]
Merge "Bluetooth 5 advertising duration refactoring (4/4)"

7 years agoBluetooth 5 advertising duration refactoring (4/4)
Jakub Pawlowski [Fri, 31 Mar 2017 02:10:08 +0000 (19:10 -0700)]
Bluetooth 5 advertising duration refactoring (4/4)

Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432

7 years agoMerge "Bluetooth LE Advertising minor improvements"
Jakub Pawlowski [Sat, 1 Apr 2017 04:34:30 +0000 (04:34 +0000)]
Merge "Bluetooth LE Advertising minor improvements"

7 years agoBluetooth LE Advertising minor improvements
Jakub Pawlowski [Thu, 30 Mar 2017 18:19:24 +0000 (11:19 -0700)]
Bluetooth LE Advertising minor improvements

This patch adds some additional error checking for the advertising set
parameters, and some more comments.

Test: manual
Bug: 30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
Ajay Panicker [Sat, 1 Apr 2017 03:28:13 +0000 (03:28 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
am: 985fe4cbd2

Change-Id: I81f642bae7fe8f1530db6474ebab26760c707fa3

7 years agoMerge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"
Treehugger Robot [Sat, 1 Apr 2017 03:18:45 +0000 (03:18 +0000)]
Merge "Bluetooth: Add additional BluetoothSocket logging to root cause errors"

7 years agoMerge "Fix advertise data size estimation"
Jakub Pawlowski [Sat, 1 Apr 2017 02:13:41 +0000 (02:13 +0000)]
Merge "Fix advertise data size estimation"
am: 5b2e9f40b4

Change-Id: Ic6c0a5d5a988ebeedde333910281af54c026f428

7 years agoMerge "Fix advertise data size estimation"
Jakub Pawlowski [Sat, 1 Apr 2017 02:06:30 +0000 (02:06 +0000)]
Merge "Fix advertise data size estimation"

7 years agoAdd Initial IPsec APIs to IpSecService
Nathan Harold [Tue, 7 Mar 2017 21:23:36 +0000 (13:23 -0800)]
Add Initial IPsec APIs to IpSecService

-Plumb IpSecManager APIs to NetD
-Add Resource Management to IpSecService

Bug: 33695893
Test: CTS verifies nearly all of these paths
Change-Id: Ic43965c6158f28cac53810adbf5cf50d2c54f920

7 years agoFix advertise data size estimation
Jakub Pawlowski [Fri, 31 Mar 2017 23:49:13 +0000 (16:49 -0700)]
Fix advertise data size estimation

UUID in service data field can be 2, 4, or 16 bytes long.

Test: manual
Bug: 36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1

7 years agoBluetooth: Add additional BluetoothSocket logging to root cause errors
Ajay Panicker [Tue, 28 Mar 2017 21:28:27 +0000 (14:28 -0700)]
Bluetooth: Add additional BluetoothSocket logging to root cause errors

Bug: 34780400
Test: Code still compiles
Change-Id: I166842ecc6889f9ea403e7aa3678ed818cd80968

7 years agoAdd KEY_ENABLE_APPS_STRING_ARRAY carrier config key.
Junda Liu [Tue, 28 Mar 2017 20:58:51 +0000 (13:58 -0700)]
Add KEY_ENABLE_APPS_STRING_ARRAY carrier config key.

Value includes which apps need to be enabled for current carrier.

Bug: b/35924008
Test: make and manual

Change-Id: Icb089d4641610b0618a8717fa3fed8d3770d5f52

7 years agoIpSecManager and IpSecTransform API Cleanup
Nathan Harold [Thu, 30 Mar 2017 18:01:37 +0000 (11:01 -0700)]
IpSecManager and IpSecTransform API Cleanup

-Remove Int-based SPI usage from the IpSecTransform.Builder
 This is essentially a less-safe method overload, and it is both
 unnecessary and difficult to implement: the cross-validation
 between SPI and Transform is actually useful, and the kernel
 requires two different mechanisms to use an unreserved vs a
 reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
 hard to support. API Council has questioned the value of this,
 and they are right: everything points to "remove this". In the
 future, if we find that SPI reservation is overhead, we can
 always add it back.

-Hiding the TunnelMode builder method and application/remove
 methods. These will not land by the time the next API
 stabilizes, so better to hide them now that this is a
 near-certainty. Expectation is to un-hide them in the subsequent
 API bump.

Bug: 36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab

7 years agoUpdate to latest tzdata / switch back to zones.tab
Neil Fuller [Fri, 31 Mar 2017 10:40:48 +0000 (11:40 +0100)]
Update to latest tzdata / switch back to zones.tab

The file has fallen out of date since it was fundamentally
updated in commit 50e9b86. This change brings it up to date
with 2017b.

This change also switches back to using zone.tab as a source
of time zone IDs. In commit 50e9b86 the source was switched
to zone1970.tab. Although this switch wouldn't have
meaningfully affected time zone calculations it does alter
the exemplar locations for automatically detected time zones.
This information may surfaced to users in some places and
can lead to confusion because zone1970.tab uses zones that
span multiple countries, while zone.tab zones tend to be
more local. Reverting should lead to a subtly better
localization experience.

During this work a number of unexpected differences between
zone.tab and zone1970.tab were uncovered. These have been
questioned upstream via the IANA mailing list on 31st March
2017.

Notable other updates:

Addition of Asia/Famagusta for Cyprus.
Addition of Asia/Atyrau for Kazakhstan.
Addition of Europe/Saratov for Russia.

The following have been queried with IANA and differ between
zone.tab and zone1970.tab:

Removal of Indian/Reunion for French Southern Territories
Removal of Pacific/Honolulu for United States Minor Outlying Islands
Removal of Asia/Bangkok for Vietnam.

Bug: 25338903
Test: Build / CtsUtilTestCases
Change-Id: I955a2dc8d35968f2e58f51c3a2175e8402a59ee0

7 years agoMerge "Add carrier config to hide merge button for IMS conference"
Tyler Gunn [Fri, 31 Mar 2017 15:12:37 +0000 (15:12 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"
am: 78b3cbe4e0

Change-Id: I8dbfda0871dd06cf446fa42debba955e18b4bf0f

7 years agoMerge "Add carrier config to hide merge button for IMS conference"
Tyler Gunn [Fri, 31 Mar 2017 15:05:35 +0000 (15:05 +0000)]
Merge "Add carrier config to hide merge button for IMS conference"

7 years agoMerge "Self Managed CS Implementation"
Tyler Gunn [Fri, 31 Mar 2017 04:26:27 +0000 (04:26 +0000)]
Merge "Self Managed CS Implementation"
am: 98fad21a8a

Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd

7 years agoMerge "Self Managed CS Implementation"
Treehugger Robot [Fri, 31 Mar 2017 04:11:53 +0000 (04:11 +0000)]
Merge "Self Managed CS Implementation"

7 years agoSelf Managed CS Implementation
Tyler Gunn [Tue, 14 Mar 2017 01:15:15 +0000 (18:15 -0700)]
Self Managed CS Implementation

- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.

Test: Unit
Bug: 34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd

7 years agoMerge "Introduce Authentication Failure reason codes"
Sohani Rao [Fri, 31 Mar 2017 01:51:30 +0000 (01:51 +0000)]
Merge "Introduce Authentication Failure reason codes"
am: e23b2c6c59

Change-Id: I5e002f4b341f2a295ed6d8a2213bc9401fcde008

7 years agoMerge "Introduce Authentication Failure reason codes"
Treehugger Robot [Fri, 31 Mar 2017 01:43:50 +0000 (01:43 +0000)]
Merge "Introduce Authentication Failure reason codes"

7 years agoMerge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
Joel Scherpelz [Fri, 31 Mar 2017 00:42:57 +0000 (00:42 +0000)]
Merge "Partially revert "Add blocking and retrying wrappers for INetd uses.""
am: 8b560611bf

Change-Id: I65e9137ae4c4f48e5484059244833edeab41f001