OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Fix CTS Test Dual Stack Test Passing Issue" am: ae81e15c9c
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

6 years agoMerge "Fix CTS Test Dual Stack Test Passing Issue"
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

6 years agoMerge "Fix CTS Test Dual Stack Test Passing Issue"
Manoj Boopathi Raj [Thu, 4 Jan 2018 18:32:00 +0000 (18:32 +0000)]
Merge "Fix CTS Test Dual Stack Test Passing Issue"

6 years agoMerge "Add API to get eUICC's OTA status" am: 15a410a75a
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

6 years agoMerge "Add API to get eUICC's OTA status"
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

6 years agoMerge "Add API to get eUICC's OTA status"
Treehugger Robot [Thu, 4 Jan 2018 01:50:43 +0000 (01:50 +0000)]
Merge "Add API to get eUICC's OTA status"

6 years agoMerge "Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint...
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

6 years agoMerge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc...
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

6 years agoMerge changes I9de0ffe9,Idc804896 am: 153fb1c6e0
Colin Cross [Thu, 4 Jan 2018 01:10:47 +0000 (01:10 +0000)]
Merge changes I9de0ffe9,Idc804896 am: 153fb1c6e0
am: 99161bc1c7

Change-Id: Id831c5ab771fa59ac9906d473ffeb7720fbbdf54

6 years agoMerge changes I9de0ffe9,Idc804896
Colin Cross [Thu, 4 Jan 2018 01:04:20 +0000 (01:04 +0000)]
Merge changes I9de0ffe9,Idc804896
am: 153fb1c6e0

Change-Id: I7cd9329c7ea8ef720df36059a491a9d627233d1a

6 years agoMerge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc...
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

6 years agoMerge changes I9de0ffe9,Idc804896
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

6 years agoAdd API to get eUICC's OTA status
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

6 years agoMerge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356
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

6 years agoMerge "Avoid NPE when missing underlyingCaps." am: 6522970c1e
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

6 years agoMerge "Move Ims related settings from global setting to subscription db."
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

6 years agoMerge "Avoid NPE when missing underlyingCaps."
Jeff Sharkey [Wed, 3 Jan 2018 19:47:22 +0000 (19:47 +0000)]
Merge "Avoid NPE when missing underlyingCaps."
am: 6522970c1e

Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519

6 years agoMerge "Move Ims related settings from global setting to subscription db."
Treehugger Robot [Wed, 3 Jan 2018 19:42:24 +0000 (19:42 +0000)]
Merge "Move Ims related settings from global setting to subscription db."

6 years agoMerge "Avoid NPE when missing underlyingCaps."
Jeff Sharkey [Wed, 3 Jan 2018 19:33:00 +0000 (19:33 +0000)]
Merge "Avoid NPE when missing underlyingCaps."

6 years agoMerge "Modify getting of primary storage size" am: 1c876b73b3
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

6 years agoMerge "Modify getting of primary storage size"
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

6 years agoMerge "Modify getting of primary storage size"
Treehugger Robot [Wed, 3 Jan 2018 01:10:49 +0000 (01:10 +0000)]
Merge "Modify getting of primary storage size"

6 years agoMerge "Add new RIL requests" am: 3095fcca4d
yinxu [Tue, 2 Jan 2018 22:35:44 +0000 (22:35 +0000)]
Merge "Add new RIL requests" am: 3095fcca4d
am: 2f928350db

Change-Id: I9ee55800299fb1233b3f0f42b63b8b3d8590792a

6 years agoMerge "Add new RIL requests"
yinxu [Tue, 2 Jan 2018 22:26:36 +0000 (22:26 +0000)]
Merge "Add new RIL requests"
am: 3095fcca4d

Change-Id: I73a3bd3de2d25d19e1afd3a143c7cfa3955d0410

6 years agoMerge "Add new RIL requests"
Treehugger Robot [Tue, 2 Jan 2018 22:17:21 +0000 (22:17 +0000)]
Merge "Add new RIL requests"

6 years agoFix CTS Test Dual Stack Test Passing Issue
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

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement" am: c03c63c8bb
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

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement"
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

6 years agoMerge "Relax Instant Apps Settings whitelist enforcement"
Treehugger Robot [Tue, 2 Jan 2018 20:53:25 +0000 (20:53 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement"

6 years agoAvoid NPE when missing underlyingCaps.
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

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9
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

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB"
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

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB"
Treehugger Robot [Thu, 28 Dec 2017 22:07:25 +0000 (22:07 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7
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

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp"
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

6 years agoMerge "Added AIDL for cell identity" am: 470ba9d471
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

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp"
Treehugger Robot [Thu, 28 Dec 2017 18:32:51 +0000 (18:32 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp"

6 years agoMerge "Added AIDL for cell identity"
Jack Yu [Thu, 28 Dec 2017 18:29:10 +0000 (18:29 +0000)]
Merge "Added AIDL for cell identity"
am: 470ba9d471

Change-Id: Id3cc4071c60828a6f86499d135d6dbb842dcaeb1

6 years agoMerge "Added AIDL for cell identity"
Treehugger Robot [Thu, 28 Dec 2017 18:17:34 +0000 (18:17 +0000)]
Merge "Added AIDL for cell identity"

6 years agoMerge "Fix temporary file name strlcpy size." am: d4d542e0ca
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

6 years agoMerge "Fix temporary file name strlcpy size."
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

6 years agoMerge "Fix temporary file name strlcpy size."
Ivan Lozano [Thu, 28 Dec 2017 17:48:50 +0000 (17:48 +0000)]
Merge "Fix temporary file name strlcpy size."

6 years agoDisable sanitizer entirely in ResourceTypes.cpp
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)

6 years agoAdded AIDL for cell identity
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)

6 years agoMove Ims related settings from global setting to subscription db.
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

6 years agoAdd ICCID_PREFIX column in CarridId DB
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)

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"...
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

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
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

6 years agoMerge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8
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

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
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"

6 years agoMerge "Remove getIntWithSubId in TelephonyManager."
Malcolm Chen [Wed, 27 Dec 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."
am: 10d1ee58f8

Change-Id: I6ddf4fa541650ed9c983bd21d7e3eacf80214285

6 years agoMerge "Remove getIntWithSubId in TelephonyManager."
Treehugger Robot [Wed, 27 Dec 2017 21:06:32 +0000 (21:06 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c
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

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death"
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

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death"
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"

6 years agoBinder: 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

6 years agoModify getting of primary storage size
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>
6 years agoRelax Instant Apps Settings whitelist enforcement
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

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences." am: e4e5291743
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

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences."
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

6 years agoRemove getIntWithSubId in TelephonyManager.
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

6 years agoMerge "Add MetricsEvent ENUMS for "Mobile network" preferences."
Treehugger Robot [Sat, 23 Dec 2017 00:41:49 +0000 (00:41 +0000)]
Merge "Add MetricsEvent ENUMS for "Mobile network" preferences."

6 years agoAdd 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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39 -s ours
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Expose the scan API and network select API." am: 761b7b50d1
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

6 years agoMerge "Expose the scan API and network select API."
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

6 years agoMerge "Expose the scan API and network select API."
Ying Xu [Fri, 22 Dec 2017 01:01:09 +0000 (01:01 +0000)]
Merge "Expose the scan API and network select API."

6 years agoMerge "Add feature flag and EMBMS bug fixes" am: 465f2916e0
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

6 years agoMerge "Add feature flag and EMBMS bug fixes"
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

6 years agoMerge "Add feature flag and EMBMS bug fixes"
Hall Liu [Fri, 22 Dec 2017 00:37:31 +0000 (00:37 +0000)]
Merge "Add feature flag and EMBMS bug fixes"

6 years agoMerge "Add new reason code for call barring" am: a003d996b9
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

6 years agoMerge "Add new reason code for call barring"
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

6 years agoMerge "Add new reason code for call barring"
Brad Ebinger [Thu, 21 Dec 2017 23:45:01 +0000 (23:45 +0000)]
Merge "Add new reason code for call barring"

6 years agoMerge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
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

6 years agoMerge "Add feature flag for RTT in call log" am: 138d07f82d
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

6 years agoMerge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
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

6 years agoMerge "Add feature flag for RTT in call log"
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

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)" am: 045fdae1b3
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

6 years agoMerge "Add feature flag for RTT in call log"
Hall Liu [Thu, 21 Dec 2017 22:31:45 +0000 (22:31 +0000)]
Merge "Add feature flag for RTT in call log"

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
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

6 years agoMerge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"
Treehugger Robot [Thu, 21 Dec 2017 21:56:10 +0000 (21:56 +0000)]
Merge "BluetoothHidDevice: rename onIntrData to onInterruptData (1/5)"

6 years agoMerge "Add asn1 to platform." am: bdd0da8fa7
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:29:24 +0000 (21:29 +0000)]
Merge "Add asn1 to platform." am: bdd0da8fa7
am: ea1d85d484

Change-Id: Ib2968038bcacdc81e2249dc5e3a40f25ceb191b7

6 years agoMerge "Add asn1 to platform."
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:19:28 +0000 (21:19 +0000)]
Merge "Add asn1 to platform."
am: bdd0da8fa7

Change-Id: Ic34f9bd45e7fb46bae2afe5be0cc453d87b276bd

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 21 Dec 2017 21:17:15 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c0745b94c2  -s ours

Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Dec 2017 21:08:50 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Add asn1 to platform."
Holly Jiuyu Sun [Thu, 21 Dec 2017 21:01:40 +0000 (21:01 +0000)]
Merge "Add asn1 to platform."

6 years agoRequire that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions
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

6 years agoMerge "Add logging and disconnect reason for null connections." am: 7661e81f85
Tyler Gunn [Thu, 21 Dec 2017 20:06:18 +0000 (20:06 +0000)]
Merge "Add logging and disconnect reason for null connections." am: 7661e81f85
am: c840efcf7e

Change-Id: I5038667db6b15d74aada29e245b8ff81ca2f3bd8

6 years agoMerge "Add logging and disconnect reason for null connections."
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

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:59:54 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f  -s ours am: 0a1948e515  -s ours am: 7cb6513f6d  -s ours am: f0687d1201  -s ours
am: 9c166446fd  -s ours

Change-Id: Ide4d30d971d02840f7f70733e15e5083ecbca5ea

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:58:39 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09  -s ours am: ea2e302eff  -s ours am: b6dab6b3ee  -s ours am: 1f9ae3b912  -s ours
am: 66acdceb9b  -s ours

Change-Id: I64312d2118512439ba4c4c7746d2c3550a525295

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:56:02 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours am: d21211470c  -s ours am: f1c75d66ec  -s ours am: b7a560fb10  -s ours
am: 5af20c1c28  -s ours

Change-Id: I8d98d9728d058add17b64172221733bedb07b4f3

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:54:14 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am: d5a7faea83  -s ours am: bd14c44fd8  -s ours am: f6c335b353  -s ours
am: f24783846d  -s ours

Change-Id: I47bd5497b0ac5ef061975b4ef7aed22cb016d2db

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:52:47 +0000 (19:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours am: 51fc07ad61  -s ours am: c344f9b1c7  -s ours am: 39d480e67c  -s ours
am: 59f4b0c11f  -s ours

Change-Id: I6c0cbf7c26fc7f2b010126e5aa7ceb444aa71ab3

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:51:02 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea  -s ours am: 5943ef281a  -s ours am: 2c97ca3b62  -s ours am: 934729c535  -s ours
am: 37e0c23902  -s ours

Change-Id: I2e96d32fcbb128a84828172f17b45db12ee790fd

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c  -s ours am: a683975c54  -s ours am: 0bfcd7eef7  -s ours am: f123f221db  -s ours
am: 95b4c706b8  -s ours

Change-Id: Ia66e2c284c14aa911c92f49150ce9b8ee6c345e8

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:47:45 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955  -s ours am: 7244723549  -s ours am: 05e41d0531  -s ours am: 7baaa51e62  -s ours
am: a963a02442  -s ours

Change-Id: Ife6d85d42f5f0beffdaf5da0c031e79d74d3c8d9

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:46:22 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931  -s ours am: 2d00ab621a  -s ours am: e135a35edf  -s ours am: 301dfae698  -s ours
am: 5f38be9fdb  -s ours

Change-Id: I835ba14d3bed4c5ebf901d60a2603c6692135b4e