Commit Graph

386497 Commits

Author SHA1 Message Date
Treehugger Robot
bd8e232e20 Merge "glob pattern is used for AIDL files under frameworks/base" 2019-08-20 16:12:23 +00:00
Anna Trostanetski
c0442d5b80 Merge "Start platform compat service eariler." 2019-08-20 11:00:40 +00:00
Jiyong Park
90625f10f8 glob pattern is used for AIDL files under frameworks/base
This change removes the manullay curated list of AIDL files and replace
them with globs.

In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.

The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).

Bug: 70046217
Test: m

Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee2)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
2019-08-20 13:26:49 +09:00
Jordan Liu
3878f50107 Merge "Do not notify SS change with invalid subId" 2019-08-19 23:57:24 +00:00
Jordan Liu
d2d614a083 Do not notify SS change with invalid subId
(This is a reupload of ag/8541406.)

If a service state change is reported as a subscription is becoming
invalid (i.e. no longer connected to a phone), the current behavior can
sometimes notify this change to all PhoneStateListeners regardless of
which subId they registered to listen on (namely this happens when the
subscription was attached to the default phone).

This change removes that behavior so that no listeners are notified if
the subscription is invalid.

Test: manually verified on DSDS that when
  1. erasing eSIM when it is default and
  2. removing pSIM when it is default,
  the service state triangle for the other SIM is unaffected
  Also made sure that signal strength is rebroadcast when sub becomes
  valid, so b/138357571 did not show up 5/5 times
Bug: 133140128
Change-Id: I2ba6a971fff4e29ccd2166c381308fcd953f5bc0
Merged-In: I2ba6a971fff4e29ccd2166c381308fcd953f5bc0
2019-08-19 13:24:49 -07:00
Yifan Hong
238a04ef59 Merge "BatteryService: scheduleUpdate asynchronously" 2019-08-19 20:14:15 +00:00
Treehugger Robot
778250f57f Merge changes Ie18bce98,I1c600bc2
* changes:
  Add keylayout for Xbox One USB controller
  Keylayout for xbox controllers
2019-08-19 19:57:35 +00:00
Siarhei Vishniakou
4fef274c01 Add keylayout for Xbox One USB controller
We are currently missing the key layout for the Xbox One USB controller
with the following meta information:
vendor 045e, product 02ea

This layout was copied from product 02d1.

Also fix the mappings of the middle buttons to generate "select - mode -
start", similar to what has already been done for the other xbox
controllers in ag/4836521 and ag/3162575

Bug: 132451971
Bug: 133514907
Bug: 139512030
Test: tested using custom app. CTS tests will be added later.

Change-Id: Ie18bce987b512211d3e91bd1f7334afe11d83cf8
Merged-In: Ie18bce987b512211d3e91bd1f7334afe11d83cf8
2019-08-19 13:21:15 -05:00
Siarhei Vishniakou
9d81ccc929 Keylayout for xbox controllers
Add layout for Xbox elite controller

Test: tested with a custom app
Bug: 132451971
Bug: 139512030
Change-Id: I1c600bc2c41db9d79d7a4e184ef41abe2b5f860e
Merged-In: I1c600bc2c41db9d79d7a4e184ef41abe2b5f860e
2019-08-19 13:18:05 -05:00
atrost
499d4bff66 Start platform compat service eariler.
It's needed by ActivityManager and PackageManager.
Also use a constant in Context for the name.

Test: flashed device with ag/9025572 and ag/9204795 and the platfrom
compat was accessible.
Bug: 137769727

Change-Id: Ie1130a3f0bdd1769fe0755db0089702ea64d9db6
Merged-In: Ie1130a3f0bdd1769fe0755db0089702ea64d9db6
2019-08-19 16:10:47 +00:00
Treehugger Robot
8f48cb7e7e Merge "Fix incorrect descriptions under SMS contract" 2019-08-19 14:22:21 +00:00
satayev
d39df1d0ac Merge "Cover framework code in hiddenapi-mappings." 2019-08-19 09:13:55 +00:00
Yifan Hong
7ceb724d0f BatteryService: scheduleUpdate asynchronously
IBatteryPropertiesRegistrar.scheduleUpdate calls IHealth.update()
asynchronously.

BatteryStatsImpl calls scheduleUpdate while holding a lock, which
may lead to deadlocks if the remote process calls back to the
framework.

Fixes: 139503418
Test: monitor HealthScheduleUpdate trace points
Change-Id: I8168d7c4e4a0b1d31343360d2c7f6d36c7aa692a
2019-08-16 13:40:43 -07:00
Artur Satayev
005d7350d2 Cover framework code in hiddenapi-mappings.
It was missing most of the source code outside of core/...

Test: m, m hiddenapi-mappings
Change-Id: I9559346d306499c2f9659b73a68962d640fe644d
Merged-In: I9559346d306499c2f9659b73a68962d640fe644d
2019-08-16 16:33:33 +00:00
vichang
4c322503bb Merge "API updated for ICU4J 64.2" 2019-08-16 10:50:08 +00:00
Treehugger Robot
25d4c75c26 Merge "Update wifi interface ip state upon receiving ap disable event" 2019-08-16 05:15:12 +00:00
Hans Boehm
6bf381b5b1 Merge "Move Half implementations to libcore to allow ART optimizations" 2019-08-15 20:35:13 +00:00
Anna Trostanetski
1261967c52 Merge "Move IPlatformCompat.aidl definition to framework.jar" 2019-08-15 19:34:09 +00:00
Jianpeng Li
a70feeca7a Update wifi interface ip state upon receiving ap disable event
When turning on/off SoftAp with high frequency, sometime calling
WifiManager#updateInterfaceIpState with IFACE_IP_MODE_TETHERED
is performed after handling WIFI_AP_STATE_DISABLED event in
WifiServiceImpl while SoftAp is being terminated. This leads to
the issue that SoftAp is unable to start as startSoftAp always
returns "false". This is because mIfaceIpModes in WifiServiceImpl
keeps the mode WifiManager.IFACE_IP_MODE_TETHERED and the CL below
rejects SoftAp start request.

e257c5c9e79e3675375ca20731cfb74df02b1064 @ frameworks/opt/net/wifi
(WifiServiceImpl: Reject startSoftAp when already tethering)

This CL updates the interface ip state upon receiving ap disable
event from Tethering class to set proper state to mIfaceIpModes.

Bug: 134806980
Test: Ran script to turn on/off soft ap frequently
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
Change-Id: I2f89214414d93f1aa942fb8a21264a9baae3452a
2019-08-16 04:16:26 +09:00
satayev
46c04b7bb8 Merge "Move telephony/cdma/ classes into appropriate package." 2019-08-15 17:29:37 +00:00
Treehugger Robot
5937562bfb Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" 2019-08-15 06:13:48 +00:00
atrost
b18da3cad9 Move IPlatformCompat.aidl definition to framework.jar
There are non-app process usecases in framework code that need to have
access to this API.
Created a new package android.compat in frameworks/base/core following
previous definition of android.compat.Compatibility for app processes
(http://cs/android/libcore/luni/src/main/java/android/compat/Compatibility.java).

Bug: 137769727
Test: m
Change-Id: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
Merged-In: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
2019-08-14 16:35:14 +01:00
Adrian Roos
5f76164a65 Merge "API: Explicitly track incompatibilities with previous API versions" 2019-08-14 14:39:18 +00:00
xueliang.zhong
e008d965ca Move Half implementations to libcore to allow ART optimizations
Move Half FP16 implementations to libcore, to allow ART compiler to
optimize these methods with intrinsic implementations.

For example, on ARM64 with ARMv8.2 FP16 half registers and instructions:
- Half toFloat/toHalf can be implemented with FCVT;
- Half floor/ceil/round can be implmented with FRINT(pna);
- Half max/min can be implmented with FMIN/FMAX.

Such fast Half FP16 intrinsics can help accelerate ColorLong ARGB
encoding/decoding in Android framework.

Change-Id: I6225ebf8aa825b0394ce8f13e12db317f5c6e3fd
2019-08-14 14:07:44 +00:00
Chiachang Wang
55752cf8d4 Merge "Get resource based on subId for multi-SIM" 2019-08-14 10:56:27 +00:00
Artur Satayev
f772c13f9d Move telephony/cdma/ classes into appropriate package.
Not changing the java packages, but rather moving the source location. This allows running metalava on them.

Test: m
Change-Id: I3b46644361239d85818dd885f461dfc94de49dca
2019-08-14 10:48:10 +01:00
Chiachang Wang
5f8ac27d79 Get resource based on subId for multi-SIM
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.

Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d
2019-08-14 13:56:37 +08:00
Xin Li
1702a9da19 DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug: 139369544
Change-Id: I835905a51836e7218f0be8c25335b9548ae6b2d3
2019-08-13 16:36:37 -07:00
Brad Ebinger
4204a6017e Merge "Modify RCS UCE APIs to use AIDL Interfaces." 2019-08-13 22:46:18 +00:00
Nikita Iashchenko
1e9a1c8c20 API updated for ICU4J 64.2
Expose new stable APIs from ICU 64

Bug: 125283072
Test: m api-stubs-docs-update-current-api droid
Change-Id: Id689aab0d4387725929ee41d80f3e8a26c0810fa
2019-08-13 18:36:46 +01:00
Brad Ebinger
8dec6de25a Merge "Prevent Infinite Recursion in Telecom Sessions" 2019-08-13 17:10:53 +00:00
android-build-team Robot
823838e9ef Snap for 5674421 from ae0c2eeba3 to pi-platform-release
Change-Id: I5b1dc16c0696ce8452f8798e68fe417d7533c5df
2019-08-13 16:25:34 +00:00
Mark Chien
161814ffb1 Merge "Don't allow upstream if entitlement don't know any downstream" 2019-08-13 09:36:16 +00:00
markchien
426311bcb5 Don't allow upstream if entitlement don't know any downstream
In case tethering donwstream is setup but don't ask EntitlementManager
to run provisioning. Cellular upstream should not be allowed if
EntilementManager don't have any donwstream record.

Bug: 134649258
Test: -build, flash, boot
      -manual test with carrier SIM
Change-Id: I609722c79f0a45a1c2164d39721ef5883e436feb
2019-08-13 02:28:41 +00:00
Brad Ebinger
839bfaf7d0 Prevent Infinite Recursion in Telecom Sessions
There looks to be a case where infinite recursion
is occuring when printing information about
Telecom Sessions. Set a reasonable limit of
iterations and throw a warning when this condition
occurs to better track down a root cause.

Bug: 139045282
Test: atest TelecomUnitTests:SessionTest
Merged-In: Iae69c5db070c5e58ae5d37c12d1c4df027138611
Change-Id: Iae69c5db070c5e58ae5d37c12d1c4df027138611
2019-08-13 00:39:44 +00:00
Leland Miller
3e85da2d89 Merge "Add documentation for Locked Messages" 2019-08-12 23:42:56 +00:00
Brad Ebinger
ce98a32755 Merge "SurfaceControl: Fix captureLayers JNI" 2019-08-12 17:46:33 +00:00
Adrian Roos
9597f8c84f API: Explicitly track incompatibilities with previous API versions
Bug: 139128921
Test: make checkapi
Change-Id: I1f17b57705e2f7350b55ab278e06fc4e988771ff
2019-08-12 17:47:39 +02:00
Sungsoo Lim
8b578c9c92 Merge "Fix reference leak on TvInputHardwareManager" 2019-08-12 04:02:56 +00:00
Treehugger Robot
0985eea389 Merge "Fix a lock issue in AudioPortEventHandler" 2019-08-12 01:22:58 +00:00
Robert Carr
1fb99f259f SurfaceControl: Fix captureLayers JNI
Missed a call-point in last refactoring.

Bug: 135965618
Bug: 130211665
Bug: 133054270
Test: Manual
Merged-In: I43fa93eea7d79f5b773497e3bb65750866eca2cb
Change-Id: I43fa93eea7d79f5b773497e3bb65750866eca2cb
(cherry picked from commit bf9298f1c9)
2019-08-09 23:50:04 +00:00
Treehugger Robot
454029142c Merge "Add klhyun@ to media OWNERS" 2019-08-09 14:04:34 +00:00
Kyeongkab.Nam
6dbaaf2d8a Fix a lock issue in AudioPortEventHandler
It used "this" as a lock object to guard mListeners. but "this" is
pointing to mHandler in handler thread.
This causes the IndexOutOfBoundsException.

bug: 138951761
Test: manual
Change-Id: I826c7c68ecff4fc0d39addd3d56bc989e00848bc
2019-08-09 09:30:44 +09:00
Yi Kong
12140677ea Merge "Fix statsd ASAN failure" 2019-08-08 22:09:48 +00:00
Yi Kong
3ee963917f Fix statsd ASAN failure
If tagId is not found in kAllPullAtomInfo map, StatsPuller will read
outside of the object. Add a condition check to gracefully handle
unrecognised tagId and fix the ASAN failure.

Bug: 139037732
Test: boot aosp_x86-eng
Change-Id: Ic62b89866dbec82f05e6f8e6afca9b312f44a801
Merged-In: I5db561c4223efc4ef6b1441490d319cc6ec8afc7
Exempt-From-Owner-Approval: trivial change, owner OOO.
2019-08-08 22:09:09 +00:00
Elliott Hughes
527c91320d Merge "Use String8 for UTF16 to UTF8 conversion." 2019-08-08 19:12:04 +00:00
Leland Miller
8627256f12 Fix incorrect descriptions under SMS contract
Fixes: 117203793
Test: N/A, only modifies documentation
Change-Id: I5c4bc23e41bc0d1c97bccf7e288c4c41d8e1a438
2019-08-08 10:40:05 -07:00
Elliott Hughes
1f7b854d70 Use String8 for UTF16 to UTF8 conversion.
This is the only actual user of libcutils' jstring.h.

Test: treehugger
Change-Id: I0444d42e5a3ca57de3bffca48aa265f267c3d4dc
2019-08-08 09:36:14 -07:00
Rajeev Kumar
6452cc3cc1 Merge "Stop showing disclosure UI when isDisclosureEnabled is false." 2019-08-08 15:42:51 +00:00
Treehugger Robot
e921001f2d Merge "Fix interfaceVersion in DhcpServerCallbacks" 2019-08-08 12:41:51 +00:00