OSDN Git Service
Michele [Tue, 29 Oct 2019 20:35:53 +0000 (13:35 -0700)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs." am:
8c6e9e653d am:
d9cb5b9427
am:
03b6954f5b
Change-Id: Iff7b36a5b35766788c1f8cf7e015646804c19fc3
Michele [Tue, 29 Oct 2019 20:28:53 +0000 (13:28 -0700)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs." am:
8c6e9e653d
am:
d9cb5b9427
Change-Id: Iad08bbff172267a64d5d2b18050f2d23f4f1a60e
Michele [Tue, 29 Oct 2019 20:22:50 +0000 (13:22 -0700)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs."
am:
8c6e9e653d
Change-Id: I53e5b94caa0c9e7388cb23f6b3f21c134d79d43c
Treehugger Robot [Tue, 29 Oct 2019 20:06:27 +0000 (20:06 +0000)]
Merge "Expose APIs required by CarrierDefaultApp as system APIs."
Nathan Harold [Tue, 29 Oct 2019 18:46:51 +0000 (11:46 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev
am:
766c011ff0 -s ours
am skip reason: change_id I1307d1d7aacef0bbd33bfc73700ee774e12e64c1 with SHA1
fff052067c is in history
Change-Id: I13827dfef005720035ae9ea58c82bfc55e905100
Nathan Harold [Tue, 29 Oct 2019 18:20:19 +0000 (18:20 +0000)]
Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev
Steven Moreland [Tue, 29 Oct 2019 16:36:18 +0000 (09:36 -0700)]
Merge "ServiceManagerProxy: implement new method" am:
2a6f6ed94b am:
9ab8a0713f
am:
1574e4fd4e
Change-Id: I3018e9922154e7a33dd3aa4814d5f80e4118a77a
Nicolas Geoffray [Tue, 29 Oct 2019 16:30:18 +0000 (09:30 -0700)]
Merge "Whitelist file descriptors created through memfd_create." am:
d10a84cdfe am:
cb8118a096
am:
a1bb3b7d6a
Change-Id: Iabba8469fd6262ccf3dec7237ec9b57fe7cc4fda
Steven Moreland [Tue, 29 Oct 2019 16:26:57 +0000 (09:26 -0700)]
Merge "ServiceManagerProxy: implement new method" am:
2a6f6ed94b
am:
9ab8a0713f
Change-Id: I5af655cba2bb416ed517ba722f0f5ec46610c9bc
Nicolas Geoffray [Tue, 29 Oct 2019 16:22:24 +0000 (09:22 -0700)]
Merge "Whitelist file descriptors created through memfd_create." am:
d10a84cdfe
am:
cb8118a096
Change-Id: I03fe4529d584221d0ea64f95cdb24d2a970fcf50
Steven Moreland [Tue, 29 Oct 2019 16:14:44 +0000 (09:14 -0700)]
Merge "ServiceManagerProxy: implement new method"
am:
2a6f6ed94b
Change-Id: Id8d345fbe03cefed512b7dbb567b384dd20468da
Nicolas Geoffray [Tue, 29 Oct 2019 16:10:08 +0000 (09:10 -0700)]
Merge "Whitelist file descriptors created through memfd_create."
am:
d10a84cdfe
Change-Id: I7defdd47f50b4b225093fd283bcf0fc64b26d6fb
Steven Moreland [Tue, 29 Oct 2019 15:45:43 +0000 (15:45 +0000)]
Merge "ServiceManagerProxy: implement new method"
Nicolas Geoffray [Tue, 29 Oct 2019 15:45:03 +0000 (15:45 +0000)]
Merge "Whitelist file descriptors created through memfd_create."
Marco Nelissen [Tue, 29 Oct 2019 15:28:59 +0000 (08:28 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'" am:
00639037d7 am:
579c900beb
am:
c3d0b20217
Change-Id: Id2a8d64424c96c235d35929bf573aea36a7ffc7d
Marco Nelissen [Tue, 29 Oct 2019 15:15:17 +0000 (08:15 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'" am:
00639037d7
am:
579c900beb
Change-Id: I3640dfae077fcd84bdf332ed027c15f2cabc95a1
Marco Nelissen [Tue, 29 Oct 2019 15:02:15 +0000 (08:02 -0700)]
Merge "Declare Visualizer::setEnabled() 'final'"
am:
00639037d7
Change-Id: Ie34e205683ed831dd6dbb7a556323c04fb0b949c
Marco Nelissen [Tue, 29 Oct 2019 14:31:55 +0000 (14:31 +0000)]
Merge "Declare Visualizer::setEnabled() 'final'"
Android Build Merger (Role) [Tue, 29 Oct 2019 07:40:55 +0000 (07:40 +0000)]
Merge "WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff am:
7baf85ccaf" into qt-qpr1-dev-plus-aosp
Nate Fischer [Tue, 29 Oct 2019 07:39:55 +0000 (00:39 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff
am:
b2bc8ddcfb
Change-Id: I28eb0e3ffcef7256d3419dbde5bb9bcce2614172
Nate Fischer [Tue, 29 Oct 2019 07:39:55 +0000 (00:39 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44 am:
3ea1a6d6ff
am:
7baf85ccaf
Change-Id: I50ff76fef9a3d4f3044fa3c24eb3e7768dd12af8
Nate Fischer [Tue, 29 Oct 2019 07:32:55 +0000 (00:32 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44
am:
3ea1a6d6ff
Change-Id: I9cf9fd9b8cecb266d2cc2aa2cacf5e9fc2339ede
Nate Fischer [Tue, 29 Oct 2019 07:32:55 +0000 (00:32 -0700)]
WebView: clarify docs for onShowCustomView am:
aaaa660a44
am:
3ea1a6d6ff
Change-Id: Id1a2fc32030f8a5aed8af4dfd6c7046a65d51a6e
Nate Fischer [Tue, 29 Oct 2019 07:26:23 +0000 (00:26 -0700)]
WebView: clarify docs for onShowCustomView
am:
aaaa660a44
Change-Id: Idaa495f908c914057ac785bfeca1f2f15a0a5fd8
Anthony Han [Tue, 29 Oct 2019 05:04:07 +0000 (22:04 -0700)]
Merge "Log display white balance in animator" into qt-qpr1-dev
am:
5ba87c154e
Change-Id: I7d19d00ae5dfac3afa9426f0466682f98ead6b6f
TreeHugger Robot [Tue, 29 Oct 2019 04:49:39 +0000 (04:49 +0000)]
Merge "Log display white balance in animator" into qt-qpr1-dev
Peter Wang [Mon, 28 Oct 2019 23:19:04 +0000 (16:19 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9 am:
4dd1013a04
am:
8f6945f47b
Change-Id: Id4b990a8107da649f2e59efb62ea9431e1e4179a
Peter Wang [Mon, 28 Oct 2019 23:18:55 +0000 (16:18 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6 am:
aeeff0287c
am:
20c9b8e520
Change-Id: I2fac1ba6f9740c28b11c352c4b06c4b91ba303b1
Peter Wang [Mon, 28 Oct 2019 23:06:02 +0000 (16:06 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions" am:
10d6f20bc9
am:
4dd1013a04
Change-Id: Idbdcc5b47bddaa577113843c4fde7f0115428935
Peter Wang [Mon, 28 Oct 2019 23:05:52 +0000 (16:05 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions" am:
8db38c9ef6
am:
aeeff0287c
Change-Id: I1bb12eaca6f0efffd728be1d7e9c6d3d2fa9efa8
Peter Wang [Mon, 28 Oct 2019 22:58:57 +0000 (15:58 -0700)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions"
am:
10d6f20bc9
Change-Id: I0acfb85416f42fd570297554a0ce231a12914649
Peter Wang [Mon, 28 Oct 2019 22:58:49 +0000 (15:58 -0700)]
Merge "Fix java doc for eraseSubscriptionsWithOptions"
am:
8db38c9ef6
Change-Id: I55feb7a5515aa05dea0b5482f6d84b67c6686948
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
Peter Wang [Mon, 28 Oct 2019 22:50:53 +0000 (22:50 +0000)]
Merge "Fixed java doc for EuiccService#eraseSubscriptions"
Peter Wang [Mon, 28 Oct 2019 22:50:53 +0000 (22:50 +0000)]
Merge "Fix java doc for eraseSubscriptionsWithOptions"
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
Nate Fischer [Fri, 25 Oct 2019 03:35:54 +0000 (20:35 -0700)]
WebView: clarify docs for onShowCustomView
No change to logic, only docs.
This clarifies the docs for onShowCustomView. This @links to
FLAG_FULLSCREEN, reminds the developer they must override both
onShowCustomView and onHideCustomView, and provides guidance for
CustomViewCallback.
Bug:
143247282
Test: make -j4 docs
Change-Id: I64de3723674da5c138438921cc8232c4bf2a3d98
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
Nathan Harold [Tue, 15 Oct 2019 18:28:00 +0000 (11:28 -0700)]
[DO NOT MERGE] Check CellInfoCallback Detail for Null
In cases where the source of the CellInfo fails
but does not generate a Throwable, the detail info
will not be provided and should be null. Inside the
user process, we need to check for null before
dereferencing the detail object. Oops. :-(
Bug:
142706765
Bug:
142421696
Test: manual
Merged-In: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
Change-Id: I1307d1d7aacef0bbd33bfc73700ee774e12e64c1
(cherry picked from commit
fff052067c1926bd0e5ef5f852d4adba5333934d)
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 [Tue, 22 Oct 2019 18:36:42 +0000 (11:36 -0700)]
Fixed java doc for EuiccService#eraseSubscriptions
Bug:
143138878
Test: on device
Change-Id: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Merged-In: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Peter Wang [Wed, 23 Oct 2019 18:14:46 +0000 (11:14 -0700)]
Fix java doc for eraseSubscriptionsWithOptions
Bug:
143138878
Test: on device
Change-Id: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
Merged-In: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
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"
Steven Moreland [Mon, 28 Oct 2019 18:16:17 +0000 (11:16 -0700)]
ServiceManagerProxy: implement new method
This class is hanging around for UnsupportedAppUsage. Adding additional
method to fix compilation, but it should never be called.
Bug:
135686713
Test: compilation fixed
Change-Id: I58022af86a53239990e057936826d0f1214acc6f
Greg Kaiser [Fri, 25 Oct 2019 19:55:02 +0000 (12:55 -0700)]
Declare Visualizer::setEnabled() 'final'
We call the virtual method setEnabled() from Visualizer's
destructor. In the destructor, the virtual binding is not used.
This isn't a problem for any current code, but to future-proof
against a possible future subclass of Visualizer, we declare
this method 'final'.
Test: TreeHugger
Change-Id: I703580b37cc1bf7f411caa723f95a691dff840a5
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
Anthony Han [Wed, 4 Sep 2019 01:28:30 +0000 (18:28 -0700)]
Log display white balance in animator
Bug:
139488234
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/display/color/
Change-Id: I2768e2fc456009f1ee9da75f0ab8057ab8f39510
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"