OSDN Git Service
Andreas Gampe [Fri, 5 Jan 2018 01:30:56 +0000 (01:30 +0000)]
Merge changes I872a81ae,I0b9e72d2
am:
f30c2c02f0
Change-Id: Ie495ff6b40f72203b5fae68fb00e35289b29f356
Treehugger Robot [Fri, 5 Jan 2018 01:14:44 +0000 (01:14 +0000)]
Merge changes I872a81ae,I0b9e72d2
* changes:
Revert "Frameworks: Move SharedPreferencesImpl to Future"
Revert "Frameworks: Silently ignore InterruptedException"
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:51:12 +0000 (18:51 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue"
am:
ae81e15c9c
Change-Id: I30778e45730e79bc071344fb31fd0038d739ee9d
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:32:00 +0000 (18:32 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue"
Qingxi Li [Thu, 4 Jan 2018 02:02:04 +0000 (02:02 +0000)]
Merge "Add API to get eUICC's OTA status"
am:
15a410a75a
Change-Id: I634b04834840946b07d995222e5a26c029d0a053
Andreas Gampe [Thu, 4 Jan 2018 01:22:35 +0000 (17:22 -0800)]
Revert "Frameworks: Move SharedPreferencesImpl to Future"
This reverts commit
70b600d45683b574104d10198da9bce49aa6be23.
In preparation for a different fix. There are too many loopholes
with updates vs commits.
Bug:
67986472
Bug:
71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I872a81ae1a26e1f77aad2a52daf88e093a686ec6
Andreas Gampe [Thu, 4 Jan 2018 01:21:09 +0000 (17:21 -0800)]
Revert "Frameworks: Silently ignore InterruptedException"
This reverts commit
c8d5fc857208b08b984a802277807e9195b2f9a7.
In preparation for different fix.
Bug:
67986472
Bug:
70122540
Bug:
71533447
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I0b9e72d271725e15c20b68de981303c96ac1bd2a
Treehugger Robot [Thu, 4 Jan 2018 01:50:43 +0000 (01:50 +0000)]
Merge "Add API to get eUICC's OTA status"
Colin Cross [Thu, 4 Jan 2018 01:04:20 +0000 (01:04 +0000)]
Merge changes I9de0ffe9,Idc804896
am:
153fb1c6e0
Change-Id: I7cd9329c7ea8ef720df36059a491a9d627233d1a
Colin Cross [Thu, 4 Jan 2018 00:48:50 +0000 (00:48 +0000)]
Merge changes I9de0ffe9,Idc804896
* changes:
Use sdkparcelables to generate framework.aidl
Initial sdkparcelables
Qingxi Li [Wed, 13 Dec 2017 23:13:02 +0000 (15:13 -0800)]
Add API to get eUICC's OTA status
The function will return current eUICC's OTA status and requests calling
app has WRITE_EMBEDDED_SUBSCRIPTIONS.
Test: E2E
Bug:
37279356
Change-Id: I823ed7aa9d86530c4bebd4c0b1a00f0c607105ed
Malcolm Chen [Wed, 3 Jan 2018 19:52:36 +0000 (19:52 +0000)]
Merge "Move Ims related settings from global setting to subscription db."
am:
f2ebbd1356
Change-Id: Ifc49cccd9f9ce47585367a3f0802ced5df94140b
Jeff Sharkey [Wed, 3 Jan 2018 19:47:22 +0000 (19:47 +0000)]
Merge "Avoid NPE when missing underlyingCaps."
am:
6522970c1e
Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519
Treehugger Robot [Wed, 3 Jan 2018 19:42:24 +0000 (19:42 +0000)]
Merge "Move Ims related settings from global setting to subscription db."
Jeff Sharkey [Wed, 3 Jan 2018 19:33:00 +0000 (19:33 +0000)]
Merge "Avoid NPE when missing underlyingCaps."
hj.seo [Wed, 3 Jan 2018 01:22:40 +0000 (01:22 +0000)]
Merge "Modify getting of primary storage size"
am:
1c876b73b3
Change-Id: I94a26e80a75f03278a8e90d9ec2e4ca0cfbf0a81
Treehugger Robot [Wed, 3 Jan 2018 01:10:49 +0000 (01:10 +0000)]
Merge "Modify getting of primary storage size"
yinxu [Tue, 2 Jan 2018 22:26:36 +0000 (22:26 +0000)]
Merge "Add new RIL requests"
am:
3095fcca4d
Change-Id: I73a3bd3de2d25d19e1afd3a143c7cfa3955d0410
Treehugger Robot [Tue, 2 Jan 2018 22:17:21 +0000 (22:17 +0000)]
Merge "Add new RIL requests"
manojboopathi [Fri, 1 Dec 2017 01:11:49 +0000 (17:11 -0800)]
Fix CTS Test Dual Stack Test Passing Issue
CTS test should fail if IPV6 Sockets is used on IPV4 address.
Unfortunately its been passing fine due to unhandled catch
exception. This is fixed in this CL.
Bug:
64435904
Test: Ran CTS test to verify ./run_cts.sh
Change-Id: I369c1b5baaa64b64feaa3f298e61f46d1200ea17
Chad Brubaker [Tue, 2 Jan 2018 21:06:38 +0000 (21:06 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement"
am:
c03c63c8bb
Change-Id: I1c14a1b7acb11e3de32e3e31ceccc68c37acf07c
Treehugger Robot [Tue, 2 Jan 2018 20:53:25 +0000 (20:53 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement"
Jeff Sharkey [Tue, 2 Jan 2018 18:46:32 +0000 (11:46 -0700)]
Avoid NPE when missing underlyingCaps.
Test: builds, boots
Bug:
70391265
Change-Id: I0f3d3f96596eca3455bcbb29af04c8b34cb18d38
sqian [Thu, 28 Dec 2017 22:17:09 +0000 (22:17 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"
am:
73200d9ac9
Change-Id: I142e4f3c760e3b0216d89c197d760e9acc0255fd
Treehugger Robot [Thu, 28 Dec 2017 22:07:25 +0000 (22:07 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"
Ivan Lozano [Thu, 28 Dec 2017 18:43:41 +0000 (18:43 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp"
am:
f7c56624c7
Change-Id: I1843878f7194696896700572f2259f5f2c6b92c2
Treehugger Robot [Thu, 28 Dec 2017 18:32:51 +0000 (18:32 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp"
Jack Yu [Thu, 28 Dec 2017 18:29:10 +0000 (18:29 +0000)]
Merge "Added AIDL for cell identity"
am:
470ba9d471
Change-Id: Id3cc4071c60828a6f86499d135d6dbb842dcaeb1
Treehugger Robot [Thu, 28 Dec 2017 18:17:34 +0000 (18:17 +0000)]
Merge "Added AIDL for cell identity"
Ivan Lozano [Thu, 28 Dec 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Fix temporary file name strlcpy size."
am:
d4d542e0ca
Change-Id: Id9de2553e39a1999ed7e43c3ce5bc18b63fc2221
Ivan Lozano [Thu, 28 Dec 2017 17:48:50 +0000 (17:48 +0000)]
Merge "Fix temporary file name strlcpy size."
Ivan Lozano [Tue, 7 Nov 2017 21:26:27 +0000 (13:26 -0800)]
Disable sanitizer entirely in ResourceTypes.cpp
The unsigned integer overflow sanitizer catches an overflow on
Res_GETPACKAGE usages. This is used in a number of places in
ResourceTypes.cpp in a number of large functions. For now, lets disable
the sanitizer in this source file.
Test: Compiles and device boots without runtime errors.
Bug:
30969751
Change-Id: Id9e0776ef819c895a3194a32da5c85459f1af431
Merged-In: Id9e0776ef819c895a3194a32da5c85459f1af431
(cherry picked from commit
02828740da7481a48e7872b22213047025894525)
Jack Yu [Thu, 28 Dec 2017 00:19:20 +0000 (16:19 -0800)]
Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.
Test: Build
bug:
64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit
31db18a4c078b77f011170a27eb95c94398efde6)
Malcolm Chen [Tue, 26 Sep 2017 21:45:40 +0000 (14:45 -0700)]
Move Ims related settings from global setting to subscription db.
Bug:
66699661
Test: Manual
Change-Id: Id0d7795401f120b6a8704304a368d926a6610395
Merged-In: Id0d7795401f120b6a8704304a368d926a6610395
sqian [Thu, 30 Nov 2017 19:26:56 +0000 (11:26 -0800)]
Add ICCID_PREFIX column in CarridId DB
Bug:
64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java
Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
Merged-In: I0d118ab181dfe17a7976a0b654989a3662594d4a
(cherry picked from commit
4fe8280dc6736ab3c59f8e384323c26212215a90)
goneil [Wed, 27 Dec 2017 21:31:21 +0000 (21:31 +0000)]
Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
am:
ee48176ad6
Change-Id: I831efeddbebd4ff65d2a64f628eab84f84ecfa73
Treehugger Robot [Wed, 27 Dec 2017 21:22:02 +0000 (21:22 +0000)]
Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
Malcolm Chen [Wed, 27 Dec 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."
am:
10d1ee58f8
Change-Id: I6ddf4fa541650ed9c983bd21d7e3eacf80214285
Treehugger Robot [Wed, 27 Dec 2017 21:06:32 +0000 (21:06 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."
Andreas Gampe [Wed, 27 Dec 2017 20:18:25 +0000 (20:18 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death"
am:
4b7abe301c
Change-Id: I8f29f452707bb38799877f23d0d04152619c81cb
Treehugger Robot [Wed, 27 Dec 2017 20:08:25 +0000 (20:08 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death"
Andreas Gampe [Wed, 27 Dec 2017 17:30:45 +0000 (09:30 -0800)]
Binder: Log a histogram of binder proxies to logcat on death
To help investigate potential BinderProxy leaks, attempt to log a
histogram of BinderProxy descriptors to the logcat before asserting.
Bug:
71353150
Test: m
Change-Id: I47313814160678369b15e7dc5851d8096c286b9d
hj.seo [Wed, 20 Dec 2017 00:39:47 +0000 (09:39 +0900)]
Modify getting of primary storage size
Settings application shows internal storage size using API getTotalBytes in StorageStatsManager.
This API calls getPrimaryStorageSize() in StorageManager.
getPrimaryStorageSize() returns /data parition size calculated API roundStorageSize() in FileUtils.
Using this API, total primary storage size returns 8GB if 16GB emmc size device has /data partition size below 8GB.
So we should modify getting of primary storage size close to real emmc size.
getPrimaryStorageSize() will be calculated sum of /data and /system partition size.
Test: Check primary storage size in Settings application
Change-Id: I3ad33534b1c55d09afbb0e9be1c408c02c442842
Signed-off-by: hj.seo <hj.seo@lge.com>
Chad Brubaker [Sun, 24 Dec 2017 04:06:44 +0000 (20:06 -0800)]
Relax Instant Apps Settings whitelist enforcement
The strict whitelist of settings for Instant Apps is leading to too much
unintended breakage, remove the enforcement until better infrastructure
can be added to make sure settings that should be whitelisted are.
Bug:
71009655
Test: Coming in a follow up
Change-Id: Ie089dc26cec87207515d15ba881e1a0aa49a9c51
Malcolm Chen [Sat, 23 Dec 2017 00:50:25 +0000 (00:50 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
am:
e4e5291743
Change-Id: I504256eb76a94002678832ecb13a6ef12f7d3603
Malcolm Chen [Fri, 28 Jul 2017 18:49:29 +0000 (11:49 -0700)]
Remove getIntWithSubId in TelephonyManager.
For multi-SIM case, getIntWithSubId would check if a Global.Settings
value doesn't exist for a specific SIM (for example mobile_data0),
it copies value from general one (mobile_data).
Test: Telephony unittests
Bug:
34351475
Change-Id: I870e6f3c193cf3bdeae22fe1a750b0a0ec782f9b
Merged-In: I870e6f3c193cf3bdeae22fe1a750b0a0ec782f9b
Treehugger Robot [Sat, 23 Dec 2017 00:41:49 +0000 (00:41 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Malcolm Chen [Tue, 25 Jul 2017 22:48:44 +0000 (15:48 -0700)]
Add MetricsEvent ENUMS for "Mobile network" preferences.
Bug:
34775714
Test: Manual
Change-Id: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Merged-In: I71645de4f07d10c6c3772a6fef119dbdec2db8ef
Ying Xu [Fri, 22 Dec 2017 01:09:23 +0000 (01:09 +0000)]
Merge "Expose the scan API and network select API."
am:
761b7b50d1
Change-Id: I6cdbcea874ba58874dcfe47da9866b25643a1a96
Ying Xu [Fri, 22 Dec 2017 01:01:09 +0000 (01:01 +0000)]
Merge "Expose the scan API and network select API."
Hall Liu [Fri, 22 Dec 2017 00:48:39 +0000 (00:48 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
am:
465f2916e0
Change-Id: I0a590d86b2e39ba77a013ceb2c0d6b6582ef1ae4
Hall Liu [Fri, 22 Dec 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Add feature flag and EMBMS bug fixes"
Brad Ebinger [Thu, 21 Dec 2017 23:53:13 +0000 (23:53 +0000)]
Merge "Add new reason code for call barring"
am:
a003d996b9
Change-Id: I36fd5803e1a1a535a000dc4e69dc7238fa26efbd
Brad Ebinger [Thu, 21 Dec 2017 23:45:01 +0000 (23:45 +0000)]
Merge "Add new reason code for call barring"
Hall Liu [Thu, 21 Dec 2017 22:40:11 +0000 (22:40 +0000)]
Merge "Add feature flag for RTT in call log"
am:
138d07f82d
Change-Id: Id04b93ecd8cd25f59354fe209cb98c05248afaa8
Hall Liu [Thu, 21 Dec 2017 22:31:45 +0000 (22:31 +0000)]
Merge "Add feature flag for RTT in call log"
Hansong Zhang [Thu, 21 Dec 2017 22:08:20 +0000 (22:08 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
am:
045fdae1b3
Change-Id: I8f7a28ce56435bd4d1f01631b188a62f35c3f100
Treehugger Robot [Thu, 21 Dec 2017 21:56:10 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:19:28 +0000 (21:19 +0000)]
Merge "Add asn1 to platform."
am:
bdd0da8fa7
Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:01:40 +0000 (21:01 +0000)]
Merge "Add asn1 to platform."
goneil [Thu, 14 Dec 2017 00:20:35 +0000 (16:20 -0800)]
Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
Bug:
70177947
Test: None
Merged-In:If26ae0c69d3266c2639b61b3ed32df3f1cb2c36f
Change-Id: Ie08e56c9409c1fbbe24133b0981f5ab35f6a2f24
Tyler Gunn [Thu, 21 Dec 2017 20:00:28 +0000 (20:00 +0000)]
Merge "Add logging and disconnect reason for null connections."
am:
7661e81f85
Change-Id: Id1f754f62869c38499f30d6ee33046c89024efc6
yinxu [Mon, 20 Nov 2017 23:26:06 +0000 (15:26 -0800)]
Add new RIL requests
Bug:
68998818
Test: Basic telephony sanity
Change-Id: Icad4ad8a9d8dd1bdc36a3e073cf14db31f590929
Tyler Gunn [Thu, 21 Dec 2017 19:39:32 +0000 (19:39 +0000)]
Merge "Add logging and disconnect reason for null connections."
abdalkader [Thu, 21 Dec 2017 19:20:36 +0000 (19:20 +0000)]
Merge "SMS over IMS APIs revision"
am:
2bf7f03e63
Change-Id: I7296426e1c1fc903d92e324a09598e357e75389b
Yan Sun [Thu, 21 Dec 2017 19:17:32 +0000 (19:17 +0000)]
Merge "Add Notification Flag behavior test"
am:
89bb1971d0
Change-Id: I0948f245fee622b5acd1a1bb414e7a2e20090dc8
Chrison.chai [Thu, 21 Dec 2017 19:14:40 +0000 (19:14 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
am:
d8514e82aa -s ours
Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8
Philip P. Moltmann [Thu, 21 Dec 2017 19:12:57 +0000 (19:12 +0000)]
Merge "Testables lib should not statically link mockito"
am:
47d04fc5c0
Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688
Holly Jiuyu Sun [Mon, 11 Dec 2017 21:28:03 +0000 (13:28 -0800)]
Add asn1 to platform.
Add unit test.
Bug:
38206971
Test: unit test
Change-Id: I140b74b6bda263a4044aaed7265de3c77d1adc63
Merged-In: Ifb7c7d13ad0f980ba986b3aa6c3213ad26658489
abdalkader [Thu, 21 Dec 2017 18:12:07 +0000 (18:12 +0000)]
Merge "SMS over IMS APIs revision"
Treehugger Robot [Thu, 21 Dec 2017 17:54:34 +0000 (17:54 +0000)]
Merge "Add Notification Flag behavior test"
Sanket Padawe [Thu, 21 Dec 2017 17:41:40 +0000 (17:41 +0000)]
Merge "Receiving side Call handover API implementation."
am:
3c7bc2dc06
Change-Id: I7badcfaf9d308fb05745b0f37ee99603f5eee1c2
Chenbo Feng [Thu, 21 Dec 2017 17:38:12 +0000 (17:38 +0000)]
Merge "Use NetworkStatsService to get stats for apps"
am:
693d8a2ab1
Change-Id: I81a28a172e69fc405e99eb9c3a4fd0c729ca613d
Ivan Lozano [Fri, 15 Dec 2017 03:03:56 +0000 (19:03 -0800)]
Fix temporary file name strlcpy size.
The strlcpy size argument overflows on integer sanitized builds.
runtime error: unsigned integer overflow: 11 - 35 cannot be represented
in type 'unsigned long'
This doesn't cause a problem because strlcpy stops on the null in
TMP_FILE_PATTERN, and localTmpFileName is defined large enough to
contain TMP_FILE_PATTERN.
This changes the size argument to the remaining length in the buffer,
and removes an extraneous '/' write as TMP_FILE_PATTERN already begins
with '/'.
Bug:
30969751
Test: Reran CTS test which triggered the overflow.
Change-Id: I20b5deeaaa1a863324dfd1d94f3135920eae48d3
Merged-In: I20b5deeaaa1a863324dfd1d94f3135920eae48d2
(cherry picked from commit
62fc14894b32f35641ae2b61ef7ed054c9660288)
Treehugger Robot [Thu, 21 Dec 2017 15:27:44 +0000 (15:27 +0000)]
Merge "Fix random systemui crashes during cts test DO NOT MERGE"
Treehugger Robot [Thu, 21 Dec 2017 15:27:23 +0000 (15:27 +0000)]
Merge "Testables lib should not statically link mockito"
Chrison.chai [Wed, 15 Nov 2017 01:31:26 +0000 (09:31 +0800)]
Fix random systemui crashes during cts test DO NOT MERGE
systemui may crash due
to an uninitialized value of mNavigationBar probably because
of some race condition during initialization caused by emulation
performance issues:
11-01 19:48:58.634 5064 5064 E AndroidRuntime: FATAL EXCEPTION: main
11-01 19:48:58.634 5064 5064 E AndroidRuntime: Process: com.android.systemui, PID: 5064
11-01 19:48:58.634 5064 5064 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.android.systemui.statusbar.phone.LightBarTransitionsController.dump (java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[])' on a null object reference
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.LightBarController.dump(LightBarController.java:241)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.statusbar.phone.StatusBar.dump(StatusBar.java:3448)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemBars.dump(SystemBars.java:48)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.systemui.SystemUIService.dump(SystemUIService.java:52)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleDumpService(ActivityThread.java:3488)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.-wrap9(Unknown Source:0)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.handleMessage(ActivityThread.java:1726)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Handler.dispatchMessage(Handler.java:105)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.os.Looper.loop(Looper.java:164)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at android.app.ActivityThread.main(ActivityThread.java:6541)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at java.lang.reflect.Method.invoke(Native Method)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.Zygote.run(Zygote.java:240)
11-01 19:48:58.634 5064 5064 E AndroidRuntime: at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:767)
This patches adds an explicit checks for (mNavigationBar != null)
everywhere it is used.
Test: cts test.
Change-Id: I8056aef54a10bbb1970bc2ce4913e7a618498fd3
Brad Ebinger [Wed, 29 Nov 2017 03:15:47 +0000 (19:15 -0800)]
SMS over IMS APIs revision
- Move from being a feature to being a capability
- Move format to the constructor and make final
- Initial hooking up of APIs provided by platform for ims providers.
- Add constants for send status result
- Rename SmsListener callbacks.
- Split acknowledgeSms for sms and sms reports.
- Add reason for onSendSmsResult
Bug:
69846044
Test: None
Change-Id: I861664264a117d5483e392d4aabff59bfaf4373e
Philip P. Moltmann [Wed, 20 Dec 2017 23:41:32 +0000 (15:41 -0800)]
Testables lib should not statically link mockito
- All users of the lib already statically link mockito
- We should allow the users to decide what flavor they use
Test: m -j checkbuild
Change-Id: Ibbdb8be8022432a13b872865ade47b92b28976c6
Merged-In: Ibbdb8be8022432a13b872865ade47b92b28976c6
Sanket Padawe [Wed, 20 Dec 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Receiving side Call handover API implementation."
Treehugger Robot [Wed, 20 Dec 2017 20:30:54 +0000 (20:30 +0000)]
Merge "Use NetworkStatsService to get stats for apps"
Hansong Zhang [Mon, 18 Dec 2017 23:18:39 +0000 (15:18 -0800)]
BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)
Bug:
63384609
Test: make
Merged-In: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb
Change-Id: I3b55f7383d2a84162d681ebf3740ddc9e8a55bbb
(cherry picked from commit
42324278bfb55beefb3abcb6aae20ac70d87e2c5)
Philip P. Moltmann [Wed, 20 Dec 2017 19:09:03 +0000 (19:09 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
am:
f924642729
Change-Id: I4470f63baac7bc33dff0dac94da3a0d93c322dc7
Treehugger Robot [Wed, 20 Dec 2017 18:55:14 +0000 (18:55 +0000)]
Merge "Don't include mockito in frameworks-base-testutils"
Benedict Wong [Wed, 20 Dec 2017 18:35:45 +0000 (18:35 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
am:
4edb4c8ec4
Change-Id: I75a3cb9e9d9d7d3b6c0ede86074a00ddcd86028e
Benedict Wong [Wed, 20 Dec 2017 18:25:32 +0000 (18:25 +0000)]
Merge "[ipsec-doze] Add fchown to IpSecService to support doze"
Sanket Padawe [Wed, 20 Dec 2017 18:13:05 +0000 (10:13 -0800)]
Receiving side Call handover API implementation.
Bug:
65415068
Test: Manual
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:
Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
Merged-in: Ic0c4af19098252389648007628affc19a44f89dd
Sanket Padawe [Wed, 20 Dec 2017 17:41:13 +0000 (17:41 +0000)]
Merge "Implement Call handover initiation side APIs."
am:
e2d080481a
Change-Id: Ib9840c4ce4abf64f36e21cbc3256050e4216314b
Sanket Padawe [Wed, 20 Dec 2017 17:33:45 +0000 (17:33 +0000)]
Merge "Implement Call handover initiation side APIs."
Alex Light [Wed, 20 Dec 2017 15:13:34 +0000 (15:13 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
am:
cbeea23861
Change-Id: Ifa4ffb6610152f1e919bc10fc7c8697c4bb99a0d
Alex Light [Wed, 20 Dec 2017 15:04:10 +0000 (15:04 +0000)]
Merge "Add support for selecting alternate JDWP implementations"
Chenbo Feng [Wed, 15 Nov 2017 01:54:17 +0000 (17:54 -0800)]
Use NetworkStatsService to get stats for apps
Move the native implementation of TrafficStats to NetworkStatsService
and apps need to get the NetworkStatsService binder interface from
system_server in order to get the network usage stats since boot. This
implementation can hide the detail of retrieving network traffic
information from apps and the NetworkStatsService can choose which
methoed it use to get the data depending on the kernel version of the
device.
Bug:
30950746
Test: CtsNetTestCases -t android.net.cts.TrafficStatsTest
Change-Id: I53bbefd19aa0b783b9b4b42ea4d76db3e9ec07a3
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:59:14 +0000 (02:59 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
am:
6991266aa6
Change-Id: I253f3bceb0f3c1855fada016c792bf29876e4aa1
Holly Jiuyu Sun [Wed, 20 Dec 2017 02:49:50 +0000 (02:49 +0000)]
Merge "Use getter instead of member for IEuiccController stub."
Sanket Padawe [Fri, 1 Dec 2017 21:59:27 +0000 (13:59 -0800)]
Implement Call handover initiation side APIs.
Bug:
65415068
Test: Manual
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#
Change-Id: I692bb14fba66733154378c2dda525aa85c471a38
Merged-in: I692bb14fba66733154378c2dda525aa85c471a38
Tyler Gunn [Tue, 19 Dec 2017 23:23:59 +0000 (15:23 -0800)]
Add logging and disconnect reason for null connections.
When a ConnectionService implementation returns a null connection, log this
and also set a unique disconnect reason to indicate in the telecom
dumpsys what happened.
Test: Manual
Bug:
70385625
Change-Id: Iff9846d434d400c4cf036e9ac46167cfb6f6b58c
yinxu [Thu, 30 Nov 2017 22:58:36 +0000 (14:58 -0800)]
Expose the scan API and network select API.
Bug:
67748005
Test: Basic telephony sanity
Change-Id: I54aa5d5eacfeb39ada14e843917fe08e382e79de
Philip P. Moltmann [Tue, 19 Dec 2017 21:20:22 +0000 (13:20 -0800)]
Don't include mockito in frameworks-base-testutils
So that each test can pick if they want mockito-inline or not.
Test: m -j checkbuild
Change-Id: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
Merged-In: I1ac02acebbe5cd01f3032a10932a1c612d8d3a4d
vichang [Tue, 19 Dec 2017 18:24:59 +0000 (18:24 +0000)]
Merge "API updated for ICU4J 60.1"
am:
71b25c06a7
Change-Id: I3968eda2e73fe3641abd45684f6ae992d6e780d3
vichang [Tue, 19 Dec 2017 13:13:13 +0000 (13:13 +0000)]
Merge "API updated for ICU4J 60.1"