Commit Graph

431886 Commits

Author SHA1 Message Date
Marco Nelissen
e83368fcfa Remove unused link libraries from libmedia_jni_utils
Test: build
Change-Id: If11573e26f1b4e610b936d63870da962c8e128a2
2019-10-30 07:48:25 -07:00
Nicolas Geoffray
555ffd1c0c Merge "Add checks to ensure only the ART memfd file is whitelisted." 2019-10-30 08:24:37 +00:00
Xiangyu/Malcolm Chen
d7f38d742b Merge "Have getSupportedModemCount always rely on system properties." 2019-10-30 02:10:42 +00:00
Treehugger Robot
634c108060 Merge "Returns null not empty string if MEID is not available" 2019-10-30 00:21:50 +00:00
Treehugger Robot
5cd5e277dc Merge "Prevent sending CLIR activation and deactivation code only" 2019-10-30 00:08:27 +00:00
Xiangyu/Malcolm Chen
8ed3fb4bcf Merge changes from topic "getDeviceCapableModemCount"
* changes:
  Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
  Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
2019-10-29 22:54:26 +00:00
Treehugger Robot
c91c7ab339 Merge "Add OWNERS for media/tv files" 2019-10-29 22:31:08 +00:00
Christian Wailes
5ed0e55859 Merge "Fixes a system crash in VibratorService on x86 hosts" 2019-10-29 22:13:06 +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
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
Treehugger Robot
8c6e9e653d Merge "Expose APIs required by CarrierDefaultApp as system APIs." 2019-10-29 20:06:27 +00:00
Malcolm Chen
ee5bfb643e Have getSupportedModemCount always rely on system properties.
Earlier we disabled the reboot free feature and always have
getSupportedModemCount return the same value with getActiveModemCount.
Now that we've enbaled reboot free switch, we will return correct value
based on system property.

Bug: 142514392
Test: manual - change PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and test
what getSupportedModemCount returns.
Change-Id: I34e172c747dd52aa498037e64b758393793fddba
Merged-In: I34e172c747dd52aa498037e64b758393793fddba
2019-10-29 12:19:49 -07:00
Malcolm Chen
387dc0efd1 Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
To have better names reflecting what getPhoneCount / getMaxPhoneCount
actually represent, we replace them with getActiveModemCount and
getSupportedModemCount. As getPhoneCount is public API, we mark
it as @Deprecated.

Bug: 141388730
Test: build
Change-Id: If086c50ae803b384691f709057bceeac2fc1d9d5
Merged-In: If086c50ae803b384691f709057bceeac2fc1d9d5
2019-10-29 12:19:32 -07: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
Nicolas Geoffray
abbd4a7aa0 Add checks to ensure only the ART memfd file is whitelisted.
A memfd file can be created with any name, but to protect ourselves
from unintended leakage, check that it's the name ART uses.

Test: boots
Bug: 119800099
Change-Id: Ibc684d09dd05f38933c6808b72fb402fc9d5e4eb
2019-10-29 15:45:46 +00: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
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
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
10d6f20bc9 Merge "Fixed java doc for EuiccService#eraseSubscriptions" 2019-10-28 22:50:53 +00:00
Peter Wang
8db38c9ef6 Merge "Fix java doc for eraseSubscriptionsWithOptions" 2019-10-28 22:50:53 +00:00
Hideki Ishii
de2688ec89 Prevent sending CLIR activation and deactivation code only
Sending CLIR activation("*31#") and deactivation("#31#") code without
dialing number is not allowed by some operator. This patch adds new
CarrierConfig key to prevent sending CLIR activation and deactivation
code only.

Test: manual - Verified behavior about sending "*31#" and "#31#"
Bug: 140366917
Change-Id: I2d53e438f96a9dabc99a544cea15c6841061f3d5
2019-10-28 15:44:29 -07:00
Jack Yu
48ad8828d1 Merge "Add new carrier configuration for GET INPUT command" 2019-10-28 22:06:43 +00:00
Peter Wang
0ecde1f5f9 Fixed java doc for EuiccService#eraseSubscriptions
Bug: 143138878
Test: on device
Change-Id: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
Merged-In: I2a9ab4fe4e1c48fc7e7178b1de9b1f72b0408183
2019-10-28 12:40:23 -07:00
Peter Wang
fa9c61ad2d Fix java doc for eraseSubscriptionsWithOptions
Bug: 143138878
Test: on device
Change-Id: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
Merged-In: I7fe32bb1e09ea37a8c8a91fb7d7e820491c71803
2019-10-28 12:37:56 -07:00
Peter Wang
ca01a7ee08 Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-28 19:32:18 +00:00
Treehugger Robot
149ad21fcd Merge "Add owners for TV related files" 2019-10-28 18:40:38 +00:00
Steven Moreland
2cd23b6a59 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
2019-10-28 11:17:15 -07:00
Greg Kaiser
d4dd8b8edf 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
2019-10-28 08:02:29 -07:00
Treehugger Robot
df5cd39198 Merge "Replace framework.jar with framework-minus-apex.jar" 2019-10-28 11:40:09 +00:00
Jiyong Park
c893b46034 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
2019-10-28 15:33:37 +09:00
Jack Yu
fde6b837f9 Merge "Change Wi-Fi Calling text for SFR France" 2019-10-27 07:20:47 +00:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Ian Kasprzak
1490293aa2 Merge "Ignore FlakyTests in test-mapping." 2019-10-26 20:07:34 +00:00
Yoshiaki Naka
1c5203a65b 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
2019-10-26 17:44:19 +00:00
Marco Nelissen
0bf6a04b0b Merge "Move Visualizer to libaudioeffect_jni, its only user" 2019-10-26 01:45:57 +00:00
Ian Kasprzak
cc89aa534d 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
2019-10-25 17:22:05 -07:00
Peter Wang
2ab852d411 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-25 14:26:22 -07:00
Marco Nelissen
1a7b415d53 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
2019-10-25 20:35:30 +00:00
Marco Nelissen
04d8813a01 Merge "Add required header_libs" 2019-10-25 19:47:54 +00:00
Mathieu Chartier
cfee28589b Merge "Avoid preloading classes for boot image profiling" 2019-10-25 19:35:00 +00:00
Chen Xu
17518fa149 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Xin Li
d3498e3053 Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: Ic0486c8c79d94c9a30efa37676b2f6a94fb7b5fa
Merged-In: Ibe8ff7bdba7a886bd8b91155ae56f087a836981f
2019-10-25 10:27:58 -07:00
Chen Xu
7e902363a6 Merge "make CallerInfo as SystemAPI" 2019-10-25 17:27:45 +00:00
Tom Cherry
4be2934e61 Merge "Remove legacy logger_entry_v* structs" 2019-10-25 16:53:20 +00:00
Howard Chen
7898d33e3a Merge "Use new GsiInstallParams struct" 2019-10-25 07:18:57 +00:00
Mark Chien
634c6a512f Merge "[Tether03] Migrate IpServer into module" 2019-10-25 06:41:49 +00:00
Hai Zhang
af8a6c724f Merge "Add OWNERS for SettingsProvider."
am: 18bece7b32

Change-Id: Ibe8ff7bdba7a886bd8b91155ae56f087a836981f
2019-10-24 14:45:53 -07:00