OSDN Git Service
Colin Cross [Fri, 8 Dec 2017 16:26:26 +0000 (16:26 +0000)]
Merge "Remove logtags property"
am:
f2ed7683da
Change-Id: I599af7003bd4ef6cbb8f99ad4caba10ada2f1f43
Colin Cross [Fri, 8 Dec 2017 16:14:07 +0000 (16:14 +0000)]
Merge "Remove logtags property"
Erik Kline [Fri, 8 Dec 2017 05:58:32 +0000 (05:58 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
am:
b501e7e25b
Change-Id: Iddf69a93400af2262e4522592f9898ee0b79314c
Treehugger Robot [Fri, 8 Dec 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Refactor to IpNeighborMonitor and single-threaded semantics"
Erik Kline [Fri, 8 Dec 2017 03:27:15 +0000 (03:27 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
efdca004ab
Change-Id: I28628277a2e09e7e01eeb6abb140533cc4b58b0d
Treehugger Robot [Fri, 8 Dec 2017 03:14:09 +0000 (03:14 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
Erik Kline [Fri, 19 May 2017 00:29:48 +0000 (09:29 +0900)]
Refactor to IpNeighborMonitor and single-threaded semantics
IpReachabilityMonitor (and IpNeighborMonitor) are only accessed from
the IpManager StateMachine's thread. Consequently lots of locking can
now be removed.
Additionally:
- rename BlockingSocketReader to PacketReader
- incorporate IpReachabilityMonitor output in dump()
Test: as follows
- runtest frameworks-net passes
- "adb shell ip neigh change <address> dev wlan0 nud failed"
triggers wifi to disconnect
Bug:
62476366
Bug:
67013397
Change-Id: I18aca29ae0019a72a7e559c2832e0d9b0e33d81e
Colin Cross [Fri, 8 Dec 2017 01:55:05 +0000 (17:55 -0800)]
Remove logtags property
logtags previously needed to be listed in logtags and srcs, now
they only need to be listed in logtags.
Test: m checkbuild
Change-Id: I7750116675d9497782642a9b8c86288d42bf0a54
Colin Cross [Fri, 8 Dec 2017 01:46:48 +0000 (01:46 +0000)]
Merge "Convert services/core/jni to Android.bp"
am:
6a4be8613a
Change-Id: Icbb98c844347418c003a75d80394448cacfb036f
Jack He [Fri, 8 Dec 2017 01:37:35 +0000 (01:37 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset"
am:
ea7363402c
Change-Id: I5ee5d55d3c47fc82698d80610a2bd70cdee794f8
Colin Cross [Fri, 8 Dec 2017 01:20:47 +0000 (01:20 +0000)]
Merge "Convert services/core/jni to Android.bp"
Treehugger Robot [Fri, 8 Dec 2017 01:14:59 +0000 (01:14 +0000)]
Merge "BT: Remove dead code in BluetoothHeadset"
Jordan Liu [Fri, 8 Dec 2017 00:29:53 +0000 (00:29 +0000)]
Merge "IMS: Add support for STK CC feature"
am:
bc813005b8
Change-Id: I69dcdb09f8e174acfe6268ede87b1f804b0e33f1
Jordan Liu [Fri, 8 Dec 2017 00:14:57 +0000 (00:14 +0000)]
Merge "IMS: Add support for STK CC feature"
Jordan Liu [Thu, 7 Dec 2017 23:30:02 +0000 (23:30 +0000)]
Merge "Fix available/remaining PIN/PUK attempts."
am:
e3ab43eefe
Change-Id: Ia10a529b8d9817fe00d8688c78e3499327c9a8c6
Jordan Liu [Thu, 7 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Merge "Fix available/remaining PIN/PUK attempts."
Colin Cross [Wed, 6 Dec 2017 01:33:58 +0000 (17:33 -0800)]
Convert services/core/jni to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
Merged-In: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
(cherry picked from commit
1742dd8cf301904f8fd6e173a08ec8c1888b606e)
Hansong Zhang [Thu, 7 Dec 2017 21:55:10 +0000 (21:55 +0000)]
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
am:
0d3990b235
Change-Id: Icbbaec689208fc9b890a10c16f7b7fa910a5a66c
Treehugger Robot [Thu, 7 Dec 2017 21:37:45 +0000 (21:37 +0000)]
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
Jack He [Thu, 7 Dec 2017 20:06:21 +0000 (12:06 -0800)]
BT: Remove dead code in BluetoothHeadset
The following hidden API methods are not implemented by the stack and
should be removed:
- getBatteryUsageHint()
- acceptIncomingConnect()
- rejectIncomingConnect()
The following hidden API methods are no longer needed due to lack of
usage and should be removed:
- enableWBS()
- disableWBS()
- bindResponse()
Bug:
70336991
Test: make
Change-Id: I75bd6735573e4cbc61b5bef8722b8badac2e9170
Svetoslav Ganov [Thu, 7 Dec 2017 19:01:46 +0000 (19:01 +0000)]
Merge "Use correct user id for permission check for instant foreground service"
am:
b76e984536
Change-Id: I2b8dc9fa3fa1e48060c0f1204dddf89a8df4c26d
Jeff Sharkey [Thu, 7 Dec 2017 18:05:36 +0000 (18:05 +0000)]
Merge changes from topic "predicates_aosp"
am:
76c275e7d3
Change-Id: If9ae0263328b73757de4578b344af0b10a3b2f8f
Jeff Sharkey [Thu, 7 Dec 2017 17:58:52 +0000 (17:58 +0000)]
Emit all APIs using Predicates.
am:
bc4f48b21d
Change-Id: Ibc934ce755f217a52b890c1942b9abc9040e65d3
Jeff Sharkey [Thu, 7 Dec 2017 17:52:08 +0000 (17:52 +0000)]
Massage APIs for upcoming doclava change.
am:
983df8cc6c
Change-Id: I79ddea77f87d44f3574a8f33c49825b373ed4e3f
Svetoslav Ganov [Thu, 7 Dec 2017 17:43:52 +0000 (17:43 +0000)]
Merge "Use correct user id for permission check for instant foreground service"
Jeff Sharkey [Thu, 7 Dec 2017 16:39:39 +0000 (16:39 +0000)]
Merge changes from topic "predicates_aosp"
* changes:
Deeper sanity checking of emitted types.
Emit all APIs using Predicates.
Massage APIs for upcoming doclava change.
liulvping [Thu, 7 Dec 2017 16:21:29 +0000 (16:21 +0000)]
Merge "fix system app's abi error after uninstall updated version."
am:
a863c7f6b7
Change-Id: Ia16d082665b6327586be628e136a52d6510d47a1
Treehugger Robot [Thu, 7 Dec 2017 14:53:04 +0000 (14:53 +0000)]
Merge "fix system app's abi error after uninstall updated version."
Neil Fuller [Thu, 7 Dec 2017 13:54:16 +0000 (13:54 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
am:
e08f918a6e
Change-Id: I2e933a55ce3b239ad9a2afee964d288dcbd04a11
Neil Fuller [Thu, 7 Dec 2017 11:02:52 +0000 (11:02 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
Bowgo Tsai [Thu, 7 Dec 2017 10:08:27 +0000 (10:08 +0000)]
Merge "Disable AVB check in runtime vintf"
am:
86c9951383
Change-Id: I70295f5685d18bed99822f4e712edfb6c2a1b280
Ruthwar Kumar Ambeer [Thu, 9 Mar 2017 13:16:17 +0000 (18:46 +0530)]
Fix available/remaining PIN/PUK attempts.
* Fix to properly display attempts remaining for PIN/PUK.
* On bootup show the available PIN/PUK attempts if sim
is locked on PIN/PUK.
* Show incorrect password message on entering wrong PIN/PUK
password.
In KeyGuardSimPinView and KeyGuardSimPukView, check for sim locked on
PIN and reset the flags to show the default message.
Bug:
37782683
Change-Id: I46d7d5dd86977cddecf3147add73ef6ccc64b257
Erik Kline [Wed, 6 Dec 2017 04:37:09 +0000 (13:37 +0900)]
Send empty LinkProperties when entering StoppedState.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- changing from DHCPv4 to static while continuously pinging the
default gateway works jsut fine
- dumpsys log shows that during the change we send the empty LP:
12-06 08:46:51.085 - CMD_ON_QUIT wlan0/23 0 0 null [rcvd_in=StoppingState, proc_in=StoppingState]
12-06 08:46:51.092 - INVOKE onLinkPropertiesChange({{InterfaceName: wlan0 LinkAddresses: [] Routes: [] DnsAddresses: [] Domains: null MTU: 0}})
Bug:
69800563
Change-Id: I01047e9a72fce718a167c592bf14406c3bab3ba9
Treehugger Robot [Thu, 7 Dec 2017 08:15:35 +0000 (08:15 +0000)]
Merge "Disable AVB check in runtime vintf"
Svet Ganov [Thu, 7 Dec 2017 07:45:38 +0000 (23:45 -0800)]
Use correct user id for permission check for instant foreground service
Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.EphemeralTest#testStartForegrondService
bug:
68275646
Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b
liulvping [Mon, 6 Nov 2017 09:36:40 +0000 (17:36 +0800)]
fix system app's abi error after uninstall updated version.
When uninstall an updated system app, we always did as
following steps. First we delete data structure by calling
deleteInstalledPackageLIF(), then enable it from disabled
system packages and re-adding to PackageSettings map by
calling addPackageLPw(). At last re-installing apps in
system partition with scanPackageTracedLI().
But if an package with sharedUserId readded failed with
exception of 'Adding duplicate shared id: xxx', then we
cann't reuse it's derived CPU Abis from settings, others
we could get CPU Abis uninitialized errors.
Test: Manual; Update an system app with sharedUserId
Test: Manual; Uninstall and ensure it run ok
Change-Id: Icfda17c5004d291c664ed80d578aca4b7cf4a975
Signed-off-by: liulvping <liulvping@xiaomi.com>
Jeff Sharkey [Thu, 7 Dec 2017 04:12:23 +0000 (21:12 -0700)]
Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types. This ensures that we don't accidentally
reference undefined classes/interfaces.
Test: manual inspection of API files
Bug:
69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Bo Hu [Thu, 7 Dec 2017 06:31:36 +0000 (06:31 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
am:
0e8440632a
Change-Id: I041cd82448479a2d1f67d1cc5ef854272348591f
Xin Li [Thu, 7 Dec 2017 06:23:41 +0000 (06:23 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
d18ed49f9d -s ours
Change-Id: I8a40fa162f8acfcc5f681a1419a903d27b18906c
Jeff Sharkey [Thu, 7 Dec 2017 04:02:11 +0000 (21:02 -0700)]
Emit all APIs using Predicates.
Generate APIs using updated doclava.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91
Jeff Sharkey [Thu, 7 Dec 2017 03:53:38 +0000 (20:53 -0700)]
Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Merged-In: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Xin Li [Thu, 7 Dec 2017 04:09:52 +0000 (04:09 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
5364be50cd -s ours
Change-Id: Ia39fa85435347c780403bf111f186a6a00f76d86
Treehugger Robot [Thu, 7 Dec 2017 04:02:29 +0000 (04:02 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
Hansong Zhang [Mon, 4 Dec 2017 18:31:30 +0000 (10:31 -0800)]
Bluetooth HID Device: format code, fix docstring, hide unplug()
* Reformat code with google-java-format
* Add the note that When an application is registered, the HID Host service
will be disabled until it is unregistered
* Fix the links in docstring
* Add @hide to unplug(); this is not a public API
Bug:
63384609
Test: make
Change-Id: I5dfcaab58b02c19e5745461c16602064a0ad8b83
Bo Hu [Wed, 6 Dec 2017 22:17:32 +0000 (22:17 +0000)]
Revert "Add odm sepolicy support to SELinuxMMAC.java"
This reverts commit
fffa6d238a31ac5e7b30a6e1d852c8c2cc22af1d.
Reason for revert: broke mac build
b/
70273082
FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory
Change-Id: I186f7bc68a76d7b2d717875791ee2fe1828c3598
Xin Li [Wed, 6 Dec 2017 23:18:26 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:51:59 +0000 (11:51 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I727a014df2fb05a4b13cb67b1fcb760a8b387523
Hansong Zhang [Wed, 6 Dec 2017 20:33:29 +0000 (20:33 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
am:
8ab47567b2
Change-Id: I9ea9a2d7bd5a81816fb652b643f345459bc2fdc5
Myles Watson [Wed, 6 Dec 2017 20:10:37 +0000 (20:10 +0000)]
Merge "Auto-format BluetoothManagerService.java"
am:
004731bee7
Change-Id: If846012a106be1ef097a2bc7bb17db093224cfa0
Myles Watson [Wed, 6 Dec 2017 20:04:07 +0000 (20:04 +0000)]
Merge "Auto-format BluetoothAdapter.java"
am:
5416559d1c
Change-Id: Ib5aa26901a97702fb4714dd89f24a112af59895b
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Treehugger Robot [Wed, 6 Dec 2017 19:22:44 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothManagerService.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:38 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothAdapter.java"
Myles Watson [Tue, 28 Nov 2017 00:42:11 +0000 (16:42 -0800)]
Auto-format BluetoothManagerService.java
Test: build
Change-Id: If97c454a8e5aff34c4f8550f7ade3da413a200b7
Myles Watson [Tue, 28 Nov 2017 00:41:47 +0000 (16:41 -0800)]
Auto-format BluetoothAdapter.java
Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9
Wenting Xiong [Wed, 6 Dec 2017 16:21:34 +0000 (16:21 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"
am:
f845bbdfa4
Change-Id: I3285f1f9e63cbf3d0487618b5ff636c7637ef9e4
Treehugger Robot [Wed, 6 Dec 2017 16:07:28 +0000 (16:07 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"
Suresh Koleti [Sat, 29 Jul 2017 04:46:43 +0000 (10:16 +0530)]
IMS: Add support for STK CC feature
-- Add interface in IImsUtListener to get data for
UNSOL_ON_SS.
-- Add new file ImsSsData to store the data received
as part of UNSOL_ON_SS.
-- Add approprate error codes and strings to support
to show error dialogs to user.
-- Add ImsUtInterface API's to indicate UNSOL_ON_SS
to ImsPhoneCallTracker.
Test: Manual
Bug:
64685331
Change-Id: I023c1af0d521e5b19ecce1576c4caa299ae468e3
kaichieh [Wed, 6 Dec 2017 10:11:10 +0000 (10:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
am:
a0c52a8ace
Change-Id: I5cc7ab8916901e1b3622a17676debe023578f1eb
Treehugger Robot [Wed, 6 Dec 2017 10:00:46 +0000 (10:00 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
ludi [Wed, 6 Dec 2017 03:29:35 +0000 (03:29 +0000)]
Merge "Cleanup of resource limit tests"
am:
39f58678db
Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206
kyle_tso [Wed, 6 Dec 2017 03:22:30 +0000 (03:22 +0000)]
Merge "Support scanDirectories with JNI callback function"
am:
5747c2b81c
Change-Id: I8996fb568c4024ccf76a5643049de8cee6f811c6
Venkata Jagadeesh [Wed, 6 Dec 2017 03:17:29 +0000 (03:17 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry"
am:
d5410ca51b
Change-Id: Ibef0191ee1863e08ab73226d9e27cbdfa54face2
Chih-hung Hsieh [Wed, 6 Dec 2017 03:12:09 +0000 (03:12 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"
am:
d5dca64f72
Change-Id: Ic05b86f4bbff44e03298e823e9105c664b7ba1e0
Treehugger Robot [Wed, 6 Dec 2017 02:58:41 +0000 (02:58 +0000)]
Merge "Cleanup of resource limit tests"
Treehugger Robot [Wed, 6 Dec 2017 02:06:49 +0000 (02:06 +0000)]
Merge "Support scanDirectories with JNI callback function"
Treehugger Robot [Wed, 6 Dec 2017 00:48:40 +0000 (00:48 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry"
Chih-hung Hsieh [Wed, 6 Dec 2017 00:25:20 +0000 (00:25 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"
Venkata Jagadeesh [Fri, 20 May 2016 07:38:35 +0000 (13:08 +0530)]
Don't remove bonding device from cached device list during inquiry
Use case: DUT unable to start auto connect after pairing to remote devices
Steps:
1. pair with remote device
2. unpair remote device.
3. Pair again to same remote from available devices list and initiate inquiry same time
Failure: DUT unable to start auto connect after pairing to remote device
Root Cause: As bonding device is removed from cached device list,a new cached device
entry is created after bonding with auto connection variable reset.
Fix: This issue fixed by deleting only non bonded and non bonding devices during inquiry.
Test: Tested with Beats Wireless
Bug:
35415106
Change-Id: I9d1c399292420fa2e321a4f6410e672a2abcc423
Wenting Xiong [Tue, 5 Dec 2017 05:16:34 +0000 (13:16 +0800)]
SystemUI: Display RAT icon in quick setting when data is off
Introduce implementation to display RAT icon in quick setting
even when data is off.
Test: Test with simulated RIL
Bug:
28805511
Change-Id: I7fabec993c22e3359e36cff2caca9258d79f6273
Chih-Hung Hsieh [Tue, 5 Dec 2017 17:56:46 +0000 (09:56 -0800)]
Use -Werror in frameworks/base/tests/backup
* Ommit unused parameter names.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: Ie073fd911480960673b24d5b4d84b4f8dd0d0302
Hugo Benichi [Tue, 5 Dec 2017 09:47:50 +0000 (09:47 +0000)]
Merge "Fix bug in MacAddress.fromString()"
am:
cdb84d2fc7
Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
Treehugger Robot [Tue, 5 Dec 2017 09:38:42 +0000 (09:38 +0000)]
Merge "Fix bug in MacAddress.fromString()"
Colin Cross [Tue, 5 Dec 2017 05:33:47 +0000 (05:33 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
am:
1a2a45667b
Change-Id: Idf4e12d812cf9108f8c3b22057e0bcbd90c14807
Treehugger Robot [Tue, 5 Dec 2017 05:22:25 +0000 (05:22 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
Hugo Benichi [Tue, 5 Dec 2017 04:14:08 +0000 (13:14 +0900)]
Fix bug in MacAddress.fromString()
Test: runtest frameworks-net
Bug:
69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
Andreas Gampe [Tue, 5 Dec 2017 02:34:41 +0000 (02:34 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
am:
7e717e09cd
Change-Id: I75da071918e7fc2e547df4e4d75121806c730ca2
nharold [Tue, 5 Dec 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Validate IpSecAlgorithm Length"
am:
68b81299d2
Change-Id: I23f7612c119e67f9a1647568aeefde38a365f8da
Treehugger Robot [Tue, 5 Dec 2017 02:25:14 +0000 (02:25 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
nharold [Tue, 5 Dec 2017 02:13:55 +0000 (02:13 +0000)]
Merge "Validate IpSecAlgorithm Length"
Colin Cross [Tue, 5 Dec 2017 01:29:12 +0000 (01:29 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
am:
85f095e246
Change-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7
Jeff Sharkey [Tue, 5 Dec 2017 01:11:53 +0000 (01:11 +0000)]
Merge "Match network roaming state to avoid wtf()."
am:
3fb2711ede
Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515
Colin Cross [Tue, 5 Dec 2017 00:02:10 +0000 (16:02 -0800)]
Don't use path to find protoc-gen-javastream
Previous attempts to use a full path in the --plugin argument
failed, but that was because the --plugin argument had the wrong
name (protoc-gen-java-stream instead of protoc-gen-javastream)
and was being completely ignored. Passing a full path where
the last element of the path is protoc-gen-javastream works fine.
Fixes issues where the command line is expanded with $PATH in
it 58 times which could hit command length limits if $PATH was
even a little bit larger than the default.
Test: m framework
Change-Id: Icd336f522fb8770d9058d18d8a04d24a96405615
Colin Cross [Tue, 5 Dec 2017 01:08:41 +0000 (01:08 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
Colin Cross [Mon, 4 Dec 2017 21:45:19 +0000 (13:45 -0800)]
Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH). They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).
Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.
Bug:
70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
Merged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428
(cherry-picked from commit
bd200ce7d4ebe31ad4327683e59af269420b0ef5)
Jeff Sharkey [Tue, 5 Dec 2017 00:58:46 +0000 (00:58 +0000)]
Merge "Match network roaming state to avoid wtf()."
Colin Cross [Tue, 5 Dec 2017 00:06:29 +0000 (00:06 +0000)]
Merge "Remove unused AIDL files"
am:
d0abc863f4
Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d
Jordan Liu [Mon, 4 Dec 2017 23:44:36 +0000 (23:44 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
am:
febd180254
Change-Id: Iff2bf2fa0132692b3164d5543cfd20cd1d153ede
Hugo Benichi [Mon, 4 Dec 2017 23:38:27 +0000 (23:38 +0000)]
Merge "MacAddress: light refactors and improve documentation"
am:
d871cab32d
Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f
Treehugger Robot [Mon, 4 Dec 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Remove unused AIDL files"
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
Nathan Harold [Fri, 10 Nov 2017 00:49:33 +0000 (16:49 -0800)]
Validate IpSecAlgorithm Length
Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.
Bug:
68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701
Treehugger Robot [Mon, 4 Dec 2017 23:01:11 +0000 (23:01 +0000)]
Merge "MacAddress: light refactors and improve documentation"
Andreas Gampe [Mon, 4 Dec 2017 22:42:03 +0000 (14:42 -0800)]
Frameworks: Silently ignore InterruptedException
Apps seem to rely on this undocumented behavior so that the
threaded sync adapter doesn't crash an app. That's really
bad on the app side, but we will have to live with it.
Bug:
67986472
Bug:
70122540
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I1ee4dfba4ad29c4f66fa60d3c8f8a99900b3447a
Jeff Sharkey [Mon, 4 Dec 2017 22:52:01 +0000 (15:52 -0700)]
Match network roaming state to avoid wtf().
Test: sure
Bug:
70174865
Change-Id: I02faef05e3fb918c3c023fb2fdd1886d45cc8c71
Exempt-From-Owner-Approval: P0 bug
Ying Xu [Mon, 4 Dec 2017 22:27:57 +0000 (22:27 +0000)]
Merge "Convert ICarrierService to oneway."
am:
a9494954d9 -s ours
Change-Id: Ie385d36ff924adb152c36982ca11d741af44b48f
Ying Xu [Mon, 4 Dec 2017 22:11:36 +0000 (22:11 +0000)]
Merge "Convert ICarrierService to oneway."
Colin Cross [Thu, 30 Nov 2017 22:29:34 +0000 (14:29 -0800)]
Remove unused AIDL files
These files show up in a glob for all AIDL files, but are not listed
in AIDL files to be built, and have no references in codesearch
except for one unused import.
Bug:
70046217
Test: m checkbuild
Change-Id: I7d6a3bb19d2e16b5f09473f3058afcf5b4edd9b6
Colin Cross [Mon, 4 Dec 2017 19:05:46 +0000 (19:05 +0000)]
Merge "Convert framework.jar to Android.bp"
am:
3d16ff7a4a -s ours
Change-Id: I0652992a85c11b8be5f5b7428382bc3653c0e2a3
Colin Cross [Mon, 4 Dec 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Convert framework.jar to Android.bp"