OSDN Git Service
Tej Singh [Wed, 21 Mar 2018 17:41:24 +0000 (17:41 +0000)]
Merge "Logging: Bluetooth Enabled"
am:
8173db40c3
Change-Id: I41cc9b255e777d137941aa305cbcb5d7de376b10
Treehugger Robot [Wed, 21 Mar 2018 16:25:27 +0000 (16:25 +0000)]
Merge "Logging: Bluetooth Enabled"
nharold [Wed, 21 Mar 2018 03:36:44 +0000 (03:36 +0000)]
Merge "Check mOwnedByTransform to avoid DELSA on SPI"
am:
94d8fa0da6
Change-Id: Id194eb67947e9dae369b2a2d30b55e7e1cf2d7c8
Kevin Chyn [Wed, 21 Mar 2018 02:45:24 +0000 (02:45 +0000)]
Merge "Fingerprint navigation settings is a secure setting"
am:
ccf1064825
Change-Id: Ib45e3feff0ca9d8ee55b1a23e170436bd9b5f0eb
Cassie [Wed, 21 Mar 2018 01:37:06 +0000 (01:37 +0000)]
Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity.'"
am:
e3ee136c89
Change-Id: I59e6cf8f210345a65e3d841932d8e8897be0c108
nharold [Wed, 21 Mar 2018 01:27:22 +0000 (01:27 +0000)]
Merge "Check mOwnedByTransform to avoid DELSA on SPI"
Treehugger Robot [Wed, 21 Mar 2018 00:31:58 +0000 (00:31 +0000)]
Merge "Fingerprint navigation settings is a secure setting"
Treehugger Robot [Wed, 21 Mar 2018 00:15:10 +0000 (00:15 +0000)]
Merge "Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and getOperatorAlphaShort to CellIdentity.'"
nharold [Wed, 21 Mar 2018 00:12:50 +0000 (00:12 +0000)]
Merge "Expose add/removeAddress for IpSecInterfaces"
am:
8e2b079f56
Change-Id: Ia04b3bea771d0939cd33becfd792166df38ad0d6
Kevin Chyn [Tue, 20 Mar 2018 21:42:39 +0000 (14:42 -0700)]
Fingerprint navigation settings is a secure setting
Fixes:
76025501
Test: turning on/off the navigation setting actually turns on/off
the ability to swipe the notification panel
Change-Id: I465fcebfc1e248bd37a609f404462ae8a45cf31b
Merged-In: I465fcebfc1e248bd37a609f404462ae8a45cf31b
Signed-Off-By: Siarhei Vishniakou <svv@google.com>
nharold [Tue, 20 Mar 2018 22:53:39 +0000 (22:53 +0000)]
Merge "Expose add/removeAddress for IpSecInterfaces"
Nan Zhang [Tue, 20 Mar 2018 22:22:34 +0000 (22:22 +0000)]
Merge "Remove Make side (system/test-)api-stubs droiddoc targets"
am:
3dd075ad1c
Change-Id: Ic44b867e831713ebabca6ab04abd77eb854300cf
Stanley Tng [Tue, 20 Mar 2018 22:16:01 +0000 (22:16 +0000)]
Merge "Remove BLE App entry from mBleApps list when App died"
am:
1a99d557e1
Change-Id: I85bd3a4c0bd1ef0fe91341b7193941bef24b2013
Jeff Davidson [Tue, 20 Mar 2018 22:09:57 +0000 (22:09 +0000)]
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps."
am:
88826dceef
Change-Id: I11e1f761955aa2b2419aa942ec3068e7adc26d2f
Benedict Wong [Tue, 20 Mar 2018 22:06:30 +0000 (22:06 +0000)]
Merge "Add support for auth-only transforms"
am:
275749c0b2
Change-Id: I75a4f75f7c8d0de40da329d4c0a86d546ee9fcb2
Cassie [Tue, 20 Mar 2018 17:15:50 +0000 (10:15 -0700)]
Cherry-pick 'Add @Nullable annotations to getOperatorAlphaLong and
getOperatorAlphaShort to CellIdentity.'
Bug:
75984192
Test: Unit test
Change-Id: I71feb20075559c7b28d4aa346a603f0d11ca69da
Merged-In: I71feb20075559c7b28d4aa346a603f0d11ca69da
Madiyar Aitbayev [Tue, 20 Mar 2018 21:01:47 +0000 (21:01 +0000)]
Merge "Close file descriptors of ProfilerInfo"
am:
fedc8278ea
Change-Id: I14cb671fad07b3115c2d5237fc9aff0e3c94a349
Treehugger Robot [Tue, 20 Mar 2018 20:04:47 +0000 (20:04 +0000)]
Merge "Remove Make side (system/test-)api-stubs droiddoc targets"
Nathan Harold [Tue, 20 Mar 2018 19:26:10 +0000 (12:26 -0700)]
Expose add/removeAddress for IpSecInterfaces
When exposing the APIs, these were missed.
The outer structure is exposed, so this exposes
the addAddress and removeAddress methods.
Bug:
75234273
Test: compilation
Change-Id: I79911434f9baa660e4d8564cc59d80da4a710c42
Treehugger Robot [Tue, 20 Mar 2018 19:20:12 +0000 (19:20 +0000)]
Merge "Remove BLE App entry from mBleApps list when App died"
Jeff Davidson [Tue, 20 Mar 2018 18:47:34 +0000 (18:47 +0000)]
Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps."
Nan Zhang [Tue, 13 Mar 2018 23:16:34 +0000 (16:16 -0700)]
Remove Make side (system/test-)api-stubs droiddoc targets
Remove old droiddoc targets for api-stubs, system-api-stubs, and test-api-stubs.
And also set api_tag_name, api_filename, private_api_filename, and etc.
properties in Android.bp for new droiddoc.
Test: manually compare if dependencies change after Soong based droiddoc runs.
Bug: b/
70351683
Change-Id: I8d944c83de120ec8148276adc1c9872113d9d29b
Merged-In: I8d944c83de120ec8148276adc1c9872113d9d29b
Treehugger Robot [Tue, 20 Mar 2018 18:36:04 +0000 (18:36 +0000)]
Merge "Add support for auth-only transforms"
Nathan Harold [Wed, 28 Feb 2018 03:19:40 +0000 (19:19 -0800)]
Check mOwnedByTransform to avoid DELSA on SPI
The owned by transform flag prevents the removal
of an SPI from accidentally deleting an associated
SA in the kernel. That flag wasn't actually being
checked, so deleting an SPI would result in the
transform being removed.
The existing code already guarantees that the SA is
deleted when the transform is deleted
Bug:
73258845
Test: runtest frameworks-net
Change-Id: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
Madiyar Aitbayev [Tue, 20 Mar 2018 18:14:42 +0000 (18:14 +0000)]
Merge "Close file descriptors of ProfilerInfo"
Stanley Tng [Mon, 19 Mar 2018 20:06:45 +0000 (13:06 -0700)]
Remove BLE App entry from mBleApps list when App died
When a registered BLE App unexpectedly dies, its entry in mBleApps
list needs to be cleanup/removed.
Test: Manual test by repeatedly killing the gms core process.
Bug:
74076974
Change-Id: I2dc86b782dd6b07017a360a0b709504f0a375969
Andreas Gampe [Tue, 20 Mar 2018 16:29:45 +0000 (16:29 +0000)]
Merge "Frameworks: Fix Binder.joinThreadPool"
am:
448003fc49
Change-Id: I8c30b82c4317fc22a1e0ef92e0a3dc2e3b5e8710
Madiyar Aitbayev [Mon, 19 Mar 2018 16:51:48 +0000 (16:51 +0000)]
Close file descriptors of ProfilerInfo
When using "am start --start-profiler" command, am doesn't close
instances of related ParcelFileDescriptor of the profiler file path,
but relies on garbage collection, so at the system level the file
kept open for longer than it is needed. In a result, some processes
that monitors the file close event using unix inotify_add_watch
method would wait 20~30 Seconds.
This change closes file descriptors after passing it to ActivityThread
process, which is similar to what "am profile start" does.
Bug: b/
73891014
Test: tested manually by flashing into Pixel XL device.
Merged-In: I5b63b96335fdaf86f0cd0caec2c53c32c0e41d72
Change-Id: I5b63b96335fdaf86f0cd0caec2c53c32c0e41d72
Treehugger Robot [Tue, 20 Mar 2018 15:06:15 +0000 (15:06 +0000)]
Merge "Frameworks: Fix Binder.joinThreadPool"
Andreas Gampe [Fri, 16 Mar 2018 22:58:24 +0000 (15:58 -0700)]
Frameworks: Fix Binder.joinThreadPool
Fix the lack of a native implementation.
(cherry picked from commit
acd1987950d54afef1f69dad11840996c22cb8fe)
Bug:
75254055
Bug:
75291614
Test: atest BinderTest
Merged-In: Id5b15442a59851e566a24d406a7487f9de66d42f
Change-Id: Id5b15442a59851e566a24d406a7487f9de66d42f
Jeff Davidson [Fri, 16 Mar 2018 00:10:58 +0000 (17:10 -0700)]
Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps.
Bug:
70177947
Bug:
70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Merged-In: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
Change-Id: I4061becb1d7ceaa58d84e4e3568c1b6e63cfc8d1
Benedict Wong [Mon, 19 Mar 2018 23:45:10 +0000 (23:45 +0000)]
Merge "Added implementation for VTI add/remove address"
am:
2543fbd8a2
Change-Id: Id49ef89d3076c9a6d5257b006965844ab77743ce
Jeff Davidson [Mon, 19 Mar 2018 22:39:02 +0000 (22:39 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners."
am:
fe78972bb2
Change-Id: I689aa7570113ace6f0a89acfaaea3844efff8cad
Brad Ebinger [Mon, 19 Mar 2018 22:33:01 +0000 (22:33 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing"
am:
78a7b5d44a
Change-Id: If11be7e1ee331ca17ab4a18270faa47c0b7798a6
Benedict Wong [Mon, 19 Mar 2018 22:05:09 +0000 (22:05 +0000)]
Merge "Added implementation for VTI add/remove address"
Treehugger Robot [Mon, 19 Mar 2018 21:24:27 +0000 (21:24 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners."
Andreas Gampe [Mon, 19 Mar 2018 21:24:24 +0000 (21:24 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
am:
af3dc4fc70
Change-Id: Ib7b56bb493be1053d2277a68a1d64010eb7d6033
Treehugger Robot [Mon, 19 Mar 2018 21:04:56 +0000 (21:04 +0000)]
Merge "Add empty CdmaSmsSubaddress to CDMA PDU parsing"
Ajay Panicker [Mon, 19 Mar 2018 20:03:32 +0000 (20:03 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
am:
61265410e8
Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef
Treehugger Robot [Mon, 19 Mar 2018 19:38:13 +0000 (19:38 +0000)]
Merge "Frameworks: Handle exceptions in SystemProperties callbacks"
Treehugger Robot [Mon, 19 Mar 2018 18:38:40 +0000 (18:38 +0000)]
Merge "Add the AVRCP Target Service (2/2)"
Tyler Gunn [Mon, 19 Mar 2018 18:36:10 +0000 (18:36 +0000)]
Merge "Rename handover failure constant per API review comments."
am:
7c8a877231
Change-Id: Ic3cd64d00f6c5a44acb9f6913fe728bd252fa99a
Bruno Martins [Mon, 19 Mar 2018 18:29:17 +0000 (18:29 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase"
am:
2446a10799
Change-Id: I211f94c3dedc4f288d436ba3aff7f52309a994d3
Tyler Gunn [Mon, 19 Mar 2018 17:15:58 +0000 (17:15 +0000)]
Merge "Rename handover failure constant per API review comments."
Treehugger Robot [Mon, 19 Mar 2018 16:31:29 +0000 (16:31 +0000)]
Merge "DndTile: Avoid yet another NPE during boot up phase"
Andreas Gampe [Fri, 16 Mar 2018 23:14:29 +0000 (16:14 -0700)]
Frameworks: Handle exceptions in SystemProperties callbacks
When notifying callbacks, catch thrown exceptions.
Bug:
73058952
Test: m
Test: atest SystemPropertiesTest
Change-Id: I1c61e11b833e8ddd30d80b9859b20a9fb3185a33
Bruno Martins [Sat, 17 Mar 2018 13:55:42 +0000 (13:55 +0000)]
DndTile: Avoid yet another NPE during boot up phase
* Tile state update can only take place once mController
is properly initialized.
Change-Id: Ia6c1d6dee7d3e396a5bb6910e03859a0c0cc94ae
nharold [Sat, 17 Mar 2018 02:00:57 +0000 (02:00 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
am:
00ef20e853
Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
Benedict Wong [Fri, 16 Mar 2018 02:41:41 +0000 (19:41 -0700)]
Add support for auth-only transforms
Kernel limitations prevent auth-only SAs from being created. Explicitly
request a null encryption algorithm instead of omitting the algorithm
to comply with the kernel requirement for ESP.
Bug:
75049573
Test: CTS tests for auth-only, crypt-only transforms added for all
combinations of (UDP, TCP, IPv4, IPv6, UDP-encap) Also added unit
tests to ensure correct triggering of NULL_CRYPT usage.
Change-Id: Ia9a5cfee9c7786412846bc039f326420f6211c08
nharold [Sat, 17 Mar 2018 00:33:10 +0000 (00:33 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
Nathan Harold [Tue, 6 Mar 2018 21:22:22 +0000 (13:22 -0800)]
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
Jack Yu [Fri, 16 Mar 2018 23:07:24 +0000 (23:07 +0000)]
Merge "Renamed getNetworkId and getSystemId"
am:
5b7103ab97
Change-Id: Ica71497d03bf2752cac6a4af7bc9890a0bb3596f
Jack Yu [Fri, 16 Mar 2018 21:50:19 +0000 (21:50 +0000)]
Merge "Renamed getNetworkId and getSystemId"
Ruchi Kandoi [Fri, 16 Mar 2018 21:28:18 +0000 (21:28 +0000)]
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"
am:
01cef932c8
Change-Id: Ic8c8b5566a4278af7ecf745d4b3c8d18a1d848b7
Brad Ebinger [Fri, 16 Mar 2018 20:49:52 +0000 (20:49 +0000)]
Merge "Define phone process as a constant"
am:
465fdc2b25
Change-Id: I4414b2e40dcaa459d8c9209082f66c9656013e50
Brad Ebinger [Fri, 16 Mar 2018 20:33:57 +0000 (20:33 +0000)]
Merge "Added Locking for MmTelFeature"
am:
d273dea10b
Change-Id: Iec9f34bb85d4f04349690799b6d69b4061950bb0
Treehugger Robot [Fri, 16 Mar 2018 20:12:04 +0000 (20:12 +0000)]
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME"
Tyler Gunn [Fri, 16 Mar 2018 16:53:44 +0000 (09:53 -0700)]
Rename handover failure constant per API review comments.
Expanding EMERG to EMERGENCY.
Test: Build code
Bug:
74831393
Change-Id: Ib7e6bea84e25b1e1a2ddb154c7ed62f1084a7596
Jack Yu [Fri, 16 Mar 2018 19:36:31 +0000 (19:36 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
am:
a9c0419010
Change-Id: I6bc4d056458e7c57729c0b37b7867ad08fe8d637
yinxu [Fri, 16 Mar 2018 19:31:26 +0000 (19:31 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan"
am:
cdbf930883
Change-Id: Icd89a86250d28c271f0a3ba2dc1553b313ace646
Anthony Stange [Fri, 16 Mar 2018 19:29:03 +0000 (19:29 +0000)]
Merge "Add scan background mode to Settings.Global."
am:
3aa064897e
Change-Id: I2993a751fbf17b561f770307f199ab1c1d4469b8
Brad Ebinger [Fri, 16 Mar 2018 18:38:30 +0000 (18:38 +0000)]
Merge "Define phone process as a constant"
Brad Ebinger [Thu, 15 Mar 2018 22:18:57 +0000 (15:18 -0700)]
Add empty CdmaSmsSubaddress to CDMA PDU parsing
We were not providing an empty subaddress when
parsing CDMA PDU, which caused an NPE when receiving
CDMA IMS SMS.
Bug:
73994015
Test: Manual, MT/MO SMS
Change-Id: I07be3ac64341eb9235f6da1b6870ac746188f73a
Ajay Panicker [Fri, 16 Mar 2018 11:00:27 +0000 (04:00 -0700)]
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
Brad Ebinger [Fri, 16 Mar 2018 18:21:07 +0000 (18:21 +0000)]
Merge "Added Locking for MmTelFeature"
Jack Yu [Thu, 15 Mar 2018 20:51:05 +0000 (13:51 -0700)]
Renamed getNetworkId and getSystemId
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()
Test: Build
Bug:
74976831
Merged-In: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
(cherry picked from commit
2661fac133db49124d2377f49506b12c1a6c9505)
Treehugger Robot [Fri, 16 Mar 2018 17:39:38 +0000 (17:39 +0000)]
Merge "Added CTS test cases for getNetworkId() and getSystemId()"
Benedict Wong [Fri, 2 Mar 2018 02:53:07 +0000 (18:53 -0800)]
Added implementation for VTI add/remove address
This change adds implementation details for add/remove addresses onto a
VTI.
Bug:
73675031
Test: New tests added, passing on Walleye
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
Treehugger Robot [Fri, 16 Mar 2018 17:23:53 +0000 (17:23 +0000)]
Merge "Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan"
Treehugger Robot [Fri, 16 Mar 2018 16:15:50 +0000 (16:15 +0000)]
Merge "Add scan background mode to Settings.Global."
Anthony Stange [Wed, 14 Mar 2018 01:09:45 +0000 (01:09 +0000)]
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
Jack Yu [Fri, 23 Feb 2018 01:37:38 +0000 (17:37 -0800)]
Added CTS test cases for getNetworkId() and getSystemId()
Bug:
32718590
Test: atest CtsTelephonyTestCases:ServiceStateTest#testServiceState
Merged-In: I5826a59d85028f0350ee39c69553f4e488d6456b
Change-Id: I5826a59d85028f0350ee39c69553f4e488d6456b
(cherry picked from commit
1b8b38928b4e20e7e66ab75e39159b158dc5c4c9)
Chen Xu [Fri, 16 Mar 2018 02:06:17 +0000 (02:06 +0000)]
Merge "reword title of CS rejection notification"
am:
790e4f475f
Change-Id: Ief67959059827ace01249305f7d25fe3ed83308b
Miao-chen Chou [Fri, 16 Mar 2018 01:13:07 +0000 (01:13 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
am:
00cc1847d3
Change-Id: I5a6d39107b49690e11afd8c7e394554fbf616e11
Chen Xu [Fri, 16 Mar 2018 00:51:04 +0000 (00:51 +0000)]
Merge "reword title of CS rejection notification"
Treehugger Robot [Thu, 15 Mar 2018 23:50:49 +0000 (23:50 +0000)]
Merge "Bluetooth: preserve one advertisement slot for GMS core"
fionaxu [Sat, 18 Nov 2017 01:07:14 +0000 (17:07 -0800)]
reword title of CS rejection notification
Device will show a notification when receive MM rejection code from
Network due to CS registration failure. Notification message is
confusing today as it doesn't specify the domain that's being blocked.
The fix is explicitly specifying voice service impact for various MM
rejection code.
(cherry picked from commit
a6b9fda6245d21ac9e7370a8d8dd13deff73458c)
Bug:
67754753
Test: Manual
Change-Id: Ia5e93a26f8dccfc18c9dcb63b773e5b23734fd0d
(cherry picked from commit
de9d7784ec5879f1d9bebb8851f3b0e82fa82333)
Merged-in: I656ba438659aedce7f56f167707a12ce07286594
Ruchi Kandoi [Thu, 15 Mar 2018 22:15:18 +0000 (15:15 -0700)]
NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME
Test: compiles
Bug:
74976874
Change-Id: Ied783f57078aaa37017cc821adf329ececac74f3
Chen Xu [Thu, 15 Mar 2018 21:46:59 +0000 (21:46 +0000)]
Merge "rename notifications from carrierServiceStateTracker"
am:
6a7bb0694f
Change-Id: I2df44b61548efb65e872867b6feabec9da80e3a8
Jack Yu [Thu, 15 Mar 2018 20:39:46 +0000 (20:39 +0000)]
Merge "Fixed data connection state callback not working"
am:
28d076b829
Change-Id: If14c65c653f9665941985a71a60310cad2395265
yinxu [Thu, 15 Mar 2018 18:39:15 +0000 (11:39 -0700)]
Use AsyncTask.SERIAL_EXECUTOR as the default executor for scan
Because there will be multiple callbacks for each scan and they must be
invoked with the same order as they are received by the platform, we
should use AsyncTask.SERIAL_EXECUTOR instead of
AsyncTask.THREAD_POOL_EXECUTOR as the default executor.
Bug:
74840070
Test: Unit Test, CTS Test
Change-Id: I7333940dad38f7e400a4124486bdb21cea0d5220
Chen Xu [Thu, 15 Mar 2018 20:19:48 +0000 (20:19 +0000)]
Merge "rename notifications from carrierServiceStateTracker"
Treehugger Robot [Thu, 15 Mar 2018 19:04:30 +0000 (19:04 +0000)]
Merge "Fixed data connection state callback not working"
fionaxu [Thu, 15 Mar 2018 01:33:47 +0000 (18:33 -0700)]
rename notifications from carrierServiceStateTracker
Bug:
37578776
Bug:
72712198
Test: Manual
Change-Id: Ifcf670c03f3777e08f03c1a4f0c3f3d6092192b2
(cherry picked from commit
8683f651388ebc4ba063f6e21afb8ceff23c58a0)
Merged-in: Ifcf670c03f3777e08f03c1a4f0c3f3d6092192b2
Mathew Inwood [Thu, 15 Mar 2018 18:16:57 +0000 (18:16 +0000)]
Merge "Amend package whitelist."
am:
e70b94815a
Change-Id: Id1ba1faec336422406c47848790180173a12b3c6
Jeff Davidson [Thu, 1 Mar 2018 01:50:16 +0000 (17:50 -0800)]
Allow carrier-privileged apps to register telephony listeners.
For TelephonyManager#listen, we check carrier privileges if
READ_PHONE_STATE is missing for any calls which enforce the
permission. For calls which check it and behave differently (by
redacting sensitive info), we defer the permission check until the
actual event occurs, at which point it is checked based on the current
state of the device.
For SubscriptionManager#addOnSubscriptionsChangedListener, we remove
the existing permission check for READ_PHONE_STATE altogether. The
event itself contains no information, and reading subscriptions still
requires either READ_PHONE_STATE or carrier privileges on the
subscription in question.
Also updates incorrect Javadoc on
PhoneStateListener#LISTEN_SIGNAL_STRENGTH, which does not actually
check any permissions by design.
Bug:
70041899
Fixes:
74034127
Test: TreeHugger + E2E test w/ a carrier-privileged app
Change-Id: I84a56ad3972b9edcfdefcbb43ef174c54cdcac00
Merged-In: I84a56ad3972b9edcfdefcbb43ef174c54cdcac00
(cherry picked from commit
62b994b3cf0f05801bd8b58a5874118c404d656b)
Jack Yu [Wed, 14 Mar 2018 23:23:38 +0000 (16:23 -0700)]
Fixed data connection state callback not working
The old behavior of onDataConnectionStateChanged callback is that
if at least one data connection for one APN type (e.g. default,
mms, supl, ims, etc...) is connected, then it reports connected.
It only reports disconnected if data for all APN types are
disconnected.
Since now we have data connections are always connected. For example,
even if the user disables data, the unmetered IMS data remains
connected. In this case the client's onDataConnectionStateChanged
won't be called.
Now we changed the behavior of onDataConnectionStateChanged to
report the connection state for default APN type only. This matches
the behavior of TelephonyManager.getDataState().
Test: Manual
Bug:
73226433
Merged-In: I0744cf33337864c946af6e7d186bab78584acfa4
Change-Id: I0744cf33337864c946af6e7d186bab78584acfa4
(cherry picked from commit
b1bac54d609703ec5fbc633fab89c73994289496)
Andreas Gampe [Thu, 15 Mar 2018 17:10:15 +0000 (17:10 +0000)]
Merge "Frameworks: Fix system server profiling"
am:
eed99d8629
Change-Id: Ia07782e694d066f827e99fffa49c93321444b851
Treehugger Robot [Thu, 15 Mar 2018 16:42:10 +0000 (16:42 +0000)]
Merge "Amend package whitelist."
Treehugger Robot [Thu, 15 Mar 2018 15:36:28 +0000 (15:36 +0000)]
Merge "Frameworks: Fix system server profiling"
Mathew Inwood [Thu, 15 Mar 2018 14:05:53 +0000 (14:05 +0000)]
Amend package whitelist.
Now that Antons cleanup of all packages is complete, we can generate this
whitelist from those packages that specify
LOCAL_PRIVATE_PLATFORM_APIS := true
This is the resulting list of packages. This change also includes fixes to
the method; previously, packges that didn't specify any certificate may
have been exluded.
Test: Verify that device boots.
Change-Id: I1f578322135274b80708d4bb7664f7732ac33cc7
Colin Cross [Thu, 15 Mar 2018 06:47:37 +0000 (06:47 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""
am:
79fe334055
Change-Id: If3575ef82b34e5685b5fed36f7cb0a7e2e6e0d93
Andreas Gampe [Thu, 15 Mar 2018 06:13:28 +0000 (23:13 -0700)]
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
Colin Cross [Thu, 15 Mar 2018 05:25:39 +0000 (05:25 +0000)]
Merge "Revert "Add RequestShortAudioDescriptorAction. [1/2]""
Colin Cross [Thu, 15 Mar 2018 05:24:49 +0000 (05:24 +0000)]
Revert "Add RequestShortAudioDescriptorAction. [1/2]"
This reverts commit
9e16580f78a6621c8957f427b6d9b8fadc813afd.
Reason for revert: Broke all the builds.
Change-Id: If2b8a0a36d6e2a902c33a66b82b11f693d7f7139
Dan Zhang [Thu, 15 Mar 2018 03:35:12 +0000 (03:35 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]"
am:
c27ebbaa8f
Change-Id: Iffeeccf9056131edb8921a1597b3b34b320cd747
Dan Zhang [Thu, 15 Mar 2018 01:49:37 +0000 (01:49 +0000)]
Merge "Add RequestShortAudioDescriptorAction. [1/2]"
Tej Singh [Tue, 13 Mar 2018 20:37:18 +0000 (13:37 -0700)]
Logging: Bluetooth Enabled
Logs bluetooth enabled state changed.
Test: verified logs appeared in logcat
Change-Id: I2c553aa68e566f9dfd0a5e353a5a6e15a06e7893
Miao-chen Chou [Wed, 14 Mar 2018 22:00:23 +0000 (15:00 -0700)]
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
Qingxi Li [Wed, 14 Mar 2018 23:17:14 +0000 (23:17 +0000)]
Merge "Add API to check extended APDU Supported"
am:
fd4385e633
Change-Id: I8f5441a58b8ca8b8aa2aa6138716c08749d6b814