OSDN Git Service
Jack He [Mon, 8 Jan 2018 20:20:19 +0000 (20:20 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing" am:
02a0397643
am:
37f987d7ee
Change-Id: I2d5a62b3eb22bd10c350495726307674107778b4
nharold [Mon, 8 Jan 2018 20:16:08 +0000 (20:16 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup" am:
2b36299c73
am:
d7319df4d0
Change-Id: If6ab575e2f30fc70d73e6f8787c87f3c7a2ab09d
Jack He [Sat, 6 Jan 2018 17:32:38 +0000 (17:32 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
am:
02a0397643
Change-Id: Id6c9ab4a230e5c242402f78212f21943e1a7604f
nharold [Sat, 6 Jan 2018 17:29:12 +0000 (17:29 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"
am:
2b36299c73
Change-Id: I5461b0e0746f8c60b425126d9badbae4630395bb
Lucas Dupin [Sat, 6 Jan 2018 03:34:46 +0000 (03:34 +0000)]
Turn default gradient into solid black
am:
12dad0c4fc
Change-Id: I6f5c702487f46395bd1930d943782d1a9b6bac5d
Lucas Dupin [Mon, 30 Oct 2017 18:09:25 +0000 (11:09 -0700)]
Turn default gradient into solid black
Test: visual
Bug:
66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit
e7476addecb4fec6abd08cfb7aa27c473ce5c1f0)
Treehugger Robot [Fri, 5 Jan 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Bluetooth: Remove strings for enabling inband ringing"
Jack He [Thu, 7 Dec 2017 23:18:40 +0000 (15:18 -0800)]
Bluetooth: Remove strings for enabling inband ringing
* As in-band ringing is enabled by default on supported devices, user
action in development settings should be disabling it instead of
enabling it
* The new string is added to packages/apps/Settings and the old string
is hence removed from SettingsLib
Bug:
65383086
Test: make, try toggling the preference and verify in-band ringing's
behavior
Change-Id: I18858e86f4127f6555cce27d239d2682b6134fe2
Merged-In: I18858e86f4127f6555cce27d239d2682b6134fe2
(cherry picked from commit
326f1db42cabe8a7f2bcaef441a3353af98bba5f)
nharold [Fri, 5 Jan 2018 19:05:09 +0000 (19:05 +0000)]
Merge changes from topic "ipsec-resource-id-cleanup"
* changes:
IpSecService - Convert mNextResourceId from AtomicInt to Int
IpSec Invalidate the Resource IDs on close()
Fyodor Kupolov [Fri, 5 Jan 2018 02:10:46 +0000 (02:10 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak" am:
766f0a4981
am:
130d5e3915
Change-Id: I89eb0c20c06c7b077b59a4aa66b6693014192e43
Fyodor Kupolov [Fri, 5 Jan 2018 02:03:33 +0000 (02:03 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak"
am:
766f0a4981
Change-Id: I7e0c6ee50fba9563ba45231709e0df8a3dbe266c
Fyodor Kupolov [Fri, 5 Jan 2018 01:53:28 +0000 (01:53 +0000)]
Merge "Account: Fix the risk of sqliteconnection leak"
Andreas Gampe [Fri, 5 Jan 2018 01:39:13 +0000 (01:39 +0000)]
Merge changes I872a81ae,I0b9e72d2 am:
f30c2c02f0
am:
34445736d8
Change-Id: I506b0e29977f0fbb410066dea46c99f264e01028
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"
Nathan Harold [Thu, 14 Dec 2017 03:16:33 +0000 (19:16 -0800)]
IpSecService - Convert mNextResourceId from AtomicInt to Int
The mNextResourceId variable is only accessed within synchronized
blocks, so there is no need to use an atomic integer to synchronize
it. This eliminates the misleading notion that the variable is
accessed outside of guarded blocks, which it is not.
Bug:
62279167
Test: cts
Change-Id: I815835622659f54d2d2d33b349b17c632ebced8d
Nathan Harold [Thu, 14 Dec 2017 02:51:35 +0000 (18:51 -0800)]
IpSec Invalidate the Resource IDs on close()
To facilitate error checking we should invalidate
the resource IDs of all objects when we close() them.
Today, the resource ID is invalidated on the Transform
object but not on the SPI or Encap Socket. This CL
unifies the behavior.
Bug:
70641274
Test: cts - IpSecManagerTest
Change-Id: I28caec3e913902c748c6a50b4ef742ccef8b1b09
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:59:41 +0000 (18:59 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue" am:
ae81e15c9c
am:
a19acb6ac8
Change-Id: Ica9ded5c7bdbeb243c63a3ebb1ca273d4c8f4138
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:09:32 +0000 (02:09 +0000)]
Merge "Add API to get eUICC's OTA status" am:
15a410a75a
am:
412aecc2b0
Change-Id: I50ec4a84ddc30e5232bd0cabb8a721ebb7feca47
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"
Android Build Merger (Role) [Thu, 4 Jan 2018 01:12:02 +0000 (01:12 +0000)]
Merge "Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev am:
4689a6d979" into oc-mr1-dev-plus-aosp
Pankaj Kanwar [Thu, 4 Jan 2018 01:10:55 +0000 (01:10 +0000)]
Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev
am:
4689a6d979
Change-Id: I190f53b2d8aa4202a9f20f3831581414185962d3
Colin Cross [Thu, 4 Jan 2018 01:10:47 +0000 (01:10 +0000)]
Merge changes I9de0ffe9,Idc804896 am:
153fb1c6e0
am:
99161bc1c7
Change-Id: Id831c5ab771fa59ac9906d473ffeb7720fbbdf54
Colin Cross [Thu, 4 Jan 2018 01:04:20 +0000 (01:04 +0000)]
Merge changes I9de0ffe9,Idc804896
am:
153fb1c6e0
Change-Id: I7cd9329c7ea8ef720df36059a491a9d627233d1a
Pankaj Kanwar [Thu, 4 Jan 2018 01:03:27 +0000 (01:03 +0000)]
Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev
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 20:04:37 +0000 (20:04 +0000)]
Merge "Move Ims related settings from global setting to subscription db." am:
f2ebbd1356
am:
5bf5c028f7
Change-Id: Iab3a7a47da5961471bce7a8e29960ab75e68719b
Jeff Sharkey [Wed, 3 Jan 2018 19:56:28 +0000 (19:56 +0000)]
Merge "Avoid NPE when missing underlyingCaps." am:
6522970c1e
am:
e35adbc4d2
Change-Id: Iacd2f15ad31ec7d5c83b21674e1e1f106a5fbd96
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:29:57 +0000 (01:29 +0000)]
Merge "Modify getting of primary storage size" am:
1c876b73b3
am:
f8adea8255
Change-Id: I291fef4af5af22160952be48415463619d300ff2
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:35:44 +0000 (22:35 +0000)]
Merge "Add new RIL requests" am:
3095fcca4d
am:
2f928350db
Change-Id: I9ee55800299fb1233b3f0f42b63b8b3d8590792a
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:14:03 +0000 (21:14 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" am:
c03c63c8bb
am:
d0c2fe9f0a
Change-Id: If2e059bddc4f03880323b24cc66059553b63216a
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:23:48 +0000 (22:23 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB" am:
73200d9ac9
am:
33395ea925
Change-Id: Ied8bb4b9302533bc13ebcd49c80cdd1ca6c0641d
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:50:02 +0000 (18:50 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp" am:
f7c56624c7
am:
203055b322
Change-Id: I63e2754a278e3acb5aaa9a6a6d94dc4174a5e8b4
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
Jack Yu [Thu, 28 Dec 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Added AIDL for cell identity" am:
470ba9d471
am:
a205f42172
Change-Id: I82ea2e0019e513a3404e8bde0cda6514203df7dc
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 18:06:15 +0000 (18:06 +0000)]
Merge "Fix temporary file name strlcpy size." am:
d4d542e0ca
am:
02d370c464
Change-Id: If6efd949c11a39c4df2ed753c6b850785f8872e4
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)
chengang [Wed, 27 Dec 2017 09:17:32 +0000 (17:17 +0800)]
Account: Fix the risk of sqliteconnection leak
Fix the risk of sqliteconnection leak in accountmanagerservice
Bug:
71334517
Change-Id: I92a7381bceb5885f57cc46e686cf2581b5355df9
Signed-off-by: yuanhao <yuanhao@xiaomi.com>
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:37:28 +0000 (21:37 +0000)]
Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am:
ee48176ad6
am:
f220cdfca4
Change-Id: Ic809d19c8d5542b8f3a7d2a8b245a4db971165e3
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
Malcolm Chen [Wed, 27 Dec 2017 21:24:37 +0000 (21:24 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager." am:
10d1ee58f8
am:
c7cebc8e8e
Change-Id: I50fdbebe3decd0dad93802fdf8fa722ab7c06d07
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:24:50 +0000 (20:24 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death" am:
4b7abe301c
am:
3c57709e70
Change-Id: I322ced9619f9982182c5b739007988fda89c6f30
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:59:00 +0000 (00:59 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences." am:
e4e5291743
am:
675839f0fa
Change-Id: Ie4f70a3e95fe96d9b82488affa226d724a4e4278
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
Bill Yi [Fri, 22 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
3a8be1ae39 -s ours
am:
cb562a40d9 -s ours
Change-Id: Iba2031a23c32e6ad748339ae7e2107bea8f80eb2
Bill Yi [Fri, 22 Dec 2017 18:02:46 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
3a8be1ae39 -s ours
Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95
TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Ying Xu [Fri, 22 Dec 2017 01:17:05 +0000 (01:17 +0000)]
Merge "Expose the scan API and network select API." am:
761b7b50d1
am:
a9083c3145
Change-Id: Iee5e44b4f6a9a8921a89c05640be4d52e0251bb8
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:54:14 +0000 (00:54 +0000)]
Merge "Add feature flag and EMBMS bug fixes" am:
465f2916e0
am:
3424136a59
Change-Id: Iebc092e58752f32b6abfad612901ae094e083449
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:59:45 +0000 (23:59 +0000)]
Merge "Add new reason code for call barring" am:
a003d996b9
am:
ddf31e1810
Change-Id: Ieb37e63f6843c21a40e366b08d8cf40b2f6d69d8
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"
Andrew Solovay [Thu, 21 Dec 2017 22:55:33 +0000 (22:55 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
am:
acc55e61dd
Change-Id: I35d0f71a7da2dcae3ed3bab4aa111290ea4c4c60
Hall Liu [Thu, 21 Dec 2017 22:47:29 +0000 (22:47 +0000)]
Merge "Add feature flag for RTT in call log" am:
138d07f82d
am:
9a5e663d97
Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de
TreeHugger Robot [Thu, 21 Dec 2017 22:41:15 +0000 (22:41 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
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
Hansong Zhang [Thu, 21 Dec 2017 22:31:53 +0000 (22:31 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am:
045fdae1b3
am:
d6c2722094
Change-Id: I7ef265d36f4a42e7e9a74e63e8b343b28b63c8b3
OSDN Git Service
