OSDN Git Service
Hemant Gupta [Thu, 9 Nov 2017 21:51:52 +0000 (21:51 +0000)]
Merge "OBEX : Handle Negative index Exception"
am:
08d23cf07a
Change-Id: Icd513d2060cf1e8fe8fcd06bbedfc0ef5bf5a6fd
Treehugger Robot [Thu, 9 Nov 2017 21:12:43 +0000 (21:12 +0000)]
Merge "OBEX : Handle Negative index Exception"
Hemant Gupta [Wed, 28 Dec 2016 06:40:47 +0000 (12:10 +0530)]
OBEX : Handle Negative index Exception
Use case:
1. Send file to remote device.
2. Wait for accepting the file transfer on remote device.
Use Specific remote device(that sends some
optional headers).
Failure:
No file acceptance popup seen on remote device.
Root cause:
Crash in com.android.bluetooth.
FATAL EXCEPTION: BtOpp ClientThread
Process: com.android.bluetooth, PID: 22527
java.lang.NegativeArraySizeException: -3
at javax.obex.ObexHelper.updateHeaderSet(ObexHelper.java:216)
at javax.obex.ClientSession.sendRequest(ClientSession.java:568)
at javax.obex.ClientSession.connect(ClientSession.java:148)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
connect(BluetoothOppObexClientSession.java:317)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
run(BluetoothOppObexClientSession.java:231)
am_crash( 1402): [22527,0,com.android.bluetooth,
818462277,java.lang.
NegativeArraySizeException,-3,ObexHelper.java,216]
Fix:
Add length check before allocate memory and break loop if length is less than
expected header length as per OBEX Specification to prevent crash.
Test: Verified that OPP Tx and Rx works successfully multiple times.
Bug:
35588578
Change-Id: I805e6b1d51f69645d5132c3c18db2e752d04b096
Jordan Liu [Thu, 9 Nov 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
am:
bbaa19cad3
Change-Id: I7adbdcdcefaf86e9cf6775aa23aac2618149cf92
Jordan Liu [Thu, 9 Nov 2017 18:24:16 +0000 (18:24 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
Hugo Benichi [Thu, 9 Nov 2017 12:34:40 +0000 (12:34 +0000)]
Merge "MacAddress follow-up: define the core of the class"
am:
cd35c65b5b
Change-Id: Ic86df7e56a63d3f84ccaebefa904c7625105c581
Hugo Benichi [Thu, 9 Nov 2017 12:22:17 +0000 (12:22 +0000)]
Merge "MacAddress follow-up: define the core of the class"
Hugo Benichi [Wed, 8 Nov 2017 15:22:25 +0000 (00:22 +0900)]
MacAddress follow-up: define the core of the class
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
Andreas Gampe [Thu, 9 Nov 2017 03:32:07 +0000 (03:32 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
am:
08efd36872
Change-Id: I97b6bbce9a969f06b923bebd60ccf9a5dee91e9e
Treehugger Robot [Thu, 9 Nov 2017 03:21:27 +0000 (03:21 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
Brad Ebinger [Wed, 8 Nov 2017 23:04:09 +0000 (23:04 +0000)]
Merge "Remove ImsService Feature Interfaces"
am:
abfdf0e03d
Change-Id: Ie142d4673c2a3930b3e7c3bcba617e5e26c8fb9c
Brad Ebinger [Wed, 8 Nov 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Remove ImsService Feature Interfaces"
Ivan Lozano [Wed, 8 Nov 2017 20:20:06 +0000 (20:20 +0000)]
Merge "Disable integer sanitizer in release function."
am:
969ceebc5d
Change-Id: If880a4a81b11c32a5906ccc3f0d999ae515cfbc8
Ivan Lozano [Wed, 8 Nov 2017 20:07:36 +0000 (20:07 +0000)]
Merge "Disable integer sanitizer in release function."
yuemingw [Wed, 8 Nov 2017 19:36:44 +0000 (19:36 +0000)]
Merge "Add OWNED_BY field."
am:
107141be5c
Change-Id: Ib3ee22a0407881e6e7e754ea3504f5568c0ac31a
Treehugger Robot [Wed, 8 Nov 2017 19:28:37 +0000 (19:28 +0000)]
Merge "Add OWNED_BY field."
nharold [Wed, 8 Nov 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
am:
c8ff280e73
Change-Id: I1ad1ee6abafea702d9bb64f45ebad5ea307f25ec
Benedict Wong [Wed, 8 Nov 2017 18:02:53 +0000 (18:02 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
am:
3db35dfcd5
Change-Id: I71b24c9da8c677e35d05b6623eb99ec17f823b4b
nharold [Wed, 8 Nov 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
Ivan Lozano [Wed, 8 Nov 2017 17:48:11 +0000 (09:48 -0800)]
Disable integer sanitizer in release function.
EphemeralStorage::release was causing an unsigned integer overflow on
boot due to the way the for loop is constructed. This function doesn't
need to be sanitized. This adds the no_sanitize attribute to the
function.
Bug:
30969751
Test: Compiles and device boots without runtime error.
Change-Id: Id28a2891624c1fe077fa5e27051540a39e33fe71
Benedict Wong [Wed, 8 Nov 2017 17:47:40 +0000 (17:47 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length"
Brad Ebinger [Wed, 8 Nov 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
am:
b5d2f0c24f
Change-Id: If8fbd0b2adf9f3f2f9a5d4a670b1e0bf1b445066
Brad Ebinger [Wed, 8 Nov 2017 17:12:44 +0000 (17:12 +0000)]
Merge "Move ImsServiceProxy to opt/net/ims"
Andreas Gampe [Wed, 8 Nov 2017 16:53:10 +0000 (16:53 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
am:
f597ad5106
Change-Id: I1d4f37c16ff9dfe8cdc998274d4e8b50e1987be7
Tobias Thierer [Wed, 8 Nov 2017 16:44:30 +0000 (16:44 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
am:
e8b07e5bef
Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6
Andreas Gampe [Wed, 8 Nov 2017 16:40:12 +0000 (16:40 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"
This reverts commit
84bf6b809d5b1d80137f1653ab2346ebe0b08ca6.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I8f13fbb3afe91da54afafbafc758df4e194def11
Treehugger Robot [Wed, 8 Nov 2017 16:36:59 +0000 (16:36 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared""
Tobias Thierer [Wed, 8 Nov 2017 16:34:03 +0000 (16:34 +0000)]
Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
Brad Ebinger [Wed, 8 Nov 2017 16:30:27 +0000 (16:30 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
am:
7805de4002
Change-Id: I0ec39abb8006c7b29b449a59c7408a97549671f0
Brad Ebinger [Wed, 8 Nov 2017 16:20:39 +0000 (16:20 +0000)]
Merge "Switch class hierarchy of ImsServiceProxy and compat"
yuemingw [Wed, 8 Nov 2017 13:12:18 +0000 (13:12 +0000)]
Add OWNED_BY field.
Bug:
68208199
Test: later
Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit#heading=h.jza6dz6kh6bz
Change-Id: Ic78df7902523bad4b3d40bacb73b17d767226aac
Masaho Nishikawa [Wed, 1 Nov 2017 11:33:36 +0000 (20:33 +0900)]
Add config to use a display rule that ServiceState was considered
Add config to use a spn/plmn display rule that the roaming state of
ServiceState was considered. The default value is false.
Test: manual - Verified that PLMN/SPN which the carrier configuration
was considered is displayed.
Bug:
67835339
Change-Id: I05a4938ae51b03190e06e407c41c894b8feb8ea7
Hugo Benichi [Wed, 8 Nov 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Define MacAddress class"
am:
925349ac8f
Change-Id: If270c17b1b763e302b848fba2fe4660ce5929018
Hugo Benichi [Wed, 8 Nov 2017 06:30:04 +0000 (06:30 +0000)]
Merge "Define MacAddress class"
Hugo Benichi [Wed, 8 Nov 2017 03:39:55 +0000 (03:39 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
am:
ee56b4a65c
Change-Id: I5a19824564a56881ffe0ea72556490c71c0d9c23
Treehugger Robot [Wed, 8 Nov 2017 03:27:25 +0000 (03:27 +0000)]
Merge "Networking metrics: minor pretty printing improvements"
Andreas Gampe [Wed, 8 Nov 2017 02:21:58 +0000 (02:21 +0000)]
Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
This reverts commit
e131dac848cb4d0998e1dee2219382250c71d277.
Reason for revert: ART default properties are now in /system.
Bug:
68755013
Change-Id: I32d938abb73c8d8df74716ede8032d9874086fda
Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]
Define MacAddress class
Test: new unit tests part of $ runtest frameworks-net
Change-Id: I5a6a868ff86e9bffdc551d4e2bb486b585525c30
Nathan Harold [Wed, 8 Nov 2017 01:17:45 +0000 (17:17 -0800)]
Fix signature for finalize() to resolve API Lint error
The API linter on goog/master noticed that this method is
listed in the public API even though it's protected. The
change is probably related to a signature change from the
internal finalize method which throws a Throwable. Fix the
method in IpSecManager to throw Throwable, which should
fix the current.txt and resolve the lint error.
Bug:
69006767
Test: compilation, make update-api
Change-Id: I173d014baaa505c365b7916fcb52f2a8b4af9373
Benedict Wong [Thu, 2 Nov 2017 00:14:25 +0000 (17:14 -0700)]
Update documentation for AES-GCM-ESP keymat length
Added notes that keymat length must include 32 bits of salt.
Bug:
68672051
Test: Frameworks-net unit tests & IpSecManager CTS tests run
Change-Id: I0ae0c5be8a45b2374783b3bd1fa8bf930f15e687
Hugo Benichi [Tue, 7 Nov 2017 12:42:10 +0000 (21:42 +0900)]
Networking metrics: minor pretty printing improvements
Bug:
65700460
Test: manually verified the output of $ adb shell dumpsys connmetrics
Change-Id: Ieae535b48d2e2b6e9087431d345c8f916006bb6c
Hugo Benichi [Tue, 7 Nov 2017 22:42:10 +0000 (22:42 +0000)]
Merge "Refactor ApfFilter creation"
am:
5e619dce66
Change-Id: I0be4951cf3feafc94564fad436dec3e8bfceddc4
Hugo Benichi [Tue, 7 Nov 2017 22:22:19 +0000 (22:22 +0000)]
Merge "Refactor ApfFilter creation"
Brad Ebinger [Tue, 7 Nov 2017 19:05:51 +0000 (11:05 -0800)]
Remove ImsService Feature Interfaces
The ImsService feature interfaces were designed
to support a flat ImsService AIDL. This is not
necessary anymore, so this interface is being
removed as part of prep for the new ImsService
definition.
Test: Manual
Change-Id: Iefbcd168441ce2547523cf3e6a99ab3de5f3f823
Jordan Liu [Tue, 7 Nov 2017 18:39:06 +0000 (18:39 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number"
am:
1f8ee4ff25
Change-Id: I7d86a7b3fe4348bfd148e8167b6213e9d27e67c7
Jordan Liu [Tue, 7 Nov 2017 18:28:33 +0000 (18:28 +0000)]
Merge "Add a carrier config indicating whether user can edit a voicemail number"
Brad Ebinger [Mon, 6 Nov 2017 23:14:15 +0000 (15:14 -0800)]
Move ImsServiceProxy to opt/net/ims
This code is very tightly coupled with ImsManager
and should exist as part of the telephony IMS
code.
Test: Manual
Change-Id: If7b8ec73409daa7f1c1d27878242b4335db38e8a
Brad Ebinger [Mon, 6 Nov 2017 23:07:09 +0000 (15:07 -0800)]
Switch class hierarchy of ImsServiceProxy and compat
The compat class should be a subclass of the
ImsServiceProxy, not the other way around.
Test: Manual
Change-Id: I2a2d37edaa6b68815c99988882957bf913236f25
Hugo Benichi [Fri, 13 Oct 2017 07:32:20 +0000 (16:32 +0900)]
Refactor ApfFilter creation
This patch introduces a helper ApfConfiguration class for passing filter
parameters to the constructor of ApfFilter. The benefits are:
- less parameter boilerplate across IpManager, ApfFilter, ApfTest
- easier to add more parameters in the future (useful for hardware
counters options and further gservices configurable options)
There is no functional changes otherwise.
Test: runtest frameworks-net
Change-Id: I47231c21df80bc36b6d4e15369748017b50b8da1
Erik Kline [Tue, 7 Nov 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am:
8cf645c04d
Change-Id: I421a750561ddde0afc6a70ba6369c83ab2e33571
Treehugger Robot [Tue, 7 Nov 2017 05:54:29 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
Neil Fuller [Fri, 11 Aug 2017 12:22:36 +0000 (13:22 +0100)]
Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug:
64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit
8bb4140516c0e18d6c3cbb4215cedc306a2a6da9)
Erik Kline [Mon, 30 Oct 2017 06:29:44 +0000 (15:29 +0900)]
Replace dns_tls with private_dns_mode setting
Also includes:
- SettingsLib strings used in PrivateDnsModeDialogPreference
interaction in the Settings app
- rename ContentResolver "resolver" in methods working with
DNS resolvers (too confusing)
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
- no new failures in SettingsBackupTest nor in SettingsProviderTest
- manual interaction with developer option works
Bug:
34953048
Bug:
64133961
Change-Id: Ia7502916db9ffa0792e1e500a35e34d06a88e79d
Tobias Thierer [Mon, 30 Oct 2017 20:21:38 +0000 (20:21 +0000)]
Track deprecation/replacement of Os methods that depend on Mutable*
Another CL in this CL topic is deprecating/removing three methods
in android.system.Os, and introducing replacements.
This CL tracks that change by updating frameworks/base accordingly.
Test: Treehugger
Bug:
67901714
Change-Id: I96ad205a305801b2cb641ba8984810dfe6474032
Neil Fuller [Mon, 3 Jul 2017 13:38:50 +0000 (14:38 +0100)]
Add TimeZoneRulesDataContract to system API
Add TimeZoneRulesDataContract to system API and remove
TODOs to add other classes that should not now be needed
in the system API (since they are used by a platform-only
app).
Bug:
31008728
Test: make droid
Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8
Jordan Liu [Tue, 7 Nov 2017 00:20:00 +0000 (00:20 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
am:
e158cdaaa5
Change-Id: I7ce73ab2a139b299de806f9d856544a382fe69e0
Jordan Liu [Tue, 7 Nov 2017 00:07:11 +0000 (00:07 +0000)]
Merge "Move isServiceReady to ImsServiceProxyCompat"
George Burgess IV [Mon, 6 Nov 2017 23:35:24 +0000 (23:35 +0000)]
Merge "cmds: add #!s"
am:
8911c35df3
Change-Id: Iad6d62889031046a063e6abdd0ed74143c58ba94
Treehugger Robot [Mon, 6 Nov 2017 23:25:27 +0000 (23:25 +0000)]
Merge "cmds: add #!s"
Philip P. Moltmann [Mon, 6 Nov 2017 20:46:12 +0000 (20:46 +0000)]
Merge "Allow to attach jvmti agents from inside of process"
am:
faffb072a4
Change-Id: I1f87e45ad3a7c93ab3ba7fd27ac57a1768885faa
Treehugger Robot [Mon, 6 Nov 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Allow to attach jvmti agents from inside of process"
Qi Wang [Mon, 6 Nov 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Display the HD icon in the Call Log"
am:
3ef58c56b6
Change-Id: I967c73f1283204fd4f706c425b82fe7af101cb3a
Qi Wang [Mon, 6 Nov 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Display the HD icon in the Call Log"
Hugo Benichi [Mon, 6 Nov 2017 07:21:53 +0000 (07:21 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul"
am:
69c9402a29
Change-Id: I7a5d45feb2315779dad4b0a4f69e761eb90f4ed6
Hugo Benichi [Mon, 6 Nov 2017 07:09:49 +0000 (07:09 +0000)]
Merge "DefaultNetworkEvent metrics: rehaul"
Hugo Benichi [Fri, 20 Oct 2017 00:25:29 +0000 (09:25 +0900)]
DefaultNetworkEvent metrics: rehaul
This patch changes instrumentation of default networks and default
network events:
- stop logging events for default network transitions,
but instead consistently log one event per continuous segment
when one given network was the default, including logging an
event for when there is no default network.
- keep a separate rolling buffer of DefaultNetworkEvent for
dumpsys and bug reports.
These changes allow to simplify post aggregation of default network
event metrics by removing any need to do time series processing.
Instead, metrics and counters can be implemented withouth any ambiguity
by following the recipe:
% of x = sum(duration | x = true) / sum (all durations)
where x can be various conditions such as:
- the default network was validated
- the default network was WiFi
- the default network was IPv6
- there was no default network
- ...
Most importantly, this new logging scheme allows to measure much more
reliably:
- the % of the time that a device had Internet, in the sense that the
default network was validated.
- the time transitions between default networks, keyed by previous and
new transports/link layer, which allows to derive wakelock durations
and wakelock power costs from default network switches.
This patch also simplifies the dumpsys interface of the connmetrics
service and reduces the commands to three:
- "flush" for metrics upload.
- "proto" for printing buffered event in text proto format.
- "list" for listing all events and statistics.
Bug:
34901696
Bug:
65700460
Test: runtest frameworks-net
Change-Id: I0521f1681a60cca07ac3bfd5741d64ce44de4cdd
Erik Kline [Sun, 5 Nov 2017 08:57:48 +0000 (08:57 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
am:
6d14940a0e
Change-Id: Id3a55dac1b99cfef7f7372eeac18973936f0c6e6
Treehugger Robot [Sun, 5 Nov 2017 08:47:53 +0000 (08:47 +0000)]
Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()"
George Burgess IV [Sat, 4 Nov 2017 22:58:58 +0000 (15:58 -0700)]
cmds: add #!s
Without this, exec()ing these fails.
Found with `grep -L bin/sh $(grep -Rl Script)`
Bug: None
Test: exec()ed each of these scripts; I no longer get "exec format
error" for any of them.
Change-Id: I47db5007e5cc14ab91eb846b7bffecb925d37874
Erik Kline [Tue, 31 Oct 2017 02:37:41 +0000 (11:37 +0900)]
Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()
Callers of IpClient can tell it via the Builder whether a stable or
a random link-layer identifier is used. IpClient will make the
appropriate IP-layer adjustments (for now this means RFC 7217
addresses or not).
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh runs as well
as possible on AOSP (no new errors)
Bug:
62476366
Change-Id: Ic9d52ea4f2c6c3588852ed41c81f8664d5cc298a
Jeff Sharkey [Fri, 3 Nov 2017 22:52:15 +0000 (22:52 +0000)]
Merge "Define NOT_ROAMING network capability."
am:
8f380ab29c
Change-Id: If36fa11d97d0631df41191ea0cf4ce39981b236f
Jeff Sharkey [Fri, 3 Nov 2017 22:41:51 +0000 (22:41 +0000)]
Merge "Define NOT_ROAMING network capability."
Selim Gurun [Fri, 3 Nov 2017 22:22:15 +0000 (22:22 +0000)]
Merge "Respect Accessory timeout value when restoring defaults"
am:
3ddf22e69c
Change-Id: I3ee7b72ac335902ce2f9322f0dbedd48429dc663
Treehugger Robot [Fri, 3 Nov 2017 21:32:50 +0000 (21:32 +0000)]
Merge "Respect Accessory timeout value when restoring defaults"
Chen Xu [Fri, 3 Nov 2017 21:17:24 +0000 (21:17 +0000)]
Merge "new columns of carrierId DB"
am:
9c4b4afcbc
Change-Id: Ie1d237edf656c49fb0b078748b4e45142f454386
Chen Xu [Fri, 3 Nov 2017 21:08:38 +0000 (21:08 +0000)]
Merge "new columns of carrierId DB"
fionaxu [Thu, 26 Oct 2017 06:09:36 +0000 (23:09 -0700)]
new columns of carrierId DB
Bug:
64131637
Test: Unit test CarrierIdProviderTest.java
Change-Id: I5e1d061d39248be12dd1e6ff1488dd3268f5f3ae
(cherry picked from commit
a9214ba0b8fc691021a27dd523e4b0b0ed1fdff7)
Philip P. Moltmann [Wed, 1 Nov 2017 22:22:02 +0000 (15:22 -0700)]
Allow to attach jvmti agents from inside of process
Test: cts-tradefed run singleCommand cts-dev -m CtsJvmtiAttachingTestCases
Bug:
65016018
Change-Id: I6d445afa288c6fec1d860150159fa05ed63cf517
Shubham Ajmera [Fri, 3 Nov 2017 16:20:32 +0000 (16:20 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader"
am:
cef5431093
Change-Id: Ia7495e6a9d12dc36e5091918426e86d9a9e76821
Treehugger Robot [Fri, 3 Nov 2017 16:07:50 +0000 (16:07 +0000)]
Merge "Handle '&' in DexoptUtils#encodeClassLoader"
Suresh Koleti [Fri, 3 Nov 2017 12:59:25 +0000 (18:29 +0530)]
Move isServiceReady to ImsServiceProxyCompat
-- Move isServiceReady from ImsServiceProxy to its base class
ImsServiceProxyCompat to use in ImsManager.
Test: Manual
Bug:
63920021
Change-Id: I0e136ffe8490a3ba985bfb5992c1ff2176e610fe
Narayan Kamath [Fri, 3 Nov 2017 10:14:22 +0000 (10:14 +0000)]
Merge "ZipUtils: Rewrite in terms of zip_archive::Inflate."
am:
f941215d56
Change-Id: I8aa710cb6df1ba5b2079c5e3d9a70b365815d04e
Narayan Kamath [Fri, 3 Nov 2017 10:05:28 +0000 (10:05 +0000)]
Merge "ZipUtils: Rewrite in terms of zip_archive::Inflate."
Ivan Lozano [Fri, 3 Nov 2017 03:53:30 +0000 (03:53 +0000)]
Merge "Disable integer sanitization in gcIfManyNewRefs."
am:
3485c844a0
Change-Id: Iba57b0d2d6f0c611a91db9eddf95f0f147271956
Ivan Lozano [Fri, 3 Nov 2017 03:42:24 +0000 (03:42 +0000)]
Merge "Disable integer sanitization in gcIfManyNewRefs."
Shubham Ajmera [Tue, 5 Sep 2017 17:20:41 +0000 (10:20 -0700)]
Handle '&' in DexoptUtils#encodeClassLoader
For system apps, we pass '&' for CLC.
The method was treating this as a path as a result we were getting
wrong encoding for CLC.
This was causing dexopt failures for A/B OTA.
Removed the secondary dex file dexopt till we fixed it.
(cherry picked from commit
727aaa36b6914be3f340c97c991c93314d25c617)
Bug:
65067046
Test: runtest.py -x \
frameworks/base/services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java
(cherry-picked from commit
557c054935c0864b42ce49541d12d32ae6a797bc)
Merged-In: I9aa440750c811676c86d8c6d0d451077d0edf5a0
Change-Id: I9aa440750c811676c86d8c6d0d451077d0edf5a0
Selim Gurun [Fri, 3 Nov 2017 01:39:31 +0000 (18:39 -0700)]
Respect Accessory timeout value when restoring defaults
Android accessory mode timeout value is a lot larger than default
timeout value (10 seconds vs. 1 second). The large timeout
value is needed to accomodate for HUs that are not quick
to respond after MTP to Accessory mode change.
Bug:
68819844
Test: Manual
Change-Id: I665e1001f8df66fb00cbfcbf6c58d97c372797fc
Android Build Merger (Role) [Fri, 3 Nov 2017 01:37:05 +0000 (01:37 +0000)]
Merge "Merge "Added default home values of CDMA roaming indicator" am:
a7c51a3d7f" into stage-aosp-master
Jack Yu [Fri, 3 Nov 2017 01:35:29 +0000 (01:35 +0000)]
Merge "Added default home values of CDMA roaming indicator"
am:
a7c51a3d7f
Change-Id: Ia178ace4de625a358f284283fb4a5e5c9b4f7dd4
Android Build Merger (Role) [Fri, 3 Nov 2017 01:31:51 +0000 (01:31 +0000)]
Merge "Merge "[framework] Compile secondary dex files in isolation" am:
e9e3bfe353" into stage-aosp-master
Calin Juravle [Fri, 3 Nov 2017 01:30:30 +0000 (01:30 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
am:
e9e3bfe353
Change-Id: I8f0d9303b3656a298700e26a377d89b7fdd81b4e
Calin Juravle [Fri, 3 Nov 2017 01:21:27 +0000 (01:21 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
am:
e9e3bfe353
Change-Id: I7e09a8d5f03b77fa73f13e045e2ec7a2b26eb486
Treehugger Robot [Fri, 3 Nov 2017 01:13:27 +0000 (01:13 +0000)]
Merge "Added default home values of CDMA roaming indicator"
Treehugger Robot [Fri, 3 Nov 2017 01:05:05 +0000 (01:05 +0000)]
Merge "[framework] Compile secondary dex files in isolation"
Jack Yu [Thu, 2 Nov 2017 17:08:10 +0000 (10:08 -0700)]
Added default home values of CDMA roaming indicator
Some carriers use the standard roaming indicator number
assigment for roaming indication. Added the default home values
suggested by 3GPP2 C.R1001 table 8.1-1.
Test: Manual
bug:
67855275
Change-Id: Ib0a613ad8caba74645930f3e5188999be08b2116
(cherry picked from commit
cf4a8b40a2ff0496c4ccf08f251c0c425fd673f0)
Andreas Gampe [Thu, 2 Nov 2017 22:13:37 +0000 (22:13 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
am:
eb3bff53f6
Change-Id: I285d7cf715dc0b2e08d7003cecfd92bfc3b9c8da
Treehugger Robot [Thu, 2 Nov 2017 21:57:29 +0000 (21:57 +0000)]
Merge "PMSCompilerMapping: Hardcode a value for pm.dexopt.shared"
Ivan Lozano [Thu, 2 Nov 2017 21:10:57 +0000 (14:10 -0700)]
Disable integer sanitization in gcIfManyNewRefs.
Prevent gcIfManyNewRefs from emitting runtime errors on
integer sanitized builds by disabling unsigned integer overflow
sanitization.
Test: Compiles, device boots.
Bug:
30969751
Change-Id: I90bbf831d03a60b40e047327d633102444058f69
con [Thu, 2 Nov 2017 20:15:35 +0000 (20:15 +0000)]
Merge "Fix StateMachine init/quit race."
am:
5c7de22a06
Change-Id: I26ab138d66366efbcc515e5da0ed21de3e90fa9a
con [Thu, 2 Nov 2017 20:05:09 +0000 (20:05 +0000)]
Merge "Fix StateMachine init/quit race."