Commit Graph

436969 Commits

Author SHA1 Message Date
Malcolm Chen
05c8a179c8 Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED. am: 64ff73fe4d
am: 23aaf352ea

Change-Id: I37561f740c57b60285d184e0882c95648c81d220
2019-10-29 16:15:48 -07:00
Malcolm Chen
23aaf352ea Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
am: 64ff73fe4d

Change-Id: I94a1b7159ef656f2be20d6ecc1d0548479f0672a
2019-10-29 16:09:01 -07:00
Nick Chalko
3a6f4226ca Merge "Add OWNERS for media/tv files" am: c91c7ab339
am: a0f0da0bd1

Change-Id: I75dbf8c9ecd9827b216933af11acef856cd3a6aa
2019-10-29 15:52:55 -07:00
Christian Wailes
01676b2564 Merge "Fixes a system crash in VibratorService on x86 hosts" am: 5ed0e55859
am: 5d8f3ae57d

Change-Id: Ic699d40f08f65c5b0731dfc75c13f42cd8b3c66a
2019-10-29 15:49:04 -07:00
Jack Yu
cbebaf2eb9 Merge "Addition of 'XorEqualsString' method for comparing String" am: e750b5b659
am: 000baa69f6

Change-Id: I1f85966f9a430e78e784b527771f4b5ce80e5289
2019-10-29 15:40:32 -07:00
Nick Chalko
a0f0da0bd1 Merge "Add OWNERS for media/tv files"
am: c91c7ab339

Change-Id: Ibe22561aca8dc5c2f0c21c843607ffd5c6b1cbfb
2019-10-29 15:39:50 -07:00
Christian Wailes
5d8f3ae57d Merge "Fixes a system crash in VibratorService on x86 hosts"
am: 5ed0e55859

Change-Id: I6ad532b24ba56d7e55aead79f8d59782339d4388
2019-10-29 15:35:54 -07:00
Paul Duffin
2b0d8181b0 Merge "Ignore classes on the classpath when generating stubs" am: c817b66016
am: 275d3b5585

Change-Id: Iae5798157a855f3a7b3e699ccc2cb0b52d80641e
2019-10-29 15:35:40 -07:00
Treehugger Robot
c91c7ab339 Merge "Add OWNERS for media/tv files" 2019-10-29 22:31:08 +00:00
Jack Yu
000baa69f6 Merge "Addition of 'XorEqualsString' method for comparing String"
am: e750b5b659

Change-Id: Ia9bd50755df21d39ca9b3e2ef955f9a774a994ed
2019-10-29 15:28:36 -07:00
Paul Duffin
275d3b5585 Merge "Ignore classes on the classpath when generating stubs"
am: c817b66016

Change-Id: Ia9068a94de9f50cbd387f016da301dd4db0780b1
2019-10-29 15:23:17 -07:00
Jian-Yang Liu
63150de91d Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev
am: 90572cb3c6

Change-Id: I42794c749e67a0fb1a8702dab4e852e9eca27922
2019-10-29 15:21:19 -07:00
Christian Wailes
5ed0e55859 Merge "Fixes a system crash in VibratorService on x86 hosts" 2019-10-29 22:13:06 +00:00
Jian-Yang Liu
90572cb3c6 Merge "Changed Notification shade's background alpha initial and final values to be configurable." into qt-qpr1-dev 2019-10-29 22:02:15 +00:00
Jack Yu
e750b5b659 Merge "Addition of 'XorEqualsString' method for comparing String" 2019-10-29 21:12:26 +00:00
Treehugger Robot
c817b66016 Merge "Ignore classes on the classpath when generating stubs" 2019-10-29 21:09:29 +00:00
Michele
01f3aa4fff Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d am: d9cb5b9427
am: 03b6954f5b

Change-Id: Iff7b36a5b35766788c1f8cf7e015646804c19fc3
2019-10-29 13:35:53 -07:00
Michele
03b6954f5b Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d
am: d9cb5b9427

Change-Id: Iad08bbff172267a64d5d2b18050f2d23f4f1a60e
2019-10-29 13:28:53 -07:00
Michele
d9cb5b9427 Merge "Expose APIs required by CarrierDefaultApp as system APIs."
am: 8c6e9e653d

Change-Id: I53e5b94caa0c9e7388cb23f6b3f21c134d79d43c
2019-10-29 13:22:50 -07:00
Chris Wailes
7d716426ea Fixes a system crash in VibratorService on x86 hosts
Original symptom: Cuttlefish devices would crash when the "recent apps"
tray was swiped up from the bottom.

Root cause: Raising the "recent apps" tray triggers a vibration.  Close
to the bottom of the call stack responsible for this action in
VibratorService is the native function vibratorPerformEffect().  The
Java Language signature for this function has a long as the type of the
second parameter, as does the JNI signature that is registered with the
environment.  The native function, however, uses an int type for this
parameter.  As a result, when the arguments are passed via the stack on
x86 devices the high bits of the second long argument are read as the
contents of the third argument, which is a jobject reference.  When the
code attempts to convert this NULL local reference into a global
reference the JNI code aborts the runtime for the process.  Because the
VibratorService is part of the SystemServer, when it crashes the Zygote
is notified and restarts the entire shell.

Why this wasn't an issue on ARM devices: ARMs calling conventions pass
many of a function's arguments via registers instead of via the stack.
This means that the long argument is passed in a register, preventing it
from stomping on any other arguments.  When the native function uses the
argument it simply reads the lower bits from the register and ignores
the higher bits.

Why this wasn't previously an issue on X86 hosts: ag/9158254 introduced
a new parameter to the vibratorPerformEffect() function.  This new
parameter is located after the mis-typed parameter and will be aliased
to the high bits of the mis-typed long argument.

Fix: Correct the type signature of the native vibratorPerformEffect()
function.

Bug: 143082450
Test: Build -> start cuttlefish -> raise recent apps tray -> no crash
[adelva: port to AOSP to close potential ASAN issues]
Change-Id: If50f68df9579f84bddc9d70a0a30cd73f4485e96
Merged-In: If50f68df9579f84bddc9d70a0a30cd73f4485e96
2019-10-29 13:09:55 -07:00
JianYang Liu
b923d1e1f0 Changed Notification shade's background alpha initial and final values
to be configurable.

Bug: 143372960
Test: manual - took before and after videos
Merged-In: Ia0b6a56859889d538e21f807a88bc5217d89e64a
Change-Id: Ia0b6a56859889d538e21f807a88bc5217d89e64a
2019-10-29 20:06:41 +00:00
Treehugger Robot
8c6e9e653d Merge "Expose APIs required by CarrierDefaultApp as system APIs." 2019-10-29 20:06:27 +00:00
Malcolm Chen
64ff73fe4d Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
ACTION_MULTI_SIM_CONFIG_CHANGED will be sent when multi-SIM
variants change.

Bug: 141388730
Test: test app
Change-Id: I717482ea05571afdfe6b04318d3f1fbda0c177ed
Merged-In: I717482ea05571afdfe6b04318d3f1fbda0c177ed
2019-10-29 12:15:59 -07:00
Nathan Harold
c92a649723 [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
2019-10-29 11:46:51 -07:00
Nathan Harold
766c011ff0 Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev 2019-10-29 18:20:19 +00:00
Steven Moreland
156230b3bf Merge "ServiceManagerProxy: implement new method" am: 2a6f6ed94b am: 9ab8a0713f
am: 1574e4fd4e

Change-Id: I3018e9922154e7a33dd3aa4814d5f80e4118a77a
2019-10-29 09:36:18 -07:00
Nicolas Geoffray
3ec6bb9f12 Merge "Whitelist file descriptors created through memfd_create." am: d10a84cdfe am: cb8118a096
am: a1bb3b7d6a

Change-Id: Iabba8469fd6262ccf3dec7237ec9b57fe7cc4fda
2019-10-29 09:30:18 -07:00
Steven Moreland
1574e4fd4e Merge "ServiceManagerProxy: implement new method" am: 2a6f6ed94b
am: 9ab8a0713f

Change-Id: I5af655cba2bb416ed517ba722f0f5ec46610c9bc
2019-10-29 09:26:57 -07:00
Nicolas Geoffray
a1bb3b7d6a Merge "Whitelist file descriptors created through memfd_create." am: d10a84cdfe
am: cb8118a096

Change-Id: I03fe4529d584221d0ea64f95cdb24d2a970fcf50
2019-10-29 09:22:24 -07:00
Steven Moreland
9ab8a0713f Merge "ServiceManagerProxy: implement new method"
am: 2a6f6ed94b

Change-Id: Id8d345fbe03cefed512b7dbb567b384dd20468da
2019-10-29 09:14:44 -07:00
Nicolas Geoffray
cb8118a096 Merge "Whitelist file descriptors created through memfd_create."
am: d10a84cdfe

Change-Id: I7defdd47f50b4b225093fd283bcf0fc64b26d6fb
2019-10-29 09:10:08 -07:00
Steven Moreland
2a6f6ed94b Merge "ServiceManagerProxy: implement new method" 2019-10-29 15:45:43 +00:00
Nicolas Geoffray
d10a84cdfe Merge "Whitelist file descriptors created through memfd_create." 2019-10-29 15:45:03 +00:00
Marco Nelissen
acf1850ba9 Merge "Declare Visualizer::setEnabled() 'final'" am: 00639037d7 am: 579c900beb
am: c3d0b20217

Change-Id: Id2a8d64424c96c235d35929bf573aea36a7ffc7d
2019-10-29 08:28:59 -07:00
Marco Nelissen
c3d0b20217 Merge "Declare Visualizer::setEnabled() 'final'" am: 00639037d7
am: 579c900beb

Change-Id: I3640dfae077fcd84bdf332ed027c15f2cabc95a1
2019-10-29 08:15:17 -07:00
Marco Nelissen
579c900beb Merge "Declare Visualizer::setEnabled() 'final'"
am: 00639037d7

Change-Id: Ie34e205683ed831dd6dbb7a556323c04fb0b949c
2019-10-29 08:02:15 -07:00
Marco Nelissen
00639037d7 Merge "Declare Visualizer::setEnabled() 'final'" 2019-10-29 14:31:55 +00:00
Paul Duffin
179d97038b Ignore classes on the classpath when generating stubs
This prevents metalava from generating stubs that reference classes
which are provided on the classpath. That ensures that removing hidden
classes from the sources does not result in references to those removed
classes from being added to the generated stubs, e.g. in the imports.

Specifically needed to prevent the StrictMode stubs class from
referencing dalvik.system.CloseGuard when that is removed from the
sourcepath as a result of switching the stub generation from using
libcore implementation classes (which contain CloseGuard) to
generated stubs (which does not contain CloseGuard).

Bug: 142113521
Test: m checkbuild
Change-Id: Ib4b87fec6549b69cc69820bc8d8b33f8c4e8535c
2019-10-29 12:23:44 +00:00
Android Build Merger (Role)
55f37dd299 Merge "WebView: clarify docs for onShowCustomView am: aaaa660a44 am: 3ea1a6d6ff am: 7baf85ccaf" into qt-qpr1-dev-plus-aosp 2019-10-29 07:40:55 +00:00
Nate Fischer
a906395b9e WebView: clarify docs for onShowCustomView am: aaaa660a44 am: 3ea1a6d6ff
am: b2bc8ddcfb

Change-Id: I28eb0e3ffcef7256d3419dbde5bb9bcce2614172
2019-10-29 00:39:55 -07:00
Nate Fischer
601523c6c0 WebView: clarify docs for onShowCustomView am: aaaa660a44 am: 3ea1a6d6ff
am: 7baf85ccaf

Change-Id: I50ff76fef9a3d4f3044fa3c24eb3e7768dd12af8
2019-10-29 00:39:55 -07:00
Nate Fischer
7baf85ccaf WebView: clarify docs for onShowCustomView am: aaaa660a44
am: 3ea1a6d6ff

Change-Id: I9cf9fd9b8cecb266d2cc2aa2cacf5e9fc2339ede
2019-10-29 00:32:55 -07:00
Nate Fischer
b2bc8ddcfb WebView: clarify docs for onShowCustomView am: aaaa660a44
am: 3ea1a6d6ff

Change-Id: Id1a2fc32030f8a5aed8af4dfd6c7046a65d51a6e
2019-10-29 00:32:55 -07:00
Nate Fischer
3ea1a6d6ff WebView: clarify docs for onShowCustomView
am: aaaa660a44

Change-Id: Idaa495f908c914057ac785bfeca1f2f15a0a5fd8
2019-10-29 00:26:23 -07:00
Anthony Han
52dc96d4c8 Merge "Log display white balance in animator" into qt-qpr1-dev
am: 5ba87c154e

Change-Id: I7d19d00ae5dfac3afa9426f0466682f98ead6b6f
2019-10-28 22:04:07 -07:00
TreeHugger Robot
5ba87c154e Merge "Log display white balance in animator" into qt-qpr1-dev 2019-10-29 04:49:39 +00:00
yoonjeong Jang
bc97964aad Addition of 'XorEqualsString' method for comparing String
Previously, ApnSetting compared two APNs using String with 'XorEqual' method
and the result of it used for 'dedupeApnSettings' for DcTracker.
For instance, a MMS APN for the specific operator shall be merged with
the default(Internet) APN of the same operator's(mccmnc) APN once the result of 'similar' is true.
But recently, it didn't merge two similar APNs properly due to 'UNSPECIFIED_STRING' case.
So we've added XorEquals for String(XorEqualsString) case.

The Issue will happen in the circumstance below.
 1.A network operator's similar APNs are saved separately at the APN database(apns-conf.xml)
    For instance, Add two APNs like below and check the result of merging APNs at DcTracker.
        <apn carrier="SKT LTE INTERNET"
          mcc="450"
          mnc="05"
          apn="lte.sktelecom.com"
          type="default,supl,fota,cbs"
          protocol="IPV4V6"
         />
        <apn carrier="SKT LTE INTERNET"
          mcc="450"
          mnc="05"
          apn="lte.sktelecom.com"
          type="mms"
          mmsc="http://omms.nate.com:9082/oma_mms"
          mmsproxy="smart.nate.com"
          mmsport="9093"
          protocol="IPV4V6"
         />:q
 2. Two similar APNs shall be merged on the result of ApnSetting's 'similar' method.
         P  => merged
         Q  => not merged

Test: Manual

Change-Id: I0584310765e246ef16163201282d7db48c44e451
Signed-off-by: yoonjeong Jang <yjeong.jang@samsung.com>
2019-10-29 13:00:28 +09:00
Peter Wang
20c679d182 Merge "Fixed java doc for EuiccService#eraseSubscriptions" am: 10d6f20bc9 am: 4dd1013a04
am: 8f6945f47b

Change-Id: Id4b990a8107da649f2e59efb62ea9431e1e4179a
2019-10-28 16:19:04 -07:00
Peter Wang
d3c5ae687e Merge "Fix java doc for eraseSubscriptionsWithOptions" am: 8db38c9ef6 am: aeeff0287c
am: 20c9b8e520

Change-Id: I2fac1ba6f9740c28b11c352c4b06c4b91ba303b1
2019-10-28 16:18:55 -07:00
Peter Wang
8f6945f47b Merge "Fixed java doc for EuiccService#eraseSubscriptions" am: 10d6f20bc9
am: 4dd1013a04

Change-Id: Idbdcc5b47bddaa577113843c4fde7f0115428935
2019-10-28 16:06:02 -07:00