OSDN Git Service
Jack Yu [Mon, 28 Oct 2019 22:52:00 +0000 (15:52 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1 am:
614b2ca5ef
am:
3036bcf628
Change-Id: I6ebde4a89a44879865e198e5be14e9f6a49f67b5
Jack Yu [Mon, 28 Oct 2019 22:38:44 +0000 (15:38 -0700)]
Merge "Add new carrier configuration for GET INPUT command" am:
48ad8828d1
am:
614b2ca5ef
Change-Id: I153131c15ed3890e259aa156b185c2a36fd12f26
Jack Yu [Mon, 28 Oct 2019 22:26:01 +0000 (15:26 -0700)]
Merge "Add new carrier configuration for GET INPUT command"
am:
48ad8828d1
Change-Id: Ib9dc938b2dcaa069fdca20f72c9eacb7d60356c7
Jack Yu [Mon, 28 Oct 2019 22:06:43 +0000 (22:06 +0000)]
Merge "Add new carrier configuration for GET INPUT command"
Selim Cinek [Mon, 28 Oct 2019 20:51:55 +0000 (13:51 -0700)]
Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
am:
39195ba211
Change-Id: Ib8f292c600dae30fc160ab3ab00b188773e911e5
Selim Cinek [Mon, 28 Oct 2019 20:51:49 +0000 (13:51 -0700)]
DO NOT MERGE Revert all scrim related changes in qpr
am:
f97d7f73cf
Change-Id: I283806af08af94d90408761e318285c9c725bf55
Selim Cinek [Mon, 28 Oct 2019 20:31:41 +0000 (20:31 +0000)]
Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev
Peter Wang [Mon, 28 Oct 2019 20:21:48 +0000 (13:21 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08 am:
a0b42289aa
am:
479a640a72
Change-Id: Ica15801fe3b348964f975405e859f8f7b86a6938
Peter Wang [Mon, 28 Oct 2019 20:08:44 +0000 (13:08 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" am:
ca01a7ee08
am:
a0b42289aa
Change-Id: I20870973a273324dc477dd66af36df0f8d11f880
Peter Wang [Mon, 28 Oct 2019 19:54:27 +0000 (12:54 -0700)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions"
am:
ca01a7ee08
Change-Id: If8018a82a3891649cb7a23e5631cf77de6547da6
Peter Wang [Mon, 28 Oct 2019 19:32:18 +0000 (19:32 +0000)]
Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions"
shubang [Mon, 28 Oct 2019 19:25:31 +0000 (12:25 -0700)]
Merge "Add owners for TV related files" am:
149ad21fcd am:
f404deba46
am:
9fa2d436c1
Change-Id: I1aceace24f73aeaca194ffccb5603994fc155c24
shubang [Mon, 28 Oct 2019 19:18:30 +0000 (12:18 -0700)]
Merge "Add owners for TV related files" am:
149ad21fcd
am:
f404deba46
Change-Id: Ie4d09f453d97cabfb406d92c4700a36a2e83089f
shubang [Mon, 28 Oct 2019 19:11:27 +0000 (12:11 -0700)]
Merge "Add owners for TV related files"
am:
149ad21fcd
Change-Id: I1216f9a8c53659e53e1649d0e7898de14c4e4c1e
Treehugger Robot [Mon, 28 Oct 2019 18:40:38 +0000 (18:40 +0000)]
Merge "Add owners for TV related files"
Jiyong Park [Mon, 28 Oct 2019 12:25:57 +0000 (05:25 -0700)]
Merge "Replace framework.jar with framework-minus-apex.jar" am:
df5cd39198 am:
8529d01c84
am:
af51e9e5fd
Change-Id: Ic23f6231a097bb52264fa66d787a64088a5379f2
Jiyong Park [Mon, 28 Oct 2019 12:19:59 +0000 (05:19 -0700)]
Merge "Replace framework.jar with framework-minus-apex.jar" am:
df5cd39198
am:
8529d01c84
Change-Id: Ie32e9bfd0f20c73dd4577255eb4a2eb0c0f2d9e5
Jiyong Park [Mon, 28 Oct 2019 12:13:57 +0000 (05:13 -0700)]
Merge "Replace framework.jar with framework-minus-apex.jar"
am:
df5cd39198
Change-Id: Ic2b5961baa0fb7d80f4cf69e4255377f3f42b6fc
Treehugger Robot [Mon, 28 Oct 2019 11:40:09 +0000 (11:40 +0000)]
Merge "Replace framework.jar with framework-minus-apex.jar"
Jiyong Park [Mon, 28 Oct 2019 06:33:08 +0000 (15:33 +0900)]
Replace framework.jar with framework-minus-apex.jar
framework.jar is now a build-time only library which has private symbols
from framework-minus-apex.jar and public symbols from APEXes. Instead of
framework.jar, framework-minus-apex.jar is installed to the device.
framework-minus-apex is installed as framework.jar because the name is
pretty widespread throughout Android. Keeping the original file name for
the backwards compatibility.
Bug:
139391334
Test: m, inspect the build system.img and check that
system/framework/framework.jar exists
Merged-In: Ia12d5984b011a54bd8ef708d0f552298a6ddec8a
(cherry picked from commit
617a16478b0f5875084e339553b7b96f3a292e03)
Change-Id: I30d5c789c1d67cac7dfe6339f244e66af5114767
Jack Yu [Sun, 27 Oct 2019 07:51:20 +0000 (00:51 -0700)]
Merge "Change Wi-Fi Calling text for SFR France" am:
fde6b837f9 am:
59e26de2dc
am:
edd7fac562
Change-Id: I5f8a1c47540c516889f5f64ff5a96861de93906a
Jack Yu [Sun, 27 Oct 2019 07:44:30 +0000 (00:44 -0700)]
Merge "Change Wi-Fi Calling text for SFR France" am:
fde6b837f9
am:
59e26de2dc
Change-Id: Ica630635e45e341374fa7cd7b9b657ebb20f6eec
Jack Yu [Sun, 27 Oct 2019 07:37:20 +0000 (00:37 -0700)]
Merge "Change Wi-Fi Calling text for SFR France"
am:
fde6b837f9
Change-Id: Idcc90f493b09f6254fac47848147613b2394b735
Jack Yu [Sun, 27 Oct 2019 07:20:47 +0000 (07:20 +0000)]
Merge "Change Wi-Fi Calling text for SFR France"
Xin Li [Sun, 27 Oct 2019 06:37:24 +0000 (23:37 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am:
b2198fa670 -s ours am:
a958184a31 -s ours
am:
058be5620e -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: Icfa7beee770f4c12e91c988f894490bb7d8fbb00
Xin Li [Sun, 27 Oct 2019 06:17:41 +0000 (23:17 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master am:
d3498e3053 -s ours am:
77bd54bc6c -s ours
am:
7e2bffda1a -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I87564c9f2362dac792b4e4b9181e1da58ce23bdc
Xin Li [Sun, 27 Oct 2019 06:14:13 +0000 (23:14 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am:
b2198fa670 -s ours
am:
a958184a31 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I92eabc9cf3b76c39eab3cbd1a79572dc34ca0a5e
Xin Li [Sun, 27 Oct 2019 05:54:18 +0000 (22:54 -0700)]
[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am:
b2198fa670 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I4584fa1059ebb28808a5e0acf4bfcfe07cf306dd
Xin Li [Sun, 27 Oct 2019 05:52:31 +0000 (22:52 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master am:
d3498e3053 -s ours
am:
77bd54bc6c -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I1f5642c629d23736b0490520f85988a97e8b4d07
Xin Li [Sun, 27 Oct 2019 05:33:13 +0000 (22:33 -0700)]
[automerger skipped] Merge Coral/Flame into AOSP master
am:
d3498e3053 -s ours
am skip reason: change_id Ibe8ff7bdba7a886bd8b91155ae56f087a836981f with SHA1
af8a6c724f is in history
Change-Id: I69195e1645a0fd74c3919ab55ff1c171fb51deaf
Xin Li [Sun, 27 Oct 2019 04:44:29 +0000 (04:44 +0000)]
Merge "Merge Coral/Flame into AOSP master"
Android Build Merger (Role) [Sun, 27 Oct 2019 03:40:28 +0000 (03:40 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours am:
0079161fcd -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sun, 27 Oct 2019 03:39:50 +0000 (20:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours
am:
0079161fcd -s ours
am skip reason: subject contains skip directive
Change-Id: Ieaca9606d48147c73b59e3a8cbf0d1a2487bdfdf
Bill Yi [Sun, 27 Oct 2019 03:39:49 +0000 (20:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
3447b7b66c -s ours
am:
b9b2241edb -s ours
am skip reason: subject contains skip directive
Change-Id: I3a3a9a303f6fb64c8868b85f8e8a8f4393ab1eff
Bill Yi [Sun, 27 Oct 2019 03:33:35 +0000 (20:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
3447b7b66c -s ours
am skip reason: subject contains skip directive
Change-Id: I27f768b2628d15630a15159e642fd89d51be8b83
Bill Yi [Sun, 27 Oct 2019 03:33:35 +0000 (20:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
3447b7b66c -s ours
am skip reason: subject contains skip directive
Change-Id: I6ebc14c249ca0cc77783c63c0acf9a1738349010
Bill Yi [Sun, 27 Oct 2019 03:33:35 +0000 (20:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
9ee6503731 -s ours
am skip reason: subject contains skip directive
Change-Id: I2aa30b88211dc6211db8494cbb249930b2c48790
Bill Yi [Sun, 27 Oct 2019 00:48:31 +0000 (17:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4f4a4c0efd8c96693ec5700c13a95e4dc0fa4240
Auto-generated-cl: translation import
Bill Yi [Sun, 27 Oct 2019 00:38:28 +0000 (17:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2407d77349f697484f62cf943f5960381ffc76ae
Auto-generated-cl: translation import
Ian Kasprzak [Sat, 26 Oct 2019 20:45:11 +0000 (13:45 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping." am:
1490293aa2 -s ours am:
14b9349ac8 -s ours
am:
a3138f4183 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
b01ef14470 is in history
Change-Id: Icbc53948986eb30f6110af4ee3316f04b233db44
Ian Kasprzak [Sat, 26 Oct 2019 20:39:12 +0000 (13:39 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping." am:
1490293aa2 -s ours
am:
14b9349ac8 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
b01ef14470 is in history
Change-Id: I7f8e1f3385ed3e8e0d8853c5de1bf66b1dbf1137
Ian Kasprzak [Sat, 26 Oct 2019 20:26:48 +0000 (13:26 -0700)]
[automerger skipped] Merge "Ignore FlakyTests in test-mapping."
am:
1490293aa2 -s ours
am skip reason: change_id Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10 with SHA1
3495d4f857 is in history
Change-Id: I057dbe58792ccbf0a254a65f17da4b6739a6fbd6
Ian Kasprzak [Sat, 26 Oct 2019 20:07:34 +0000 (20:07 +0000)]
Merge "Ignore FlakyTests in test-mapping."
Yoshiaki Naka [Thu, 21 Feb 2019 09:40:03 +0000 (18:40 +0900)]
Add new carrier configuration for GET INPUT command
The characters 0 to 9, *, # and + are accepted in the digit only mode of
GET INPUT/INKEY commands according to the 3GPP/ETSI standard, but only
numeric charactrers 0 to 9 are used in some actual use-cases. It must be
confusing to display all the allowed characters including *, # and + as
the helper text on the input screen in that case, so whether to display
the allowed characters must be configurable.
Bug:
128890104
Test: Confirmed the expected behavior in manual test cases.
Change-Id: I97ed3dd538c55f48eb05dad96e4836a48a295675
Selim Cinek [Sat, 26 Oct 2019 00:37:00 +0000 (17:37 -0700)]
DO NOT MERGE Revert all scrim related changes in qpr
This reverts commit
9449cfc4a608e7d801da642958249a16c536411b.
This reverts commit
22fa97577f39524e3ffbfbbf37040eff540bcb49.
This reverts commit
bde48202e7bb1ffa04acd5c42a332c62b73f34d8.
Bug:
141649119
Bug:
143195895 is also fixed on my taimen with the above.
Bug:
143185828
Test: atest SystemUITests
Change-Id: I225b10fef2f88d3436ef3a683c09717467b071ad
Marco Nelissen [Sat, 26 Oct 2019 02:23:44 +0000 (19:23 -0700)]
Merge "Move Visualizer to libaudioeffect_jni, its only user" am:
0bf6a04b0b am:
70a9524cfb
am:
828ef837a7
Change-Id: Ifc5e0139293b4bd56af1feca54bd4cb59848a787
Marco Nelissen [Sat, 26 Oct 2019 02:16:47 +0000 (19:16 -0700)]
Merge "Move Visualizer to libaudioeffect_jni, its only user" am:
0bf6a04b0b
am:
70a9524cfb
Change-Id: If5b4690d49a2d86021f7e32ca6c016341020342d
Marco Nelissen [Sat, 26 Oct 2019 02:10:06 +0000 (19:10 -0700)]
Merge "Move Visualizer to libaudioeffect_jni, its only user"
am:
0bf6a04b0b
Change-Id: Ic5c85e1109121c247d1be0fd76b48300a953ff23
Marco Nelissen [Sat, 26 Oct 2019 01:45:57 +0000 (01:45 +0000)]
Merge "Move Visualizer to libaudioeffect_jni, its only user"
Ian Kasprzak [Fri, 25 Oct 2019 23:46:06 +0000 (16:46 -0700)]
Ignore FlakyTests in test-mapping.
(Merged-In tag to prevent merging to qt-r1-dev-plus-aosp and downstream)
Test: N/A
Bug:
142395610
Change-Id: Ib7b9aab429b59fa1fcd9638f4733147a17cbd4ef
Merged-In: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
Peter Wang [Mon, 9 Sep 2019 20:57:41 +0000 (13:57 -0700)]
Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug:
139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Marco Nelissen [Wed, 23 Oct 2019 16:21:55 +0000 (09:21 -0700)]
Move Visualizer to libaudioeffect_jni, its only user
This removes libaudioeffect_jni's dependency on libmedia and removes
libmedia's dependency on libaudioutils.
Test: build
Change-Id: I23902cd1cc16b49200f41f79736683c89b9f86f8
Merged-In: I23902cd1cc16b49200f41f79736683c89b9f86f8
Marco Nelissen [Fri, 25 Oct 2019 20:23:18 +0000 (13:23 -0700)]
Merge "Add required header_libs" am:
04d8813a01 am:
67da76a19d
am:
8526f75455
Change-Id: I0779ce7f24918ddf1c33b67ec732578ec2e3fa09
Mathieu Chartier [Fri, 25 Oct 2019 20:20:46 +0000 (13:20 -0700)]
Merge "Avoid preloading classes for boot image profiling" am:
cfee28589b am:
84f358f9bf
am:
ac60bbb740
Change-Id: I48fa3fbc8b9f2859a084bf36d06117a1ea8970cf
Marco Nelissen [Fri, 25 Oct 2019 20:14:43 +0000 (13:14 -0700)]
Merge "Add required header_libs" am:
04d8813a01
am:
67da76a19d
Change-Id: I06c3dd58e79ba28faffdced8859aa2ebdd7393cd
Mathieu Chartier [Fri, 25 Oct 2019 20:08:35 +0000 (13:08 -0700)]
Merge "Avoid preloading classes for boot image profiling" am:
cfee28589b
am:
84f358f9bf
Change-Id: Iea9cf99e07272a4e5a6ae132825591d3508a5c04
Marco Nelissen [Fri, 25 Oct 2019 20:08:34 +0000 (13:08 -0700)]
Merge "Add required header_libs"
am:
04d8813a01
Change-Id: I05768355086391684b951fa1a195b23367d1fb10
Mathieu Chartier [Fri, 25 Oct 2019 19:58:29 +0000 (12:58 -0700)]
Merge "Avoid preloading classes for boot image profiling"
am:
cfee28589b
Change-Id: I9c7be76f96546d50a6e049aeab60ca71ee215500
Marco Nelissen [Fri, 25 Oct 2019 19:47:54 +0000 (19:47 +0000)]
Merge "Add required header_libs"
Mathieu Chartier [Fri, 25 Oct 2019 19:35:00 +0000 (19:35 +0000)]
Merge "Avoid preloading classes for boot image profiling"
Android Build Merger (Role) [Fri, 25 Oct 2019 18:41:55 +0000 (18:41 +0000)]
Merge changes from topic "am-
5c11475d0afe4ea1825e10d547757408" into qt-qpr1-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am:
3b050525e4 am:
c6ef7c0e79 am:
aa4c711fa1
[DO NOT MERGE] Split access-media-storage from read-external-storage am:
f3ff750f29 am:
6f0fe03b7d am:
bd771897d7
Philip P. Moltmann [Fri, 25 Oct 2019 18:40:44 +0000 (11:40 -0700)]
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am:
3b050525e4 am:
c6ef7c0e79
am:
aa4c711fa1
Change-Id: Idbf51e0059f6158e5c279564c22cfef9d1c20bd3
Philip P. Moltmann [Fri, 25 Oct 2019 18:40:38 +0000 (11:40 -0700)]
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am:
3b050525e4 am:
c6ef7c0e79
am:
06a28b0655
Change-Id: I4185514577c9b6eaff10bb3b6ab922985014725b
Philip P. Moltmann [Fri, 25 Oct 2019 18:40:38 +0000 (11:40 -0700)]
[DO NOT MERGE] Split access-media-storage from read-external-storage am:
f3ff750f29 am:
6f0fe03b7d
am:
bd771897d7
Change-Id: If8055728846ba9d219615ef49f877684209dd4c7
Philip P. Moltmann [Fri, 25 Oct 2019 18:40:31 +0000 (11:40 -0700)]
[DO NOT MERGE] Split access-media-storage from read-external-storage am:
f3ff750f29 am:
6f0fe03b7d
am:
14358ee4d9
Change-Id: Ifd902ff14687eac3ad8a1ca4c156d2ec7347c9b3
Philip P. Moltmann [Fri, 25 Oct 2019 18:33:56 +0000 (11:33 -0700)]
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am:
3b050525e4
am:
c6ef7c0e79
Change-Id: I4c61e048169c42d27cdb72d2050b81c65defc415
Philip P. Moltmann [Fri, 25 Oct 2019 18:33:51 +0000 (11:33 -0700)]
[DO NOT MERGE] Split access-media-storage from read-external-storage am:
f3ff750f29
am:
6f0fe03b7d
Change-Id: I5e92a710d55d91f66be9e1f7dda7fa92b59534fd
Philip P. Moltmann [Fri, 25 Oct 2019 18:33:46 +0000 (11:33 -0700)]
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev am:
3b050525e4
am:
c6ef7c0e79
Change-Id: I52a6017d8a55bd95b0ee4b9482161204c2743beb
Philip P. Moltmann [Fri, 25 Oct 2019 18:33:41 +0000 (11:33 -0700)]
[DO NOT MERGE] Split access-media-storage from read-external-storage am:
f3ff750f29
am:
6f0fe03b7d
Change-Id: I15e195939f892f9bd34506ccdabeb6324173b446
Philip P. Moltmann [Fri, 25 Oct 2019 18:22:34 +0000 (11:22 -0700)]
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev
am:
3b050525e4
Change-Id: Ie40f68f660e579cf9c2b1cbd446a4e3996bfa34d
Philip P. Moltmann [Fri, 25 Oct 2019 18:22:30 +0000 (11:22 -0700)]
[DO NOT MERGE] Split access-media-storage from read-external-storage
am:
f3ff750f29
Change-Id: I0f37950a78df7d503a830ec5eff77acad7382fb8
Chen Xu [Fri, 25 Oct 2019 18:21:44 +0000 (11:21 -0700)]
Merge "move CellBroadcastMessage from telephony-common to app" am:
17518fa149 am:
e2d15a24c1
am:
3b5788f3fe
Change-Id: I1029effeff09fb27540badf91d5a4baa03a8695d
Chen Xu [Fri, 25 Oct 2019 18:10:42 +0000 (11:10 -0700)]
Merge "make CallerInfo as SystemAPI" am:
7e902363a6 am:
3f1055a2ba
am:
610244cd4f
Change-Id: I6a3335b42a072522956e747835737e2af455bf38
Chen Xu [Fri, 25 Oct 2019 18:08:50 +0000 (11:08 -0700)]
Merge "move CellBroadcastMessage from telephony-common to app" am:
17518fa149
am:
e2d15a24c1
Change-Id: I5cafd42d4b9b5251f51da34488b94c0ca40be76b
TreeHugger Robot [Fri, 25 Oct 2019 18:08:22 +0000 (18:08 +0000)]
Merge "[DO NOT MERGE] Split access-media-storage from read-external-storage" into qt-dev
Chen Xu [Fri, 25 Oct 2019 17:51:09 +0000 (10:51 -0700)]
Merge "make CallerInfo as SystemAPI" am:
7e902363a6
am:
3f1055a2ba
Change-Id: Id0cc4db02834da24e4a64f3ebe5b52a8138bb15b
Chen Xu [Fri, 25 Oct 2019 17:44:09 +0000 (10:44 -0700)]
Merge "move CellBroadcastMessage from telephony-common to app"
am:
17518fa149
Change-Id: I6cfcb2bfcb6d4c326f4a54469b982bc7f9a2932d
Chen Xu [Fri, 25 Oct 2019 17:37:43 +0000 (10:37 -0700)]
Merge "make CallerInfo as SystemAPI"
am:
7e902363a6
Change-Id: I7615196e88b03a733daa895e9ffb7ee3d7a47034
Tom Cherry [Fri, 25 Oct 2019 17:30:23 +0000 (10:30 -0700)]
Merge "Remove legacy logger_entry_v* structs" am:
4be2934e61 am:
2ff78bb657
am:
7bd9dcd63e
Change-Id: Ib3efe7429d0247a51b3a5fbf256762c08c6881af
Chen Xu [Fri, 25 Oct 2019 17:28:22 +0000 (17:28 +0000)]
Merge "move CellBroadcastMessage from telephony-common to app"
Xin Li [Fri, 25 Oct 2019 17:27:58 +0000 (10:27 -0700)]
Merge Coral/Flame into AOSP master
Bug:
141248619
Change-Id: Ic0486c8c79d94c9a30efa37676b2f6a94fb7b5fa
Merged-In: Ibe8ff7bdba7a886bd8b91155ae56f087a836981f
Chen Xu [Fri, 25 Oct 2019 17:27:45 +0000 (17:27 +0000)]
Merge "make CallerInfo as SystemAPI"
Tom Cherry [Fri, 25 Oct 2019 17:17:22 +0000 (10:17 -0700)]
Merge "Remove legacy logger_entry_v* structs" am:
4be2934e61
am:
2ff78bb657
Change-Id: Ia117b313d4b91a268ebe8d62834d82ce56b90394
Tom Cherry [Fri, 25 Oct 2019 17:05:00 +0000 (10:05 -0700)]
Merge "Remove legacy logger_entry_v* structs"
am:
4be2934e61
Change-Id: I910d9429de9ae6dd571af726fc3dbd04c2b94490
Tom Cherry [Fri, 25 Oct 2019 16:53:20 +0000 (16:53 +0000)]
Merge "Remove legacy logger_entry_v* structs"
Howard Chen [Fri, 25 Oct 2019 07:57:46 +0000 (00:57 -0700)]
Merge "Use new GsiInstallParams struct" am:
7898d33e3a am:
6b1e8cc0ab
am:
630b0caad1
Change-Id: I97e9c7767a5b3ff60e6533cb9a76ed128b6d606a
Howard Chen [Fri, 25 Oct 2019 07:50:48 +0000 (00:50 -0700)]
Merge "Use new GsiInstallParams struct" am:
7898d33e3a
am:
6b1e8cc0ab
Change-Id: Ia84493f02d7db753af1222f9743b84f1be1d9f92
Howard Chen [Fri, 25 Oct 2019 07:37:53 +0000 (00:37 -0700)]
Merge "Use new GsiInstallParams struct"
am:
7898d33e3a
Change-Id: I3f05bf9db6e5db4c675791295cc6bffe4098db32
Howard Chen [Fri, 25 Oct 2019 07:18:57 +0000 (07:18 +0000)]
Merge "Use new GsiInstallParams struct"
Mark Chien [Fri, 25 Oct 2019 07:11:56 +0000 (00:11 -0700)]
Merge "[Tether03] Migrate IpServer into module" am:
634c6a512f am:
c8c297544c
am:
5724764344
Change-Id: I3e70612aa3071889c5b2c74217b9c33c587e35bb
Mark Chien [Fri, 25 Oct 2019 07:05:31 +0000 (00:05 -0700)]
Merge "[Tether03] Migrate IpServer into module" am:
634c6a512f
am:
c8c297544c
Change-Id: I2f63d9f288cba8186e6114860265b5347abf3bdc
Mark Chien [Fri, 25 Oct 2019 06:59:25 +0000 (23:59 -0700)]
Merge "[Tether03] Migrate IpServer into module"
am:
634c6a512f
Change-Id: I28ef3693ade9dc0fd53437b0157d47237e6a3f93
Mark Chien [Fri, 25 Oct 2019 06:41:49 +0000 (06:41 +0000)]
Merge "[Tether03] Migrate IpServer into module"
Bill Yi [Fri, 25 Oct 2019 02:20:29 +0000 (19:20 -0700)]
[automerger skipped] Merge "Revert "Import translations. DO NOT MERGE"" into qt-qpr1-dev
am:
75166c8426 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib2be9e25bb8973b57a619a5a0d3038cb6598bd31
TreeHugger Robot [Fri, 25 Oct 2019 01:46:48 +0000 (01:46 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into qt-qpr1-dev
Bill Yi [Fri, 25 Oct 2019 00:51:46 +0000 (00:51 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
d7554f399f402e49fef0e088f6685bdaf79cb0b1.
Reason for revert: May have caused phone_max regression
BUG:
143316720
Change-Id: I592acd7f9f47ee2be06508236927a77b11185ace
Hai Zhang [Thu, 24 Oct 2019 22:23:34 +0000 (15:23 -0700)]
Merge "Add OWNERS for SettingsProvider." am:
18bece7b32 am:
af8a6c724f
am:
aefd9fd950
Change-Id: Ia0101eb77c4990052e37ad2479fff9fc2525065d
Yincheng Zhao [Thu, 24 Oct 2019 22:13:14 +0000 (15:13 -0700)]
Merge "Adding API in TelephonyManger for updating Fplmns." am:
32eb91717f am:
02f0815ddc
am:
262d0da592
Change-Id: I4f9e0e8d3b67a7915ab71a9c5bcedee8a64ff3c4
Mitch Phillips [Thu, 24 Oct 2019 22:09:38 +0000 (15:09 -0700)]
Merge "Make libstatslog static-linkage compatible." am:
871d5592ff am:
33f59669ff
am:
1c8ca2b2cc
Change-Id: Ie698eb0bc2cc05c2daf54983542ee059005e5c1f
Hai Zhang [Thu, 24 Oct 2019 22:09:32 +0000 (15:09 -0700)]
Merge "Add OWNERS for SettingsProvider." am:
18bece7b32
am:
af8a6c724f
Change-Id: I23a6d7379e6fc2f70b9b8f20850f4c211a6df5b9
OSDN Git Service
