Bill Yi
ebccff42db
[automerger skipped] Merge "Import translations. DO NOT MERGE"
...
am: 20add0a4c6
2018-10-25 03:52:59 -07:00
Treehugger Robot
20add0a4c6
Merge "Import translations. DO NOT MERGE"
2018-10-25 10:36:36 +00:00
Junyu Lai
6023fd96b1
Merge "Add more debug log when onBlockedStatusChanged was called."
...
am: 48f337457b
2018-10-25 02:35:52 -07:00
Junyu Lai
48f337457b
Merge "Add more debug log when onBlockedStatusChanged was called."
2018-10-25 08:57:56 +00:00
junyulai
e6b3651c75
Add more debug log when onBlockedStatusChanged was called.
...
Bug: 118355916
Test: 1. runtest frameworks-net
2. enable/disable battery saver
Change-Id: I6d5f9b49be0defd531fc7ea824668bec7863c4b7
2018-10-25 15:20:01 +08:00
Bill Yi
a9ab592e8f
Import translations. DO NOT MERGE
...
Change-Id: Ie2e07cbd6d038a83b2f05b315b647a35872f6daf
Auto-generated-cl: translation import
2018-10-24 23:18:42 -07:00
Chong Zhang
a2ec9e32c6
Merge "Add keys to retrieve color aspects from metadata"
...
am: 6636b0227d
2018-10-24 19:40:14 -07:00
Chong Zhang
89c615866a
Merge "Color aspects keys information stored database"
...
am: e4c918ba8e
2018-10-24 19:36:00 -07:00
Xiangyu/Malcolm Chen
6e4f0f3ee6
Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM."
...
am: 6f7d3848c5
2018-10-24 19:30:13 -07:00
Chong Zhang
6636b0227d
Merge "Add keys to retrieve color aspects from metadata"
2018-10-25 02:04:48 +00:00
Chong Zhang
e4c918ba8e
Merge "Color aspects keys information stored database"
2018-10-25 02:04:48 +00:00
Xiangyu/Malcolm Chen
6f7d3848c5
Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM."
2018-10-25 01:37:34 +00:00
Luke Huang
6ba18c6b03
Merge "Firewall-related commands porting"
...
am: 1acfa7de1b
2018-10-24 17:31:19 -07:00
Luke Huang
1acfa7de1b
Merge "Firewall-related commands porting"
2018-10-25 00:20:12 +00:00
Bill Yi
904d4df89a
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 8b634e9191
2018-10-24 17:17:46 -07:00
Malcolm Chen
56f9f857ea
Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM.
...
Bug: 80268699
Test: unittest
Change-Id: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
Merged-In: Ifda606784f97c1bfa03fb424fd488bb0b5e6ebec
2018-10-24 15:18:52 -07:00
Bill Yi
8b634e9191
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: I695db52f5e22509401258e8b083e7650d401d993
2018-10-24 14:48:44 -07:00
Brad Ebinger
2c8ace0794
Merge "Remove obsolete @VisibleForTesting Annotation"
...
am: 1e8249a1d6
2018-10-24 14:38:03 -07:00
Brad Ebinger
207b9dcfbf
Merge "ImsSsData needs a public constructor for vendors to use"
...
am: a1474266bf
2018-10-24 14:12:43 -07:00
Youming Ye
555090d597
Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""
...
am: 94fe6430ea
2018-10-24 14:08:36 -07:00
Tony Zhu
3cde670dd3
Merge "[Call Screening]Support for carrier call screening app"
...
am: ee31b2214d
2018-10-24 14:00:00 -07:00
Brad Ebinger
1e8249a1d6
Merge "Remove obsolete @VisibleForTesting Annotation"
2018-10-24 20:15:35 +00:00
Brad Ebinger
a1474266bf
Merge "ImsSsData needs a public constructor for vendors to use"
2018-10-24 17:08:39 +00:00
Youming Ye
94fe6430ea
Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""
2018-10-24 16:26:21 +00:00
Bill Yi
531348c917
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I13571b072111900d0979f026670e648cdef9899b
2018-10-24 09:08:38 -07:00
Tony Zhu
ee31b2214d
Merge "[Call Screening]Support for carrier call screening app"
2018-10-24 15:51:48 +00:00
Chalard Jean
e826aa52e4
Merge "To support skip464xlat per Network"
...
am: a01c77a499
2018-10-24 01:16:22 -07:00
Chalard Jean
a01c77a499
Merge "To support skip464xlat per Network"
2018-10-24 07:15:20 +00:00
Luke Huang
a241db9df7
Firewall-related commands porting
...
Test: runtest frameworks-net passes
Test: manual testing of firewall works
Change-Id: Ic19c3872988a2b5dd315feb57e0757797d00a6ac
2018-10-24 13:12:41 +09:00
Luke Huang
3c78330edb
Merge "Refine network-related commands porting"
...
am: 82696f8e4c
2018-10-23 20:47:27 -07:00
Chiachang Wang
bed0271888
Merge "Move captive portal detection to another thread"
...
am: 9514b362cd
2018-10-23 20:43:36 -07:00
Treehugger Robot
82696f8e4c
Merge "Refine network-related commands porting"
2018-10-24 03:15:41 +00:00
Chiachang Wang
9514b362cd
Merge "Move captive portal detection to another thread"
2018-10-24 03:02:58 +00:00
Hall Liu
657e2a925d
Merge "Add test API to override carrier config"
...
am: a82f952fe7
2018-10-23 18:09:21 -07:00
Nathan Harold
8dc36336d5
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma"
...
am: ac87c0a884
2018-10-23 18:04:58 -07:00
Hall Liu
a82f952fe7
Merge "Add test API to override carrier config"
2018-10-24 00:00:22 +00:00
Toshikazu Saito
26b3de310f
Add keys to retrieve color aspects from metadata
...
Add keys to retrieve color standard, color transfer and color range from
MediaMetadataRetriever.
Bug: 114329709
Test: put hdr/non-hdr contents and check media db
Change-Id: Ifa90f12a572b330f87acd6ef06e1e83ddceb8483
2018-10-23 23:37:31 +00:00
Nathan Harold
ac87c0a884
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma"
2018-10-23 23:34:26 +00:00
Brad Ebinger
8853179fa7
Remove obsolete @VisibleForTesting Annotation
...
Bug: 118296374
Test: atest FrameworksTelephonyTests
Change-Id: I5156db7d199f89307ca7c602bfc855dbc6ae236e
2018-10-23 15:46:59 -07:00
Jan Kowal
e01a3fd480
Merge "Fix for android.hardware.radio.Utils.createIntSet"
...
am: b25190cf62
2018-10-23 15:35:50 -07:00
Nathan Harold
0cce6d2bf4
Merge "Remove Hidden TimestampType From CellInfo"
...
am: c65e610c06
2018-10-23 15:20:02 -07:00
Treehugger Robot
b25190cf62
Merge "Fix for android.hardware.radio.Utils.createIntSet"
2018-10-23 22:18:55 +00:00
Nathan Harold
13c9e7e2f3
Merge "Move some members to the "Q blacklist"."
...
am: f5cf9f24ed
2018-10-23 15:14:41 -07:00
nobuhiko saitou
839cc00889
Color aspects keys information stored database
...
Add keys for color aspects to VideoColumns in MediaStore.
And standard, transfer and range is stored to database.
Bug: 114329709
Test: put hdr/non-hdr contents and check media db
Change-Id: Id4bf27a35720f5cf5a60f08eb3f30314e1a1a167
2018-10-23 22:03:30 +00:00
Nathan Harold
c65e610c06
Merge "Remove Hidden TimestampType From CellInfo"
2018-10-23 22:02:15 +00:00
Brad Ebinger
4123f9587d
ImsSsData needs a public constructor for vendors to use
...
Expose Builder for IMS Supp Service APIs as well as clean
up some of the ambiguous int[] usage.
Bug: 117555643
Test: Manual
Change-Id: I5cad08e0a032f4e38a62ac033c01111319cf9fd5
2018-10-23 14:57:59 -07:00
Nathan Harold
f5cf9f24ed
Merge "Move some members to the "Q blacklist"."
2018-10-23 21:53:51 +00:00
Tyler Gunn
7085118cfc
Merge "Re-add removed APIs per API council feedback."
...
am: a94a71af13
2018-10-23 14:27:17 -07:00
Tyler Gunn
a94a71af13
Merge "Re-add removed APIs per API council feedback."
2018-10-23 20:49:43 +00:00
Jan Kowal
d09a4081d6
Fix for android.hardware.radio.Utils.createIntSet
...
Previous solution was assymetric: writeInt vs readTypedObject.
Also, specify the initial capacity to avoid unnecessary reallocations.
Bug: 117113131
Test: atest BroadcastRadioTests
Change-Id: Ib33b97d482422b1acac8e9420a0c974bcd59355b
2018-10-23 13:33:51 -07:00
