OSDN Git Service
Alex Klyubin [Mon, 8 May 2017 21:09:03 +0000 (14:09 -0700)]
Switch from libcrypto_static to libcrypto target
libcrypto target offers the same static library as libcrypto_static.
Thus, there's no need to use libcrypto_static.
Test: make pbkdf2gen
Run pbkdf2gen with and without a password and confirm it works
Bug:
26160319
Change-Id: I89a60b7521e6c3df91421d0edf64a71b8b2c20e0
Yang Ni [Mon, 8 May 2017 15:52:07 +0000 (15:52 +0000)]
Merge "Destroy Allocation right away on exception"
Treehugger Robot [Sat, 6 May 2017 02:02:44 +0000 (02:02 +0000)]
Merge "Convert libandroid and libandroid_runtime to Android.bp"
nharold [Sat, 6 May 2017 01:45:35 +0000 (01:45 +0000)]
Merge changes from topic 'sms-files-move-opt-to-base'
* changes:
Move newFromRil() function to a utility class
Remove dependency on telephony-common from services/core
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
Port Utility Functions from DefaultPhoneNotifier
Remove dependency on IccConstants from SmsManager
Move files from frameworks/opt/telephony to frameworks/base
Nathan Harold [Wed, 25 Jan 2017 01:08:34 +0000 (17:08 -0800)]
Move newFromRil() function to a utility class
Remove a dependency on frameworks/opt from SmsMessage for CDMA
-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter
Bug:
33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
Nathan Harold [Wed, 14 Dec 2016 19:40:03 +0000 (11:40 -0800)]
Remove dependency on telephony-common from services/core
After migrating all the dependencies from frameworks/opt/telephony
to frameworks/base, the dependency is no longer needed and should
never have been created in the first place. Happily removed.
Bug:
33414487
Test: compilation
Change-Id: I261da4c6b819b3c960ce56d2cab5c80cb34e852e
Nathan Harold [Wed, 14 Dec 2016 19:24:48 +0000 (11:24 -0800)]
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry
Bug:
33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
Nathan Harold [Wed, 14 Dec 2016 18:48:00 +0000 (10:48 -0800)]
Port Utility Functions from DefaultPhoneNotifier
-Move static utility functions from frameworks/opt/telephony/
..DefaultPhoneNotifier to a new utility class in frameworks/base
-Update TelephonyRegistry to point to the new functions.
Bug:
33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
Nathan Harold [Wed, 14 Dec 2016 03:03:09 +0000 (19:03 -0800)]
Remove dependency on IccConstants from SmsManager
-Redefine the length of the SmsRecord in SmsManager
Bug:
33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
Nathan Harold [Wed, 26 Apr 2017 01:27:08 +0000 (18:27 -0700)]
Move files from frameworks/opt/telephony to frameworks/base
Bug:
37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Colin Cross [Thu, 20 Apr 2017 19:20:20 +0000 (12:20 -0700)]
Convert libandroid and libandroid_runtime to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
Merged-In: Ie3c9c3d3c8c75ade36422d1e8ee0a5fe117e9091
(cherry picked from commit
3f8fd40f285dba5b3639ee1e3d4e4544048c1446)
Treehugger Robot [Sat, 6 May 2017 00:11:31 +0000 (00:11 +0000)]
Merge changes from topic 'libvintf_cp'
* changes:
android.os.VintfObject: add API for EDI.
Add compatibility matrices to VintfObject.report()
Treehugger Robot [Fri, 5 May 2017 23:28:39 +0000 (23:28 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment"
Colin Cross [Fri, 5 May 2017 22:25:05 +0000 (22:25 +0000)]
Merge "Update path for libmediandk headers"
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
(cherry picked from commit
6bdc550e27e2c4e7b32bb91085eaac898d7d1156)
Kenny Root [Fri, 5 May 2017 21:00:38 +0000 (21:00 +0000)]
Merge changes from topic 'update-conscrypt'
* changes:
Delete obsolete and unused KeyStoreTests
Track updates to Conscrypt
Colin Cross [Fri, 5 May 2017 00:58:11 +0000 (17:58 -0700)]
Update path for libmediandk headers
Platform usages of libmediandk headers are now in media/.
Test: builds
Change-Id: I16385cab86ae9cac225304557df416bbb232ecf3
(cherry picked from commit
c8ed45d38f3b42e06c9e0980e133a84181752b5e)
Treehugger Robot [Fri, 5 May 2017 18:50:11 +0000 (18:50 +0000)]
Merge "Reduce hwui CPU time by using glDrawRangeElements"
Yang Ni [Fri, 28 Apr 2017 15:49:01 +0000 (08:49 -0700)]
Destroy Allocation right away on exception
Bug:
28053584
To avoid holding the resource (surface) for too long.
Test: CTS on x86_64 emulator
Change-Id: I2fdec107c2a16b7dadbf78a9aee79c33423a3676
Treehugger Robot [Fri, 5 May 2017 15:17:21 +0000 (15:17 +0000)]
Merge "Convert libhwui to Android.bp"
Arun [Mon, 23 Jan 2017 11:41:06 +0000 (11:41 +0000)]
Reduce hwui CPU time by using glDrawRangeElements
The CPU overhead of glDrawElements in the GPU driver is significant
with client-side vertex data (unique per draw call) as the driver has
to calculate the mininimum and maximum indices from the index buffer
in order to evaluate the range of vertex data required. This can be
avoided by keeping track of the min-max in hwui and passing it with
glDrawRangeElements. This requires OpenGL ES3.0 support (which is
already checked for elsewhere in hwui).
Test: manual - visual inspection on fugu (nexus player)
Change-Id: I57bb1ddd239a1032f74f1cd2683bbe0970e84bd9
Treehugger Robot [Fri, 5 May 2017 14:06:23 +0000 (14:06 +0000)]
Merge "Add (disabled) time zone update system server impl"
Nicolas Geoffray [Fri, 5 May 2017 08:37:16 +0000 (08:37 +0000)]
Merge "Handle safe mode in PackageManager."
Yifan Hong [Thu, 4 May 2017 20:05:24 +0000 (13:05 -0700)]
android.os.VintfObject: add API for EDI.
Add APIs for EDI (extensive device information).
Test: CtsDeviceInfo
Bug:
28656227
Change-Id: I609d4f1f07e20717827ef024ff8cbe124d7e54a6
Merged-In: I609d4f1f07e20717827ef024ff8cbe124d7e54a6
Yifan Hong [Tue, 2 May 2017 01:43:36 +0000 (18:43 -0700)]
Add compatibility matrices to VintfObject.report()
Test: FrameworksCoreTests
Bug:
36814503
Change-Id: I27eaea136437afb2102581d410b657e810612a0a
Merged-In: I27eaea136437afb2102581d410b657e810612a0a
Adrian Roos [Fri, 5 May 2017 00:50:17 +0000 (00:50 +0000)]
Merge "Update carrier text when phone service state is changed"
Neil Fuller [Thu, 16 Mar 2017 18:32:21 +0000 (18:32 +0000)]
Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.
The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.
The updater is then required to communicate with the
data app and report back to the system server.
Unit tests are included for the major components.
To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Yang Ni [Thu, 4 May 2017 18:44:28 +0000 (18:44 +0000)]
Merge "Destroy Allocation with ScriptIntrinsicLut"
Yang Ni [Fri, 28 Apr 2017 15:50:33 +0000 (08:50 -0700)]
Destroy Allocation with ScriptIntrinsicLut
Bug:
28053584
On destroying the intrinsic, destroy its contained Allocation right away.
Test: CTS on x86_64 emulator
Change-Id: I5ca0da33b620c3291b7cafda31a6cc83eb7461a0
Treehugger Robot [Thu, 4 May 2017 18:04:29 +0000 (18:04 +0000)]
Merge "Moved data retry handler from broadcast to message."
Colin Cross [Wed, 19 Apr 2017 22:25:25 +0000 (15:25 -0700)]
Convert libhwui to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
Merged-In: Ifebdb3797498d49f2bebe5fc728e6d6d8def71cb
(cherry picked from commit
f6298101181122b5b70d1094b131e44580cf62b2)
Jack Yu [Wed, 3 May 2017 20:32:30 +0000 (13:32 -0700)]
Moved data retry handler from broadcast to message.
The broadcast handler onReceive implmentations should
only handle minimum works. Made this consistent with
other DcTracker broadcast handler.
Test: Manual tests, Telephony sanity tests, and unit tests
bug:
37413302
Merged-In: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
Change-Id: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
Treehugger Robot [Thu, 4 May 2017 14:41:08 +0000 (14:41 +0000)]
Merge "More time zone update API classes"
Neil Fuller [Thu, 4 May 2017 13:51:38 +0000 (13:51 +0000)]
Merge "Time zone update API classes"
Neil Fuller [Thu, 16 Mar 2017 18:31:56 +0000 (18:31 +0000)]
More time zone update API classes
This class forms the contract between the updater app
(the app provided by and triggered by the system)
and the data app (the app provided by the OEM to
provide time zone data).
Bug:
31008728
Test: make only, just constants
Change-Id: I687b75954e132884aec962fcf8955f3f38a00b2f
Neil Fuller [Thu, 16 Mar 2017 18:29:36 +0000 (18:29 +0000)]
Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.
This forms the basis of client and system server code to
support time zone updates.
Tests can be run with:
make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
-w com.android.frameworks.coretests \
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"
Bug:
31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
Nicolas Geoffray [Thu, 4 May 2017 11:25:03 +0000 (11:25 +0000)]
Merge "Adjust forced dexopt in case of stripped APKs."
Nicolas Geoffray [Wed, 3 May 2017 10:51:53 +0000 (11:51 +0100)]
Adjust forced dexopt in case of stripped APKs.
We cannot compile from scratch for strip APK. So
if getDexOptNeeded returns NotNeeded, pretend there was
a compiler filter change, in order to pick up the vdex file.
bug:
37558732
Test: "adb shell cmd package compile" of a stripped /system apk
Change-Id: I531010e01e44adfa300872c1739c49dab7292317
Treehugger Robot [Thu, 4 May 2017 03:37:36 +0000 (03:37 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend"
gaoshang [Thu, 20 Apr 2017 06:14:18 +0000 (14:14 +0800)]
fix KeyEvent can't correctly finish when inputmethod time out happend
Symptom: If inputmethod handle an KeyEvent time out ,
Did not finish this event correctly , eventually lead to app ANR
Root Cause: without seq number when obtainMessage MSG_TIMEOUT_INPUT_EVENT
Solution: add seq parameter
Test: Input
Test: InputMethod
Fixes:
37648930
Change-Id: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Merged-In: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Treehugger Robot [Wed, 3 May 2017 19:38:55 +0000 (19:38 +0000)]
Merge "Bluetooth: OBEX: Don't close transport when obex is disconnected"
Hemant Gupta [Thu, 5 Nov 2015 08:42:01 +0000 (14:12 +0530)]
Bluetooth: OBEX: Don't close transport when obex is disconnected
Precondition: PTS 7.0
Usecase:
Execute test case TC_TG_CA_BI_02_C for AVRCP 1.6
Expectation:
Test case should pass
Observation:
Test case fails
Root cause:
Disconnection of OBEX from PTS leads to disconnection of transport
(initiated by DUT) leading to test case failure. Obex server was
unnecessary assuming that transport would be disconnected so was
informing registered users that transport has been disconnected,
which was leading to issues on new obex connect on same transport
channel from remote obex client
Fix:
Remove check to break out of loop after obex disconnection, as that is
already handled in case when read would return -1 in case transport
is closed.
Test: TC_TG_CA_BI_02_C can be passed after the patch.
Bug:
35590000
Change-Id: Ic1682ce77c07cf2e43da09dc95fff2214338f758
Tianjie Xu [Wed, 3 May 2017 17:34:27 +0000 (17:34 +0000)]
Merge "Add error/cause code reporting for Non A/B OTA failures"
Nicolas Geoffray [Wed, 3 May 2017 12:11:58 +0000 (13:11 +0100)]
Handle safe mode in PackageManager.
PackageManager side of the change.
bug:
37929796
Test: manual OTA with a safemode app.
Change-Id: I98c8200d4330dc88fec7eb8ffeb27717a22a220b
Tianjie Xu [Tue, 2 May 2017 19:41:56 +0000 (12:41 -0700)]
Add error/cause code reporting for Non A/B OTA failures
Read and report the error_code & cause_code from last_install.
Bug:
36866437
Test: mma & observe the sysui event in logcat -b events
Change-Id: I5357861fc758e14ed3235bfc8cc76d7561ccea58
Adrian Roos [Tue, 2 May 2017 21:00:40 +0000 (21:00 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
Tyler Gunn [Tue, 2 May 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
Adrian Roos [Tue, 31 Jan 2017 23:10:00 +0000 (15:10 -0800)]
StatusBar: Catch OOM caused by third-party icons
Bug:
31825355
Change-Id: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
Merged-In: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
Yi Kong [Tue, 2 May 2017 18:15:02 +0000 (18:15 +0000)]
Merge "SymbolComparator operator() is missing const"
Tyler Gunn [Fri, 28 Apr 2017 17:45:23 +0000 (10:45 -0700)]
Change MANAGE_OWN_CALLS permission to be a "normal" permission.
Also remove from Phone group since this isn't really related to phone
calls as much as interacting with Telecom APIs.
Test: Manual
Bug:
37722558
Merged-In: Ia972db4bd79a34bc9b9d3896910adc205c286367
Change-Id: Icc4d2170cc7c83f653eeb0438938f7c0c91a0a7c
Treehugger Robot [Tue, 2 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Force a light to be set for the first time"
Narayan Kamath [Tue, 2 May 2017 10:06:48 +0000 (10:06 +0000)]
Merge "Track libcore change
03e8c7dca78a95ccf719a7."
Treehugger Robot [Tue, 2 May 2017 08:44:27 +0000 (08:44 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
Oleksiy Avramchenko [Tue, 25 Apr 2017 10:30:49 +0000 (12:30 +0200)]
Force a light to be set for the first time
The check in LightImpl::setLightLocked skips HAL call if light
parameters aren't changed. During initialization these parameters
are zeroed, thus it's not possible to turn the light off at the
startup.
As an example this fixes the issue with "stuck" battery light
in the following scenario:
1. Device has secure start-up option set (either pin or pattern).
2. Charger is connected at the startup and battery light shows the
charging state on pin or pattern prompt.
3. Device is unlocked and charger disconnected after some time,
e.g. after com.android.server.lights.LightsService restarted.
4. The battery light is not off and stuck in the previous state
until charger is connected / disconnected again.
Bug:
37662368
Test: manual - follow the above step-by-step
Change-Id: I45470e945fe4d26d37a5641dfff3311968f51ee4
Treehugger Robot [Tue, 2 May 2017 06:27:08 +0000 (06:27 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
Hugo Benichi [Fri, 28 Apr 2017 04:29:21 +0000 (13:29 +0900)]
NsdManager: add test coverage for discoverServices()
Test: added new tests
Bug:
37013369,
33298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec
Hugo Benichi [Fri, 28 Apr 2017 02:01:22 +0000 (11:01 +0900)]
NsdManager: unit test coverage for servive registration
This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.
Test: added new unit test
Bug:
37013369,
33298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887
Kenny Root [Mon, 1 May 2017 23:38:45 +0000 (16:38 -0700)]
Delete obsolete and unused KeyStoreTests
These depended on internal implementation details of Conscrypt that are
changing. Delete these tests since they're not included in builds any
more.
Test: make checkbuild
Change-Id: I6ddf832c30bcf49e940c55aa81534c3d987393fb
Kenny Root [Tue, 28 Mar 2017 17:02:23 +0000 (10:02 -0700)]
Track updates to Conscrypt
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I1487d694c5abe7cf2b938d9f1869d9aeb5285ac5
Yi Kong [Mon, 1 May 2017 18:29:24 +0000 (18:29 +0000)]
Merge "Remove no-op std::max call"
Yi Kong [Mon, 1 May 2017 17:57:39 +0000 (10:57 -0700)]
SymbolComparator operator() is missing const
Clean up, no functionality change.
Test: build
Bug:
37752547
Change-Id: I7b6f368c0d0776f956a8b99353df7b23cbbc388d
Yi Kong [Mon, 1 May 2017 06:51:33 +0000 (23:51 -0700)]
Remove no-op std::max call
This was calling std::max on an unsigned integer and 0, which is
essentially no-op. Remove this code.
Test: Build
Bug:
37752547
Change-Id: I74ce45b95960621dff11f574fbe1af60ad147cf0
Erik Kline [Sat, 29 Apr 2017 07:33:34 +0000 (07:33 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
Erik Kline [Sat, 29 Apr 2017 04:20:04 +0000 (13:20 +0900)]
Use ConnectivityService's NETWORK_STACK permission for SoftAp operations
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
37647880
Bug:
37750597
Change-Id: I4fb603b7491013bc13b0c08a785eae6cd37337b9
Treehugger Robot [Sat, 29 Apr 2017 03:00:06 +0000 (03:00 +0000)]
Merge "Add android.os.VintfRuntimeInfo"
Yifan Hong [Wed, 26 Apr 2017 18:38:01 +0000 (11:38 -0700)]
Add android.os.VintfRuntimeInfo
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.
Bug:
28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
Andreas Gampe [Fri, 28 Apr 2017 22:45:25 +0000 (22:45 +0000)]
Merge "Aapt2: Fix png leak"
Hall Liu [Fri, 28 Apr 2017 22:17:50 +0000 (22:17 +0000)]
Merge "eMBMS API update"
Jakub Pawlowski [Fri, 28 Apr 2017 21:36:10 +0000 (21:36 +0000)]
Merge "Bluetooth: bluetooth.le API fixes"
Jakub Pawlowski [Fri, 28 Apr 2017 11:11:26 +0000 (04:11 -0700)]
Bluetooth: bluetooth.le API fixes
Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().
Bug:
37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4
Andreas Gampe [Fri, 28 Apr 2017 20:51:39 +0000 (13:51 -0700)]
Aapt2: Fix png leak
do9Patch is leaking two rows of data.
Bug:
37782695
Test: ASAN_OPTIONS= SANITIZE_HOST=address m
Change-Id: Ibd2198919cd9c24f2de9f50b23c87753f2190708
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:09:03 +0000 (20:09 +0000)]
Merge "Fix equality method implementation in BandConfig class."
Treehugger Robot [Fri, 28 Apr 2017 19:44:49 +0000 (19:44 +0000)]
Merge "better defualt behaviour for msim"
Tyler Gunn [Fri, 28 Apr 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add sort order extra for phoneaccount"
Srikanth Chintala [Mon, 27 Mar 2017 13:57:52 +0000 (19:27 +0530)]
Add sort order extra for phoneaccount
Add sort order extra for phoneaccount
which will be used while sorting
phone accounts in Telecomm
Test: Manual
Bug:
34872161
Merged-In: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
fionaxu [Thu, 6 Apr 2017 17:31:48 +0000 (10:31 -0700)]
better defualt behaviour for msim
switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.
Bug:
36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Merged-in: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Chen Xu [Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)]
Merge "Updated javadocs for sendUssd APIs."
Chen Xu [Fri, 28 Apr 2017 17:25:53 +0000 (17:25 +0000)]
Merge "Update VVM API"
Tomasz Wasilczyk [Fri, 28 Apr 2017 15:19:34 +0000 (08:19 -0700)]
Fix equality method implementation in BandConfig class.
Test: instrumentation (in master branch)
Bug: b/
36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
Martijn Coenen [Fri, 28 Apr 2017 14:32:54 +0000 (14:32 +0000)]
Merge "Validate incoming data properly."
Treehugger Robot [Fri, 28 Apr 2017 07:55:47 +0000 (07:55 +0000)]
Merge "Notify WifiManager of interface state changes"
Erik Kline [Thu, 27 Apr 2017 11:57:23 +0000 (20:57 +0900)]
Notify WifiManager of interface state changes
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
(except for an unrelated IpConnectivityMetricsTest error)
Bug:
31466854
Bug:
32163131
Change-Id: I702ea79eb2c02604761e4e1ebcd5f9e445178efb
Hall Liu [Tue, 25 Apr 2017 22:04:26 +0000 (15:04 -0700)]
eMBMS API update
Brings eMBMS APIs into alignment with the architecture doc.
All APIs are hidden for now.
Test: builds
Change-Id: I6e692bd363f998d1cd8f80faa72bde71ffe8fd2e
Ta-wei Yen [Mon, 6 Mar 2017 22:57:47 +0000 (14:57 -0800)]
Update VVM API
+ TelephonyManager.getVisualVoicemailPackageName() uses pinned subId
from the manager.
+ TelephonyManager.getNetworkSpecifier() updated doc to explain what
a network specifier is.
+ TelephonyManager.getCarrierConfig() Annotated with @WorkerThread
specified failure behavior.
+ VisualVoicemailSms.getFields() Doc specified values are carrier
dependent.
- Hide DEFAULT_* from VisualVociemaliSmsFitelrSettings
Test: CTS TelephonyManagerTest
Bug:
35766748
Fixes:
35766370
Fixes:
35766489
Change-Id: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5
Merged-in: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5
Martijn Coenen [Tue, 18 Apr 2017 22:54:43 +0000 (15:54 -0700)]
Validate incoming data properly.
Make sure calls to readBuffer() and readEmbeddedBuffer()
get the correct size, parent and offset passed in, so
these can be validated by libhwbinder.
Modified HwBlob to take a length argument as well,
so it can be validated.
Bug:
30498700
Test: hidl_test, hidl_test_java, Youtube, Maps, Netflix, Camera
Change-Id: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
Merged-In: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
Treehugger Robot [Thu, 27 Apr 2017 22:48:07 +0000 (22:48 +0000)]
Merge "new reset carrier signals/actions"
Jakub Pawlowski [Thu, 27 Apr 2017 22:12:57 +0000 (22:12 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
fionaxu [Wed, 26 Apr 2017 23:05:25 +0000 (16:05 -0700)]
new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.
Bug:
34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Merged-in: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Jakub Pawlowski [Thu, 27 Apr 2017 15:37:04 +0000 (08:37 -0700)]
Bluetooth: Add constants to ScanResult
Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT
Test: none
Bug:
37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad
pkanwar [Mon, 20 Mar 2017 19:23:42 +0000 (12:23 -0700)]
Updated javadocs for sendUssd APIs.
Bug:
35766546
Change-Id: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Merged-in: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Test: manual
Treehugger Robot [Thu, 27 Apr 2017 19:37:53 +0000 (19:37 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
Jakub Pawlowski [Thu, 27 Apr 2017 14:04:15 +0000 (07:04 -0700)]
Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e48159fd37f827d30b822f2f187551e.
Bug:
37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
Jeff Davidson [Thu, 27 Apr 2017 18:03:31 +0000 (18:03 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
Chen Xu [Thu, 27 Apr 2017 17:46:02 +0000 (17:46 +0000)]
Merge "Add getVisualVoicemailPackageName()"
Pankaj Kanwar [Thu, 27 Apr 2017 17:41:56 +0000 (17:41 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
Ajay Panicker [Thu, 27 Apr 2017 17:29:35 +0000 (17:29 +0000)]
Merge "Limit btsnoop file size (3/8)"
Mukesh Agrawal [Thu, 27 Apr 2017 16:40:48 +0000 (16:40 +0000)]
Merge "Log: increase visibility of Log.TerribleFailure"
Brad Ebinger [Thu, 27 Apr 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Better handle MSIM DDS changed event"
pkanwar [Sun, 19 Mar 2017 19:14:34 +0000 (12:14 -0700)]
RIL changes to allow the modem to query the framework for the key.
In order to support IMSI encryption, the modem needs to request the
framework for the public key of the Carrier. The framework will pass
2 fields back, the public key and a string (which is a key value pair
to be defined by the carrier).
BUG:
35606429
Test: manual
Change-Id: I609e4505508aa6bb5b442c09eb4c346106492361
Merged-In: I609e4505508aa6bb5b442c09eb4c346106492361
Narayan Kamath [Thu, 27 Apr 2017 15:26:50 +0000 (15:26 +0000)]
Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir"