Commit Graph

75837 Commits

Author SHA1 Message Date
Andreas Gampe
bccdf32c8a Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
am: af3dc4fc70

Change-Id: Ib7b56bb493be1053d2277a68a1d64010eb7d6033
2018-03-19 21:24:24 +00:00
Ajay Panicker
a33ad4f2bd Merge "Add the AVRCP Target Service (2/2)"
am: 61265410e8

Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef
2018-03-19 20:03:32 +00:00
Treehugger Robot
af3dc4fc70 Merge "Frameworks: Handle exceptions in SystemProperties callbacks" 2018-03-19 19:38:13 +00:00
Treehugger Robot
61265410e8 Merge "Add the AVRCP Target Service (2/2)" 2018-03-19 18:38:40 +00:00
Andreas Gampe
7074e6fd4c Frameworks: Handle exceptions in SystemProperties callbacks
When notifying callbacks, catch thrown exceptions.

Bug: 73058952
Test: m
Test: atest SystemPropertiesTest
Change-Id: I1c61e11b833e8ddd30d80b9859b20a9fb3185a33
2018-03-19 08:36:11 -07:00
nharold
e3a6b678c3 Merge "Docstring Updates for applyTransportModeTransform"
am: 00ef20e853

Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
2018-03-17 02:00:57 +00:00
nharold
00ef20e853 Merge "Docstring Updates for applyTransportModeTransform" 2018-03-17 00:33:10 +00:00
Nathan Harold
f4cdf25a90 Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
2018-03-16 17:29:45 -07:00
Ruchi Kandoi
7ad52283ab Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"
am: 01cef932c8

Change-Id: Ic8c8b5566a4278af7ecf745d4b3c8d18a1d848b7
2018-03-16 21:28:18 +00:00
Treehugger Robot
01cef932c8 Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" 2018-03-16 20:12:04 +00:00
Anthony Stange
4061a9f348 Merge "Add scan background mode to Settings.Global."
am: 3aa064897e

Change-Id: I2993a751fbf17b561f770307f199ab1c1d4469b8
2018-03-16 19:29:03 +00:00
Ajay Panicker
38c3073ba2 Add the AVRCP Target Service (2/2)
Add the AVRCP Target constant to Bluetooth Profile. Also remove redundant
public static final modifier on the constants.

Bug: 68854188
Test: Compiles and local test with service enabled
Change-Id: If2ec607fc704c225f8903d438fe970dfafac25f1
2018-03-16 18:22:00 +00:00
Anthony Stange
ff54a35a0f Add scan background mode to Settings.Global.
This enables us to mess with the different scan intervals and shift
clients to a different scan mode in the background based on what scan
interval values we choose for the different power modes.

Bug: 71765044
Test: None. Just adding a key.
Change-Id: Id48ebc521dd3fe8a68c9c4c0bdb1018ea5b3743e
2018-03-16 16:07:45 +00:00
Miao-chen Chou
922ae0237f Merge "Bluetooth: preserve one advertisement slot for GMS core"
am: 00cc1847d3

Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
2018-03-16 01:13:07 +00:00
Treehugger Robot
00cc1847d3 Merge "Bluetooth: preserve one advertisement slot for GMS core" 2018-03-15 23:50:49 +00:00
Ruchi Kandoi
9a33aefd65 NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME
Test: compiles
Bug: 74976874
Change-Id: Ied783f57078aaa37017cc821adf329ececac74f3
2018-03-15 15:16:39 -07:00
Andreas Gampe
e8d1374024 Merge "Frameworks: Fix system server profiling"
am: eed99d8629

Change-Id: Ia07782e694d066f827e99fffa49c93321444b851
2018-03-15 17:10:15 +00:00
Andreas Gampe
5a8ea8c619 Frameworks: Fix system server profiling
Avoid a race to close the profiling file descriptor.

Bug: 74883338
Test: m
Test: am profile start `pid system_server` /data/local/tmp/test.trace && sleep 5s && am profile stop `pid system_server` && adb pull /data/local/tmp/test.trace && [[ $(find test.trace -size +1K) ]] && echo Success
Change-Id: Ib506ce38ac1ac7c0b91079ba9b35aca6ae289d22
2018-03-14 23:19:21 -07:00
Miao-chen Chou
9d3389d17e Bluetooth: preserve one advertisement slot for GMS core
This brings back the check on the multiple advertisement support before
granting any Bluetooth LE advertiser. In other words, one slot is preserved
for GMS core.

Bug: 74819586
Test: Run an BLE application and verify the number of advertisements
Change-Id: Iac3b47c76c6f699018982a69e9b04a9d8c631bfb
2018-03-14 16:35:11 -07:00
Tej Singh
363941bd30 DO NOT MERGE: Add to dummy StatsLog class
Changing some of the atoms, so changing the corresponding write method.

Test: build on Marlin
Change-Id: I0fe8418caad7df97dc8f9fed13a9dc423d9c50f6
2018-03-13 15:10:43 -07:00
Ruchi Kandoi
5800d2b299 Merge "Remove the UICC specific code from android.se.omapi"
am: 56be32e1ce

Change-Id: I458cfa98edde0176f84d858fb55e110647f06774
2018-03-13 20:08:36 +00:00
Ruchi Kandoi
56be32e1ce Merge "Remove the UICC specific code from android.se.omapi" 2018-03-13 17:56:26 +00:00
Erik Kline
5e9725bdc7 Merge "Add new netd event callback for changes to private DNS validation state."
am: 40ca5a06bf

Change-Id: I504148b6a508b6f5e4b5dfa0976362496b91c15c
2018-03-13 13:11:37 +00:00
dalyk
99c5029b91 Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug: 71828272
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
2018-03-12 15:00:55 -04:00
Pavel Maltsev
9b3c003c46 Merge "Fixing comments in Network Capabilities"
am: e58f15fded

Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5
2018-03-12 07:57:07 +00:00
Treehugger Robot
e58f15fded Merge "Fixing comments in Network Capabilities" 2018-03-12 07:42:58 +00:00
Yoshiaki Naka
71dad9a276 Remove the UICC specific code from android.se.omapi
It is better to remove the UICC specific code from frameworks/base. The
code will be moved to SecureElementSession.openLogicalChannel().

Bug: 73331557
Test: Confirmed that OMAPI TC 6.4.7 ID3b passed with this change.

Change-Id: I1dda1d741306b417b1b886cdcee5ef89f86390e3
2018-03-12 14:28:00 +09:00
Pavel Maltsev
e18ef26a59 Fixing comments in Network Capabilities
Clean up after aosp/606338

Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
2018-03-09 10:42:32 -08:00
Jordan Liu
05bb2fd410 Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command"
am: f5b680c82a

Change-Id: I7a481dbbf35f0a21e6b2268d1293a614d589e992
2018-03-09 17:48:46 +00:00
Jordan Liu
f5b680c82a Merge "Support ENVELOPE (EVENT DOWNLOAD - User activity) command" 2018-03-09 16:20:09 +00:00
Chalard Jean
c8b846e1ac Merge "Deprecate most of NetworkInfo."
am: 92a9847de9

Change-Id: I1d12c161f7e388451059a92b68a1511fbf8006a1
2018-03-09 12:57:15 +00:00
Chalard Jean
8117f93a49 Deprecate most of NetworkInfo.
getType, getTypeName, isConnectedOrConnecting, isConnected,
isAvaisable, isFailover, isRoaming, getState, getDetailedState,
getReason, and the TYPE_* constants in ConnectivityManager
along with methods that use them are now stacked on a boat
bound for the other side of the Styx.

Test: no code changes
Bug: 62844794
Change-Id: Idd70763de5b1af5580b4734cd443ac4b570069cc
2018-03-09 15:38:25 +09:00
Yoshiaki Naka
d143760239 Support ENVELOPE (EVENT DOWNLOAD - User activity) command
The terminal shall send the ENVELOPE (EVENT DOWNLOAD - User activity)
command to the UICC when some user activity like a key-press or touch is
detected if the user activity event is a part of the current event list.
This change allows the SIM Toolkit application to support that event.
Please refer to the specification of SET UP EVENT LIST command described
in ETSI TS 102.223.

Bug: 65884891
Test: Confirmed the expected seq 1.1 of ETSI TS 102.384 TC 27.22.4.16
Change-Id: I7d3faa09cd4625db53bcfe21f90570389a4ea037
Merged-In: I7d3faa09cd4625db53bcfe21f90570389a4ea037
2018-03-08 17:02:38 -08:00
Tyler Gunn
b70f2a1886 Merge "Support enhanced call blocking function"
am: fdcdaee2d1

Change-Id: I26c38a7cca8a92011395da5e7ff758d482edbcab
2018-03-09 00:41:31 +00:00
Tyler Gunn
fdcdaee2d1 Merge "Support enhanced call blocking function" 2018-03-08 23:21:16 +00:00
Ruijie Bai
99ca124212 Support enhanced call blocking function
- Add new carrier config to determine whether to enable
enhanced call blocking feature.
- Add new I/F to get/set the call blocking enabled status.
- Add new API to support checking whether a number is
block number with specific extras.

Bug: 28189985
Test: Manual
Change-Id: I7e2fdaecf4c93f3513d756e65bab8e2c2c0b7440
2018-03-08 07:29:20 -08:00
Pete Gillin
bed18a9888 Merge "Add new 'explicit GC' policy to StrictMode."
am: 121eb58ab4

Change-Id: Ice5b3c97fb7a791b2623df8e2de6c2669b920b19
2018-03-08 12:51:56 +00:00
Pete Gillin
121eb58ab4 Merge "Add new 'explicit GC' policy to StrictMode." 2018-03-08 10:55:00 +00:00
Pavel Maltsev
b1e2bfe4df Merge "Minor clean-up in NetworkCapabilities"
am: 539f85a18d

Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f
2018-03-07 23:00:53 +00:00
Treehugger Robot
539f85a18d Merge "Minor clean-up in NetworkCapabilities" 2018-03-07 21:06:59 +00:00
Holly Jiuyu Sun
a77bf7c48b Merge "Remove toString() for CarrierIdentifier."
am: e33b9f6234

Change-Id: I6cbae2674c56f5cd99a6c7814f22dc9e8563d974
2018-03-07 00:39:56 +00:00
Holly Jiuyu Sun
e33b9f6234 Merge "Remove toString() for CarrierIdentifier." 2018-03-06 23:16:54 +00:00
Siddharth Ray
a09adc6db1 Merge "Obtain cellular related battery statistics"
am: 4b0172bcb6

Change-Id: I364d329e92a6bd92ce601d34c94a92c91f09eb38
2018-03-06 20:08:15 +00:00
Eric Erfanian
1a59a97a0c Merge "Update the RTT features constant."
am: c18b175d87

Change-Id: Ic4419be53f3390336a5b95abe34a03944b3437e4
2018-03-06 19:58:14 +00:00
Remi NGUYEN VAN
a6905db1d8 Merge "Allow null subscriberId in NetworkStatsManager."
am: 6bd13af46a

Change-Id: I900ac14224284fc3a1422e8791bc54d6a9ee77ba
2018-03-06 19:37:13 +00:00
Treehugger Robot
4b0172bcb6 Merge "Obtain cellular related battery statistics" 2018-03-06 18:19:20 +00:00
Treehugger Robot
c18b175d87 Merge "Update the RTT features constant." 2018-03-06 16:07:16 +00:00
Pete Gillin
cc5885f92b Add new 'explicit GC' policy to StrictMode.
This change adds the policy but offers no public way to enable it. A
follow-up change will expose the detect/permit methods in the API and
change detectAll to enable it.

This new policy can only be triggered through the libcore BlockGuard API.

Bug: 3400644
Test: cts-tradefed run cts-dev -m CtsLibcoreTestCases
Test: cts-tradefed run cts-dev -m CtsOsTestCases
Change-Id: I2e7f34ce010c78d6a5a7ac85512c045bfb13d204
Merged-In: Ieebe4db747902246968d6382bbc9cee0e539af85
2018-03-06 11:17:07 +00:00
Remi NGUYEN VAN
489e8b02f8 Allow null subscriberId in NetworkStatsManager.
Use a MATCH_MOBILE_WILDCARD template to avoid filtering by
subscriberId when querying statistics from NetworkStatsService.

Bug: 74038898
Change-Id: I4b39e7031416cb33b23d89aa36ff0f774eaa942f
Fixes: 74038898
Test: runtest frameworks-net, CTS tests pass
2018-03-06 13:28:19 +09:00
Jack He
8da4504cad Merge "Bluetooth: Use enums for adapter connection states"
am: 95372e873e

Change-Id: Iab73a463f99de6113146b6541babe95b512ebbfa
2018-03-06 01:02:52 +00:00