OSDN Git Service
Pengquan Meng [Fri, 23 Aug 2019 09:32:14 +0000 (02:32 -0700)]
Merge "Add geo targeting implementation"
am:
df2293f68b
Change-Id: Iaa8d3d72bff57cbbd36b9f5ed63807fef2a0b119
Nagaraja [Fri, 23 Aug 2019 09:28:01 +0000 (02:28 -0700)]
Merge "Added Part & Addr Constants."
am:
f5d5de8a0f
Change-Id: Ieac6f8911910c9fea16d60457b5108222f68ca92
Anna Trostanetski [Fri, 23 Aug 2019 09:26:15 +0000 (02:26 -0700)]
Merge "Rename android.compat.IPlatformCompat"
am:
ee716a23a2
Change-Id: I88fd93b46bcaa5ed782c407f2a9e9469fb0f5f0e
Tobias Thierer [Fri, 23 Aug 2019 09:25:10 +0000 (02:25 -0700)]
Merge "Tweak RuntimeInit docs around MimeMap registration."
am:
bc6371727c
Change-Id: I4c3cee161fec5f8065e4ea77f1bf5aa694909874
Oscar Shu [Fri, 23 Aug 2019 09:24:15 +0000 (02:24 -0700)]
Merge "avoid generating reserved local MACs"
am:
e5d5b73109
Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284
Tobias Thierer [Fri, 23 Aug 2019 09:13:28 +0000 (02:13 -0700)]
Merge "Move default MimeMap implementation to frameworks."
am:
19c3bdc88a
Change-Id: I4bb456d64ad27dabb7db920d6e40dd32c92af900
Neil Fuller [Fri, 23 Aug 2019 08:48:14 +0000 (08:48 +0000)]
Merge "resolve merge conflicts of
bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master
Remi NGUYEN VAN [Fri, 23 Aug 2019 02:53:29 +0000 (02:53 +0000)]
Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master
Yi Kong [Sat, 27 Jul 2019 21:43:50 +0000 (14:43 -0700)]
Disable modernize-use-trailing-return-type clang-tidy check
Upcoming clang update introduced the new modernize-use-trailing-return-type
check which is not useful. Disable this warning for now (even before the
new clang update lands) since clang-tidy doesn't complain about flags it
doesn't know.
Test: build with new clang-tidy
Bug:
131328001
Change-Id: I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79
Merged-In: I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79
Exempt-From-Owner-Approval: Trivial, no functionality change
(cherry picked from commit
fc8e666d67afef241ddb6491ddc13948c3b837c0)
(cherry picked from commit
a0914d81ef9f4d7258f1530dc3bfdd575f6e448d)
Santos Cordon [Thu, 22 Aug 2019 17:01:13 +0000 (18:01 +0100)]
resolve merge conflicts of
bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9819adf76d6c96c54a02670a1d601a329003eb12
Remi NGUYEN VAN [Wed, 5 Jun 2019 05:31:59 +0000 (14:31 +0900)]
Remove DeviceConfig usage from NetworkStackClient
DeviceConfig API is not yet submitted. Use Settings.Global instead, to
still allow writing tests against AOSP code (a test would try to use
adb shell device_config, and fallback to adb shell settings).
This is not merged anywhere else, the merged-in is here to ensure this
does not end up in branches that use DeviceConfig. This change should be
lost when AOSP is updated.
Test: flashed, force-crashed NetworkStack with different setting values:
observe rate-limited crash
Bug:
133725814
Merged-In: I423ca6ebb328f49b170baae0da9b8409a6429fcb
Change-Id: I399d3e37f1faaecb8a30428c1989fac8821379d8
(clean cherry-pick from aosp/977048)
Inseob Kim [Thu, 22 Aug 2019 02:52:17 +0000 (02:52 +0000)]
Merge "Implement sysprop_library API stability check" into stage-aosp-master
Pengquan Meng [Thu, 22 Aug 2019 00:04:10 +0000 (00:04 +0000)]
Merge "Add geo targeting implementation"
Treehugger Robot [Wed, 21 Aug 2019 21:18:31 +0000 (21:18 +0000)]
Merge "Added Part & Addr Constants."
TreeHugger Robot [Wed, 21 Aug 2019 20:48:33 +0000 (20:48 +0000)]
Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master
Pengquan Meng [Thu, 15 Aug 2019 00:57:33 +0000 (17:57 -0700)]
Add geo targeting implementation
This CL adds support for geo targeting, including determining whether a
point is inside a simple polygon and circle.
For the judgment of the point in the polygon, the algorithm implemented
here simply considers the spherical polygon as a 2d plane polygon, which
may be not precisely. However, according to the test of real geographical
coordinates data i.e state/city/stree boundary data, this error is less than
10 meters that within 160 meters requires by the spec.
Bug:
123096618
Test: atest GeoUtils
Change-Id: I51e1fad3b48c1a58fa0510f97d9f5f9335779c30
(cherry picked from commit
7fbc74b66b58dd57deedb7336c5c1e2f0f9e2064)
Anna Trostanetski [Wed, 21 Aug 2019 19:46:39 +0000 (19:46 +0000)]
Merge "Rename android.compat.IPlatformCompat"
Raman Tenneti [Wed, 21 Aug 2019 18:41:32 +0000 (18:41 +0000)]
Merge "Wait until any background events are processed." into stage-aosp-master
Treehugger Robot [Wed, 21 Aug 2019 18:38:41 +0000 (18:38 +0000)]
Merge "Tweak RuntimeInit docs around MimeMap registration."
Oscar Shu [Wed, 21 Aug 2019 17:45:00 +0000 (17:45 +0000)]
Merge "avoid generating reserved local MACs"
Treehugger Robot [Wed, 21 Aug 2019 16:39:33 +0000 (16:39 +0000)]
Merge "Move default MimeMap implementation to frameworks."
atrost [Wed, 21 Aug 2019 15:48:56 +0000 (16:48 +0100)]
Rename android.compat.IPlatformCompat
To com.android.internal.compat.IPlatformCompat. This solves a java9
issue because libcore exported api has the same package android.compat.
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true make framework
Change-Id: I0918344f670669cecb04f1e9e54dbcb471b587d5
Tobias Thierer [Wed, 21 Aug 2019 15:54:00 +0000 (16:54 +0100)]
Tweak RuntimeInit docs around MimeMap registration.
Bug:
136256059
Test: Treehugger
Change-Id: I3f82a1684f47d96630badef4c13b3f507f30eaa5
Santos Cordon [Wed, 21 Aug 2019 15:24:46 +0000 (15:24 +0000)]
Merge "Add entry to OWNERS."
Santos Cordon [Fri, 19 Jul 2019 12:07:16 +0000 (13:07 +0100)]
Add entry to OWNERS.
Test: N/A
Change-Id: I1019015a81523e679a4a7529eb3e444283d0ba87
Tobias Thierer [Sun, 18 Aug 2019 14:19:45 +0000 (15:19 +0100)]
Move default MimeMap implementation to frameworks.
This CL topic moves the default MimeMap implementation to frameworks.
Libcore starts with a minimal implementation sufficient to pass
CtsLibcoreTestCases, but frameworks can inject the real implementation.
Before this CL topic, the data files and logic (MimeMapImpl) were part of
core-*.jar on device; after this CL, they instead live in framework.jar.
Tests from MimeMapTest that check behavior of that default
implementation also move to a non-libcore CTS test.
Specifically, the logic and android.mime.types now live in
frameworks/base/mime. The default implementation is injected
into libcore from RuntimeInit. I chose to use a separate directory
(frameworks/base/mime/) and build java_library target ("mimemap")
in order to keep this as separate as possible from the rest of
frameworks code, to make it as easy as possible to factor this
out into a separate APEX module if we ever choose to do so.
Planned work for follow-up CL:
1. Make CTS more opinionated, with a plan to assert that all of
the default mappings are present. How exactly the expectated
mapping will be bundled in CTS is still TBD.
2. Add a vendor.mime.types file (defaults to empty) where vendors
can add additional mappings; I plan to make it such that mappings
in that file are parsed last but never override any earlier
mappings, as if each mime type / file extension was prefixed
with '?'.
3. Perhaps enforce that public APIs android.webkit.MimeTypeMap
and java.net.URLConnection.getFileNameMap() behave consistently
with MimeMap.getDefault().
Test: atest CtsLibcoreTestCases
Test: atest CtsMimeMapTestCases
Bug:
136256059
Change-Id: Ib955699694d24a25c33ef2445443afb7c35ed9e7
Anna Trostanetski [Wed, 21 Aug 2019 11:05:51 +0000 (04:05 -0700)]
Merge "Add a platform-compat-config to the framework services."
am:
6162efbfa7
Change-Id: Iad2e3ebdabad091387cba59fb4c8ac5bec60da97
Anna Trostanetski [Wed, 21 Aug 2019 10:53:33 +0000 (10:53 +0000)]
Merge "Add a platform-compat-config to the framework services."
Inseob Kim [Tue, 30 Jul 2019 09:23:26 +0000 (18:23 +0900)]
Implement sysprop_library API stability check
sysprop_library now checks the API stability itself, cutting dependency
on java_sdk_library. Under the directory {module_dir}/api,
{module_name}-current.txt and {module_name}-latest.txt hold API
signatures.
When sysprop_library is built, or a user run "m {module_name}-check-api"
command, API check is performed. First, current.txt must have exactly
same signature with built sysprop_library module. Second, current.txt
must be compatible with latest.txt.
Build system emits a handy error message to generate/update those API
files, in case of missing or mismatching. Also, a script file for
freezing API files is introduced.
Bug:
131637873
Test: 1) m && boot blueline
Test: 2) m {sysprop_library} performs API check
Test: 3) manual test for check-api, freezing api
Change-Id: I6d69fb418bac675bbb9e4ac25c3269dfa3029219
Merged-In: I6d69fb418bac675bbb9e4ac25c3269dfa3029219
(cherry picked from commit
4fe9f0f8fd0e4c2f1d5905a02145acff011e756d)
zhuguangqing [Wed, 21 Aug 2019 01:22:19 +0000 (18:22 -0700)]
Merge "Modify start/stop condition for mScreenDozeTimer."
am:
83ed488383
Change-Id: I12ff8f6860a60519a9b029010fa1078d47ccfc25
Treehugger Robot [Wed, 21 Aug 2019 00:44:40 +0000 (00:44 +0000)]
Merge "Modify start/stop condition for mScreenDozeTimer."
Baohe.Wang [Wed, 21 Aug 2019 00:14:51 +0000 (17:14 -0700)]
Merge "TvInputManagerService patch"
am:
11e60c0824
Change-Id: I32d0deab39df9a1ec2a2aaa012fccca307053db2
Treehugger Robot [Tue, 20 Aug 2019 23:28:43 +0000 (23:28 +0000)]
Merge "TvInputManagerService patch"
Baohe.Wang [Sun, 30 Jun 2019 14:34:16 +0000 (22:34 +0800)]
TvInputManagerService patch
Fix potential null pointer access at TvInputManagerService.java
Bug:
136411969
Richard Uhler [Thu, 11 Jul 2019 08:32:43 +0000 (09:32 +0100)]
Disable testEnableRollbackTimeoutFailsRollback test.
The test is flaky because it is testing a race condition.
The flakiness is fixed with the help of some new @TestApi in
I01f3e769711ffa51fa714ff4bc81e70887f427ad. Disable the test on those
branches without the fix merged.
Bug:
134373106
Bug:
136605788
Test: atest RollbackTest
Change-Id: I05edfc142c14631b259ae7aaf2dd31af00363a35
Merged-In: I01f3e769711ffa51fa714ff4bc81e70887f427ad
(cherry picked from commit
75f942dfa807fe6d7b67d0ebca733e018fd66e02)
Alex Light [Tue, 20 Aug 2019 16:56:03 +0000 (09:56 -0700)]
[automerger skipped] Merge "Add agent startup-attach"
am:
2214ede1ec -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1
c4caca112f is in history
Change-Id: I4543024a1029fde612975e144e9c6a1f0cc09247
Jiyong Park [Tue, 20 Aug 2019 16:49:45 +0000 (09:49 -0700)]
[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base"
am:
bd8e232e20 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1
0c6dc7b709 is in history
Change-Id: Ib8f2525133a03860bea23924dcd7b7fd6bf55f4b
Treehugger Robot [Tue, 20 Aug 2019 16:20:23 +0000 (16:20 +0000)]
Merge "Add agent startup-attach"
Treehugger Robot [Tue, 20 Aug 2019 16:12:23 +0000 (16:12 +0000)]
Merge "glob pattern is used for AIDL files under frameworks/base"
Alex Light [Tue, 20 Aug 2019 15:39:48 +0000 (15:39 +0000)]
Merge "Add agent startup-attach" into stage-aosp-master
Anna Trostanetski [Tue, 20 Aug 2019 12:14:00 +0000 (05:14 -0700)]
[automerger skipped] Merge "Start platform compat service eariler."
am:
c0442d5b80 -s ours
am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA1
8266ae32ba is in history
Change-Id: I2f0b9275750b4c778f6b550cbd765352f37af098
Anna Trostanetski [Tue, 20 Aug 2019 11:00:40 +0000 (11:00 +0000)]
Merge "Start platform compat service eariler."
TreeHugger Robot [Tue, 20 Aug 2019 09:34:38 +0000 (09:34 +0000)]
Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master
Anna Trostanetski [Tue, 20 Aug 2019 09:07:33 +0000 (09:07 +0000)]
Merge "Start platform compat service eariler." into stage-aosp-master
Jiyong Park [Wed, 7 Aug 2019 13:45:07 +0000 (22:45 +0900)]
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
1cc9566ee26ff2e4ef9d738062409e868a21e34f)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
Jiyong Park [Wed, 7 Aug 2019 13:45:07 +0000 (22:45 +0900)]
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
1cc9566ee26ff2e4ef9d738062409e868a21e34f)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
Jordan Liu [Tue, 20 Aug 2019 00:24:34 +0000 (17:24 -0700)]
Merge "Do not notify SS change with invalid subId"
am:
3878f50107
Change-Id: Ic8e760342a288dc7fe0f38408dea468a9e8c31a6
Jordan Liu [Mon, 19 Aug 2019 23:57:24 +0000 (23:57 +0000)]
Merge "Do not notify SS change with invalid subId"
Jeff Sharkey [Wed, 12 Jun 2019 17:01:18 +0000 (11:01 -0600)]
Wait until any background events are processed.
Some MediaProvider events (such as thumbnail invalidation) are
handled on a background thread. To reduce flaky tests, wait until
all background events have been processed, which is more robust
than sleep.
Bug:
134879702
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Ia032b19c1b0e5c0096c55bf3d46a5153525e89fa
(cherry picked from commit
efad242f357151b252c45ef434782fca8da60264)
Yifan Hong [Mon, 19 Aug 2019 20:47:09 +0000 (13:47 -0700)]
Merge "BatteryService: scheduleUpdate asynchronously"
am:
238a04ef59
Change-Id: I77add2054b9f9e1c19067dfa169476a9e9d583f6
Siarhei Vishniakou [Mon, 19 Aug 2019 20:25:47 +0000 (13:25 -0700)]
[automerger skipped] Merge changes Ie18bce98,I1c600bc2
am:
778250f57f -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1
07749b72c6 is in history
Change-Id: Id34c9f958d43b6a0abf2ea61de64b591ca22cf3f
Jordan Liu [Mon, 24 Jun 2019 18:27:34 +0000 (11:27 -0700)]
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
Yifan Hong [Mon, 19 Aug 2019 20:14:15 +0000 (20:14 +0000)]
Merge "BatteryService: scheduleUpdate asynchronously"
Treehugger Robot [Mon, 19 Aug 2019 19:57:35 +0000 (19:57 +0000)]
Merge changes Ie18bce98,I1c600bc2
* changes:
Add keylayout for Xbox One USB controller
Keylayout for xbox controllers
Siarhei Vishniakou [Tue, 11 Jun 2019 02:51:14 +0000 (19:51 -0700)]
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
Siarhei Vishniakou [Sat, 15 Jun 2019 00:19:29 +0000 (17:19 -0700)]
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
atrost [Thu, 15 Aug 2019 15:53:01 +0000 (16:53 +0100)]
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
atrost [Thu, 15 Aug 2019 15:53:01 +0000 (16:53 +0100)]
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
atrost [Mon, 19 Aug 2019 15:51:15 +0000 (16:51 +0100)]
Add a platform-compat-config to the framework services.
Bug:
138222363
Test: m. the config builds and contains annotated changes.
Change-Id: I35ab9d028bbf23aca38494b66592779fdb4ef01e
Leland Miller [Mon, 19 Aug 2019 15:02:38 +0000 (08:02 -0700)]
Merge "Fix incorrect descriptions under SMS contract"
am:
8f48cb7e7e
Change-Id: I9b8659b91e72608100efbba3d36cb0b86066feb3
Treehugger Robot [Mon, 19 Aug 2019 14:22:21 +0000 (14:22 +0000)]
Merge "Fix incorrect descriptions under SMS contract"
satayev [Mon, 19 Aug 2019 09:37:47 +0000 (02:37 -0700)]
Merge "Cover framework code in hiddenapi-mappings."
am:
d39df1d0ac
Change-Id: Ia3d88cfe55d48959d56fd8755d72d1eb4107d0bd
satayev [Mon, 19 Aug 2019 09:13:55 +0000 (09:13 +0000)]
Merge "Cover framework code in hiddenapi-mappings."
Yifan Hong [Fri, 16 Aug 2019 20:20:57 +0000 (13:20 -0700)]
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
xshu [Fri, 16 Aug 2019 17:20:22 +0000 (10:20 -0700)]
avoid generating reserved local MACs
Avoid generating WifiInfo.DEFAULT_MAC_ADDRESS as a randomized MAC
address since it's being used for another purpose.
Bug:
137796328
Test: atest MacAddressTest
Change-Id: Ia7beef0d0af5d7b39845e662cd343d81aef97702
Artur Satayev [Fri, 2 Aug 2019 15:42:07 +0000 (16:42 +0100)]
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
vichang [Fri, 16 Aug 2019 11:01:41 +0000 (04:01 -0700)]
Merge "API updated for ICU4J 64.2"
am:
4c322503bb
Change-Id: Ifc90aefe3f13a82c6b484362216ecc2d82099082
vichang [Fri, 16 Aug 2019 10:50:08 +0000 (10:50 +0000)]
Merge "API updated for ICU4J 64.2"
Jianpeng Li [Fri, 16 Aug 2019 05:48:54 +0000 (22:48 -0700)]
Merge "Update wifi interface ip state upon receiving ap disable event"
am:
25d4c75c26
Change-Id: Ia58a409f63c59ece7817f9412695595708a95c77
Treehugger Robot [Fri, 16 Aug 2019 05:15:12 +0000 (05:15 +0000)]
Merge "Update wifi interface ip state upon receiving ap disable event"
TreeHugger Robot [Thu, 15 Aug 2019 23:02:12 +0000 (23:02 +0000)]
Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5713463) into stage-aosp-master" into stage-aosp-master
Hans Boehm [Thu, 15 Aug 2019 21:22:03 +0000 (14:22 -0700)]
Merge "Move Half implementations to libcore to allow ART optimizations"
am:
6bf381b5b1
Change-Id: I14db6620050fe8f1bf592961a3472ed0dc6ef368
Hans Boehm [Thu, 15 Aug 2019 20:35:13 +0000 (20:35 +0000)]
Merge "Move Half implementations to libcore to allow ART optimizations"
Anna Trostanetski [Thu, 15 Aug 2019 20:27:57 +0000 (13:27 -0700)]
[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar"
am:
1261967c52 -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1
fee45aa4dc is in history
Change-Id: I74dcbe51d59637a967e5217104d56f43379de527
satayev [Thu, 15 Aug 2019 20:18:41 +0000 (13:18 -0700)]
Merge "Move telephony/cdma/ classes into appropriate package."
am:
46c04b7bb8
Change-Id: I1fb05b0e09c492fa95af92e6b146364492177f61
Anna Trostanetski [Thu, 15 Aug 2019 19:34:09 +0000 (19:34 +0000)]
Merge "Move IPlatformCompat.aidl definition to framework.jar"
Jianpeng Li [Fri, 24 May 2019 08:40:15 +0000 (17:40 +0900)]
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
satayev [Thu, 15 Aug 2019 17:29:37 +0000 (17:29 +0000)]
Merge "Move telephony/cdma/ classes into appropriate package."
Anna Trostanetski [Thu, 15 Aug 2019 13:35:29 +0000 (13:35 +0000)]
Merge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master
Xin Li [Thu, 15 Aug 2019 07:06:36 +0000 (00:06 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am:
5937562bfb -s ours
am skip reason: subject contains skip directive
Change-Id: I55e101aeb99bcf3e8158c1297f9a3ed5867202a6
Xin Li [Thu, 15 Aug 2019 06:31:36 +0000 (23:31 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am:
1702a9da19 -s ours
am skip reason: subject contains skip directive
Change-Id: I5d41a28d611092856d9228707097049ff91b395d
Treehugger Robot [Thu, 15 Aug 2019 06:13:48 +0000 (06:13 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
Colin Cross [Wed, 14 Aug 2019 16:37:07 +0000 (09:37 -0700)]
Adapt to google::protobuf::int64 type change
Protobuf 3.9.1 redefines google::protobuf::int64 from long long
to int64_t, which is sometimes long and sometimes long long. Use
PRIi64 to print it. Also temporarily cast to int64_t to decouple
this change from the change that updates protobuf.
Bug:
117607748
Test: m checkbuild
Change-Id: I482b957d2262e5001140ed1153c7de2b17facae2
Alex Light [Mon, 12 Aug 2019 17:58:29 +0000 (10:58 -0700)]
Add agent startup-attach
Add ability to give 'startup-agents' that are automatically loaded
when a (debuggable) app starts. These agents are any files in the
'code_cache/startup_agents' directory. The agents are started with the
apps data_directory as an argument.
Test: Install debuggable apk (here com.antonioleiva.bandhookkotlin)
walleye:/ $ run-as com.antonioleiva.bandhookkotlin sh
walleye:/data/data/com.antonioleiva.bandhookkotlin $ mkdir code_cache/startup_agents
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libtifasts32.so code_cache
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libtifasts64.so code_cache
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libchainagentss32.so code_cache/startup_agents/
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libchainagentss64.so code_cache/startup_agents/
walleye:/data/data/com.antonioleiva.bandhookkotlin $ echo $PWD/code_cache/libtifasts32.so=log,ClassLoad > chain_agents.txt
walleye:/data/data/com.antonioleiva.bandhookkotlin $ echo $PWD/code_cache/libtifasts64.so=log,ClassLoad >> chain_agents.txt
Start bandhookkotlin
Examine logcat
Bug:
135627501
Cherry-picked from commit
c0fce111c8b due to merge conflict.
Change-Id: Ib82b27df90c7964a995288d8b2b3d348a11cdd80
Merged-In: Ib82b27df90c7964a995288d8b2b3d348a11cdd80
Xin Li [Wed, 14 Aug 2019 19:04:06 +0000 (12:04 -0700)]
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (
5713463) into stage-aosp-master
Bug:
134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
Alex Light [Mon, 12 Aug 2019 17:58:29 +0000 (10:58 -0700)]
Add agent startup-attach
Add ability to give 'startup-agents' that are automatically loaded
when a (debuggable) app starts. These agents are any files in the
'code_cache/startup_agents' directory. The agents are started with the
apps data_directory as an argument.
Test: Install debuggable apk (here com.antonioleiva.bandhookkotlin)
walleye:/ $ run-as com.antonioleiva.bandhookkotlin sh
walleye:/data/data/com.antonioleiva.bandhookkotlin $ mkdir code_cache/startup_agents
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libtifasts32.so code_cache
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libtifasts64.so code_cache
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libchainagentss32.so code_cache/startup_agents/
walleye:/data/data/com.antonioleiva.bandhookkotlin $ cp /data/local/tmp/libchainagentss64.so code_cache/startup_agents/
walleye:/data/data/com.antonioleiva.bandhookkotlin $ echo $PWD/code_cache/libtifasts32.so=log,ClassLoad > chain_agents.txt
walleye:/data/data/com.antonioleiva.bandhookkotlin $ echo $PWD/code_cache/libtifasts64.so=log,ClassLoad >> chain_agents.txt
Start bandhookkotlin
Examine logcat
Bug:
135627501
Change-Id: Ib82b27df90c7964a995288d8b2b3d348a11cdd80
Merged-In: Ib82b27df90c7964a995288d8b2b3d348a11cdd80
atrost [Wed, 14 Aug 2019 15:13:56 +0000 (16:13 +0100)]
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
atrost [Wed, 14 Aug 2019 15:13:56 +0000 (16:13 +0100)]
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
Adrian Roos [Wed, 14 Aug 2019 15:11:37 +0000 (08:11 -0700)]
Merge "API: Explicitly track incompatibilities with previous API versions"
am:
5f76164a65
Change-Id: I93458fee3894a456f202f1e117538a9e0a81cf7a
Adrian Roos [Wed, 14 Aug 2019 14:39:18 +0000 (14:39 +0000)]
Merge "API: Explicitly track incompatibilities with previous API versions"
xueliang.zhong [Tue, 22 Jan 2019 18:01:45 +0000 (18:01 +0000)]
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
Chiachang Wang [Wed, 14 Aug 2019 11:30:57 +0000 (04:30 -0700)]
Merge "Get resource based on subId for multi-SIM"
am:
55752cf8d4
Change-Id: I020c2546fa4432d05cf27b20fdb1943508aac671
Chiachang Wang [Wed, 14 Aug 2019 10:56:27 +0000 (10:56 +0000)]
Merge "Get resource based on subId for multi-SIM"
Artur Satayev [Fri, 2 Aug 2019 15:40:26 +0000 (16:40 +0100)]
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
Chiachang Wang [Tue, 13 Aug 2019 13:02:40 +0000 (21:02 +0800)]
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
Xin Li [Tue, 13 Aug 2019 23:36:37 +0000 (16:36 -0700)]
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
Bug:
139369544
Change-Id: I835905a51836e7218f0be8c25335b9548ae6b2d3
Brad Ebinger [Tue, 13 Aug 2019 23:34:41 +0000 (16:34 -0700)]
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
am:
4204a6017e
Change-Id: I3c10e76be4266bb4f43306ca3f0c7362499208f7
Brad Ebinger [Tue, 13 Aug 2019 22:46:18 +0000 (22:46 +0000)]
Merge "Modify RCS UCE APIs to use AIDL Interfaces."
Nikita Iashchenko [Tue, 13 Aug 2019 17:18:35 +0000 (18:18 +0100)]
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
Brad Ebinger [Tue, 13 Aug 2019 17:25:44 +0000 (10:25 -0700)]
Merge "Prevent Infinite Recursion in Telecom Sessions"
am:
8dec6de25a
Change-Id: I779c9424dc7a1f9f14f7907bba76a24b9026ec5a