OSDN Git Service
Chen Xu [Fri, 23 Mar 2018 05:59:05 +0000 (05:59 +0000)]
Merge "new WFC registration failure notification string"
am:
8bcb7aa971
Change-Id: I7784e82e4b788597ba9c35da7175b485230ab227
Jordan Liu [Fri, 23 Mar 2018 05:04:15 +0000 (05:04 +0000)]
Merge "Add multisim notifications for SST"
am:
1a6228e595
Change-Id: I2fc3c9195da6bf47d6dcaca26d793e956619ccfa
Chen Xu [Fri, 23 Mar 2018 04:00:25 +0000 (04:00 +0000)]
Merge "new WFC registration failure notification string"
Remi NGUYEN VAN [Fri, 23 Mar 2018 03:54:13 +0000 (03:54 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
am:
db89ca3c12
Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a
Treehugger Robot [Fri, 23 Mar 2018 03:47:48 +0000 (03:47 +0000)]
Merge "Add multisim notifications for SST"
Remi NGUYEN VAN [Fri, 23 Mar 2018 02:39:00 +0000 (02:39 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
Jack Yu [Fri, 23 Mar 2018 02:25:24 +0000 (02:25 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
am:
dd6764a522
Change-Id: I0398c058a35fd644aa949375a53719ba85572408
Treehugger Robot [Fri, 23 Mar 2018 00:59:13 +0000 (00:59 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
fionaxu [Thu, 22 Mar 2018 23:37:54 +0000 (16:37 -0700)]
new WFC registration failure notification string
Bug:
37579327
Test: Manual
Change-Id: I5adaf643b2b2c86cac28dabb944765d0a8bcefd0
(cherry picked from commit
6ac589ae665b2190a762d71948de6f41922352d6)
Merged-in: I5adaf643b2b2c86cac28dabb944765d0a8bcefd0
Jack Yu [Thu, 22 Mar 2018 23:28:13 +0000 (16:28 -0700)]
Enable Checkstyle for "repo upload" for more projects.
This CL enables Checkstyle for the following directories:
- telephony/
Bug:
34746646,
32954735
Test: Compilation
Change-Id: Ia67eaf5b871e6b74f21344fef1572835801843a5
Ivan Podogov [Thu, 22 Mar 2018 23:03:17 +0000 (23:03 +0000)]
Merge "HIDD: Address API Review concerns"
am:
8085d6f247
Change-Id: I7f4e272657874b02d122f7ddc291c0f006eeee30
Treehugger Robot [Thu, 22 Mar 2018 21:50:57 +0000 (21:50 +0000)]
Merge "HIDD: Address API Review concerns"
Ying Xu [Thu, 22 Mar 2018 20:32:35 +0000 (20:32 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
am:
ec76adb9ff
Change-Id: I437a82ea0d7d71102f273cbca1b54ef7f332027e
Pankaj Kanwar [Thu, 22 Mar 2018 19:10:11 +0000 (19:10 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
am:
320b6c2312
Change-Id: Ie6f23da9c3c531fef9eb32b52d377a8f0e772b77
Ying Xu [Thu, 22 Mar 2018 19:07:45 +0000 (19:07 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
Tej Singh [Thu, 22 Mar 2018 18:23:52 +0000 (18:23 +0000)]
Merge "Dummy StatsLog class" into stage-aosp-master
Pankaj Kanwar [Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
Jordan Liu [Thu, 22 Mar 2018 06:34:31 +0000 (06:34 +0000)]
Merge "Finalise STK call control strings"
am:
249119da53
Change-Id: Id1179bcd212731f5ceff44ad45b9f7ab6643c5c6
Remi NGUYEN VAN [Tue, 6 Mar 2018 03:36:54 +0000 (12:36 +0900)]
Add method to NetworkStatsService for UID stats.
Useful for clients such as BatteryStats which currently rely
on NetworkStatsFactory. Data at that stage is incomplete as
it does not account for tethering, VT data and corresponding
464xlat corrections.
Test: runtest frameworks-net, CTS tests pass.
Change-Id: I763b77f601c827fd2963204694fb5b45425cc791
Holly Jiuyu Sun [Thu, 22 Mar 2018 05:59:18 +0000 (05:59 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
am:
a99b258049
Change-Id: Id2be8785239c34dbe705f0614aa9bfa9daa0aeec
Jordan Liu [Thu, 22 Mar 2018 05:14:31 +0000 (05:14 +0000)]
Merge "Finalise STK call control strings"
Holly Jiuyu Sun [Thu, 22 Mar 2018 03:45:55 +0000 (03:45 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
Tej Singh [Fri, 2 Mar 2018 02:22:55 +0000 (18:22 -0800)]
Dummy StatsLog class
This is a dummy class that provides StatsLog.write methods and
appropriate constants to log atoms in aosp.
Merged-In: Ib14a74eabfab08bbae5d4d549244f1022e8c34f0
Test: build success on Marlin
Change-Id: I606bc8a96337ced842eb7a2bcba8c4969c9d4748
Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]
Finalise STK call control strings
Bug:
64685331
Bug:
70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Stanley Tng [Wed, 21 Mar 2018 23:29:40 +0000 (23:29 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister"
am:
72fa61b325
Change-Id: Ica7438fe5ebd978192226f3e2b8a0630b843b752
Xin Li [Wed, 21 Mar 2018 23:20:46 +0000 (23:20 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool."
am:
b2df57a42f
Change-Id: I04c23e2c723e591e45310a8d380c2793e0fe05b4
Tyler Gunn [Wed, 21 Mar 2018 22:11:33 +0000 (22:11 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking."
am:
727097a400
Change-Id: I2b2eea70d0c755acc9c2f14a79bca91ea37720d1
Treehugger Robot [Wed, 21 Mar 2018 22:04:50 +0000 (22:04 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister"
nharold [Wed, 21 Mar 2018 22:03:21 +0000 (22:03 +0000)]
Merge "Add alpha Strings to CellIdentityTdscdma"
am:
08ee27ff90
Change-Id: If7773f0c56c3655398f15840bc9fd446755093a1
Treehugger Robot [Wed, 21 Mar 2018 21:48:08 +0000 (21:48 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool."
Yueming Wang [Wed, 21 Mar 2018 21:05:59 +0000 (21:05 +0000)]
Merge "Revert "Logging: Bluetooth Enabled""
am:
21a9ebeb6c
Change-Id: I0f4649369bf3d4c92ef487eaa471ca9481185478
Tyler Gunn [Wed, 21 Mar 2018 21:02:24 +0000 (21:02 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking."
nharold [Wed, 21 Mar 2018 20:28:55 +0000 (20:28 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface"
am:
baa4bf51c1
Change-Id: I1393526aca627b430868816a83c8a40452521fc2
Xin Li [Wed, 21 Mar 2018 20:16:16 +0000 (13:16 -0700)]
Enable Belarusian and Latin languages in fontchain_lint tool.
Bug:
68058172
Merged-In: I747cbb5ea3d36ca63335bfe6b337fad1e75ee79b
Pankaj Kanwar [Wed, 21 Mar 2018 20:20:06 +0000 (20:20 +0000)]
Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
This reverts commit
84a8bb80a15ad9386983a619dafdc10748e6c14e.
Change-Id: Ied14258726d71262642f8d72db5ee11ea671836b
nharold [Wed, 21 Mar 2018 20:06:59 +0000 (20:06 +0000)]
Merge "Add alpha Strings to CellIdentityTdscdma"
Treehugger Robot [Wed, 21 Mar 2018 19:55:58 +0000 (19:55 +0000)]
Merge "Revert "Logging: Bluetooth Enabled""
nharold [Wed, 21 Mar 2018 18:49:44 +0000 (18:49 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface"
Yueming Wang [Wed, 21 Mar 2018 18:20:34 +0000 (18:20 +0000)]
Revert "Logging: Bluetooth Enabled"
This reverts commit
f336d1e9cf8b48fe73ad8527365d5286d673ffba.
Reason for revert: Reverting this CL as it causes several build breakages in git_stage-aosp-master
Change-Id: I4a29f7313857a561452c01fb331accbf59c64a72
Tej Singh [Wed, 21 Mar 2018 17:41:24 +0000 (17:41 +0000)]
Merge "Logging: Bluetooth Enabled"
am:
8173db40c3
Change-Id: I41cc9b255e777d137941aa305cbcb5d7de376b10
Nathan Harold [Sat, 17 Mar 2018 00:27:30 +0000 (17:27 -0700)]
Add NonNull Annotations To IpSec API Surface
This CL adds NonNull annotations to a large
number of method returns and parameters as
part of API council feedback.
Bug:
72473424
Test: compilation (docstring-only change)
Change-Id: I2f865dde56fe12116c461ad98e9460bf1802ce18
Ivan Podogov [Tue, 27 Feb 2018 17:58:16 +0000 (17:58 +0000)]
HIDD: Address API Review concerns
* Replace bare field usage with getter methods;
* Remove Builder;
* Move BluetoothHidDeviceCallback to inner class;
* Remove toArray() and equals();
* Throw IllegalArgumentException where applicable;
* Add an Executor parameter before Callback;
Bug:
72168436,
72168126
Test: make update-api, make, make sl4a.Common
Change-Id: I13095458bf3ded7a376e8d20fd13df12ef426693
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
Stanley Tng [Tue, 20 Mar 2018 23:54:27 +0000 (16:54 -0700)]
Calls unlinkToDeath in binderDied to deregister
When a registered BLE App unexpectedly dies and the binderDied callback
is called, the unlinkToDeath is called to remove linkage. Also, refactor
code to use an existing function.
Test: Manual test by repeatedly killing the gms core process.
Bug:
74076974
Change-Id: If47a534ecafe7fceae14f8cf8526987cabd279cd
Nathan Harold [Mon, 19 Mar 2018 23:59:40 +0000 (16:59 -0700)]
Add alpha Strings to CellIdentityTdscdma
Add equivalent alphaLong and alphaShort to
TD-SCDMA so that it's equivalent to LTE, WCDMA,
GSM, etc.
Bug:
75980473
Test: compilation
Merged-In: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
Change-Id: Ibaa8a7daafb44f7fc94f0fd6aaa193b67793eea4
(cherry picked from commit
0acd7eeed49555f0a07283a6146bbe24c096cd87)
Holly Jiuyu Sun [Wed, 14 Mar 2018 00:20:07 +0000 (17:20 -0700)]
Mark eraseSubscriptions as @SystemApi.
This is a blocker for P.
Bug:
74621500
Test: test on phone
Merged-In: I9455a0b7594cbd2acbdbba99a725c9866c448a07
Change-Id: I9455a0b7594cbd2acbdbba99a725c9866c448a07
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"
Jordan Liu [Thu, 15 Mar 2018 19:19:11 +0000 (12:19 -0700)]
Add multisim notifications for SST
ServiceStateTracker posts notifications for restricted state and
rejection cause for CS registrations which need to be customzied for
multisim cases.
Bug:
69928579
Test: ServiceStateTrackerTest
Change-Id: Ia7db81da6dd858b99113432a97fb489dbebe2436
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"
Tyler Gunn [Mon, 12 Mar 2018 21:31:45 +0000 (14:31 -0700)]
Add Telecom debug setting for enabling enhanced call blocking.
This feature is only available for certain carriers at the current time.
To facilitate test team productivity, adding a system setting which can
be accessed from the Telecom debug menu to enable this functionality.
Test: Manual
Bug:
28189985
Change-Id: I4c812cecd2832a722e5dc73b7c719a9e0594064d
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