OSDN Git Service

android-x86/frameworks-base.git
5 years agoFix android-cloexec-pipe clang-tidy warning
Yi Kong [Thu, 15 Aug 2019 20:27:46 +0000 (13:27 -0700)]
Fix android-cloexec-pipe clang-tidy warning

The upcoming clang-tidy update finds a new instance of
android-cloexec-pipe warning:

FileUtilsTests.cpp:72:13: error: prefer pipe2() with O_CLOEXEC to avoid leaking file descriptors to child processes
ASSERT_EQ(pipe(pipefd), 0);
^~~~~~~~~~~~
pipe2(pipefd, O_CLOEXEC)

Apply the suggested fix by clang-tidy.

Test: build
Bug: 131328001
Exempt-From-Owner-Approval: Cherrypick
Change-Id: Iee772b5c3ed5e2af481e479dab19030f8419290a
Merged-In: Iee772b5c3ed5e2af481e479dab19030f8419290a
(cherry picked from commit f61e2167d5352b63eb34a086cdcb0dfec485bdf0)

5 years agoDisable modernize-use-trailing-return-type clang-tidy check
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)

5 years agoMerge "Implement sysprop_library API stability check" into stage-aosp-master
Inseob Kim [Thu, 22 Aug 2019 03:15:40 +0000 (20:15 -0700)]
Merge "Implement sysprop_library API stability check" into stage-aosp-master
am: 90b0395647

Change-Id: I8e030377c2377e80695ae9cc1e2004b04fe1ee5a

5 years agoMerge "Implement sysprop_library API stability check" into stage-aosp-master
Inseob Kim [Thu, 22 Aug 2019 02:52:17 +0000 (02:52 +0000)]
Merge "Implement sysprop_library API stability check" into stage-aosp-master

5 years agoMerge "Adapt to google::protobuf::int64 type change" into stage-aosp-master
Colin Cross [Wed, 21 Aug 2019 21:36:34 +0000 (14:36 -0700)]
Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master
am: e9a702d526

Change-Id: I6c7aeebfaa57bc45615c2c6dcabbcafdd34942bd

5 years agoMerge "Adapt to google::protobuf::int64 type change" into stage-aosp-master
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

5 years agoMerge "Wait until any background events are processed." into stage-aosp-master
Raman Tenneti [Wed, 21 Aug 2019 19:09:54 +0000 (12:09 -0700)]
Merge "Wait until any background events are processed." into stage-aosp-master
am: 0589325300

Change-Id: I198e5863a5f4f3e8b7dec0e5ae13be2548719285

5 years agoMerge "Wait until any background events are processed." into stage-aosp-master
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

5 years agoMerge "Add a platform-compat-config to the framework services." am: 6162efbfa7
Anna Trostanetski [Wed, 21 Aug 2019 11:20:49 +0000 (04:20 -0700)]
Merge "Add a platform-compat-config to the framework services." am: 6162efbfa7
am: 8ee5669a5e

Change-Id: Ie340605827027e34d8a13dc0de19bcc6950b8d36

5 years agoMerge "Add a platform-compat-config to the framework services."
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

5 years agoMerge "Add a platform-compat-config to the framework services."
Anna Trostanetski [Wed, 21 Aug 2019 10:53:33 +0000 (10:53 +0000)]
Merge "Add a platform-compat-config to the framework services."

5 years agoMerge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383
zhuguangqing [Wed, 21 Aug 2019 01:45:34 +0000 (18:45 -0700)]
Merge "Modify start/stop condition for mScreenDozeTimer." am: 83ed488383
am: 8d8d85b93e

Change-Id: Iec45a370c282d9622408a825cb11530e755a210f

5 years agoImplement sysprop_library API stability check
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)

5 years agoMerge "Modify start/stop condition for mScreenDozeTimer."
zhuguangqing [Wed, 21 Aug 2019 01:22:19 +0000 (18:22 -0700)]
Merge "Modify start/stop condition for mScreenDozeTimer."
am: 83ed488383

Change-Id: I12ff8f6860a60519a9b029010fa1078d47ccfc25

5 years agoMerge "Modify start/stop condition for mScreenDozeTimer."
Treehugger Robot [Wed, 21 Aug 2019 00:44:40 +0000 (00:44 +0000)]
Merge "Modify start/stop condition for mScreenDozeTimer."

5 years agoMerge "TvInputManagerService patch" am: 11e60c0824
Baohe.Wang [Wed, 21 Aug 2019 00:28:26 +0000 (17:28 -0700)]
Merge "TvInputManagerService patch" am: 11e60c0824
am: 2891b74ac3

Change-Id: I56c59fe06a753784a965f47dd0b9ff58d472b808

5 years agoMerge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while...
Selim Cinek [Wed, 21 Aug 2019 00:22:49 +0000 (17:22 -0700)]
Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev
am: cceea08cc7

Change-Id: Iceec57c462cb844354dfb3b67ac111fde03f35be

5 years agoDO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked
Selim Cinek [Wed, 21 Aug 2019 00:22:41 +0000 (17:22 -0700)]
DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked
am: bdf71a0420

Change-Id: I36e20e3af9728bffed162b740fca1b9cd33589f6

5 years agoMerge "TvInputManagerService patch"
Baohe.Wang [Wed, 21 Aug 2019 00:14:51 +0000 (17:14 -0700)]
Merge "TvInputManagerService patch"
am: 11e60c0824

Change-Id: I32d0deab39df9a1ec2a2aaa012fccca307053db2

5 years agoMerge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while...
Selim Cinek [Tue, 20 Aug 2019 23:39:13 +0000 (23:39 +0000)]
Merge "DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked" into qt-dev

5 years agoMerge "TvInputManagerService patch"
Treehugger Robot [Tue, 20 Aug 2019 23:28:43 +0000 (23:28 +0000)]
Merge "TvInputManagerService patch"

5 years agoTvInputManagerService 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

5 years agoDO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked
Selim Cinek [Mon, 19 Aug 2019 18:57:11 +0000 (11:57 -0700)]
DO NOT MERGE: Fixed an issue where the notification icons wouldn't show while docked

Since we're using the pulsing state for docking, the icons would now
become clipped while pulsing.

Fixes: 139096431
Test: dock, observe notification icons showing
Change-Id: If251e6b18c03b2824b4d3ea4dab82d4a403565f1
Merged-In: I8f7bd7a6a0562942ed3e12f28705043722d177e8

5 years agoDisable testEnableRollbackTimeoutFailsRollback test.
Richard Uhler [Tue, 20 Aug 2019 19:21:41 +0000 (12:21 -0700)]
Disable testEnableRollbackTimeoutFailsRollback test.
am: 9a97acb842

Change-Id: I75966a82d934f4b9a5d9fb1bf90d649ad4244411

5 years agoDisable testEnableRollbackTimeoutFailsRollback test.
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)

5 years ago[automerger skipped] Merge "Add agent startup-attach" am: 2214ede1ec -s ours
Alex Light [Tue, 20 Aug 2019 17:10:14 +0000 (10:10 -0700)]
[automerger skipped] Merge "Add agent startup-attach" am: 2214ede1ec -s ours
am: ae856b049a -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: Iaa4a0c56345b4ba8f1f77f5a43f4f5cc6ef1823d

5 years ago[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks...
Jiyong Park [Tue, 20 Aug 2019 17:00:33 +0000 (10:00 -0700)]
[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" am: bd8e232e20 -s ours
am: 439de8d1ee -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 0c6dc7b709 is in history

Change-Id: I3e58d5b3d1e812ab40713cdff54c84a8742a77d2

5 years ago[automerger skipped] Merge "Add agent startup-attach"
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

5 years ago[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks...
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

5 years agoMerge "Add agent startup-attach"
Treehugger Robot [Tue, 20 Aug 2019 16:20:23 +0000 (16:20 +0000)]
Merge "Add agent startup-attach"

5 years ago[automerger skipped] Merge "Add agent startup-attach" into stage-aosp-master
Alex Light [Tue, 20 Aug 2019 16:14:06 +0000 (09:14 -0700)]
[automerger skipped] Merge "Add agent startup-attach" into stage-aosp-master
am: 366a542843 -s ours
am skip reason: change_id Ib82b27df90c7964a995288d8b2b3d348a11cdd80 with SHA1 ca8502a7f5 is in history

Change-Id: I7b4caae0fe0503363d23f6b93dae8822af451766

5 years agoMerge "glob pattern is used for AIDL files under frameworks/base"
Treehugger Robot [Tue, 20 Aug 2019 16:12:23 +0000 (16:12 +0000)]
Merge "glob pattern is used for AIDL files under frameworks/base"

5 years agoMerge "Add agent startup-attach" into stage-aosp-master
Alex Light [Tue, 20 Aug 2019 15:39:48 +0000 (15:39 +0000)]
Merge "Add agent startup-attach" into stage-aosp-master

5 years ago[automerger skipped] Merge "Start platform compat service eariler." am: c0442d5b80...
Anna Trostanetski [Tue, 20 Aug 2019 12:25:41 +0000 (05:25 -0700)]
[automerger skipped] Merge "Start platform compat service eariler." am: c0442d5b80 -s ours
am: a365bd024e -s ours
am skip reason: change_id Ie1130a3f0bdd1769fe0755db0089702ea64d9db6 with SHA1 8266ae32ba is in history

Change-Id: I0d7b15dd953d22e79f41aaff43c011b3d047a24f

5 years ago[automerger skipped] Merge "Start platform compat service eariler."
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

5 years agoMerge "Start platform compat service eariler."
Anna Trostanetski [Tue, 20 Aug 2019 11:00:40 +0000 (11:00 +0000)]
Merge "Start platform compat service eariler."

5 years ago[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks...
Jiyong Park [Tue, 20 Aug 2019 09:46:45 +0000 (02:46 -0700)]
[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp-master
am: 665258fc50 -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 f20f181c53 is in history

Change-Id: I2b7a81f27987040d1cc292130a87f60ec2129ffc

5 years agoMerge "glob pattern is used for AIDL files under frameworks/base" into stage-aosp...
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

5 years agoMerge "Start platform compat service eariler." into stage-aosp-master
Anna Trostanetski [Tue, 20 Aug 2019 09:25:13 +0000 (02:25 -0700)]
Merge "Start platform compat service eariler." into stage-aosp-master
am: 4535b04b33

Change-Id: Ie41d2286e869bf84362919a183f4bad348dfc945

5 years agoMerge "Start platform compat service eariler." 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

5 years agoglob pattern is used for AIDL files under frameworks/base
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

5 years agoglob pattern is used for AIDL files under frameworks/base
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

5 years agoMerge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus...
TreeHugger Robot [Tue, 20 Aug 2019 04:15:15 +0000 (04:15 +0000)]
Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp

5 years agoMerge "Do not notify SS change with invalid subId" am: 3878f50107
Jordan Liu [Tue, 20 Aug 2019 00:34:02 +0000 (17:34 -0700)]
Merge "Do not notify SS change with invalid subId" am: 3878f50107
am: 77e183ba6e

Change-Id: I5ac6db21166a18f64b7cd4a9ae6d0b305c4b9523

5 years agoMerge "Do not notify SS change with invalid subId"
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

5 years agoglob pattern is used for AIDL files under frameworks/base
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

5 years agoMerge "Do not notify SS change with invalid subId"
Jordan Liu [Mon, 19 Aug 2019 23:57:24 +0000 (23:57 +0000)]
Merge "Do not notify SS change with invalid subId"

5 years agoWait until any background events are processed.
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)

5 years agoMerge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59
Yifan Hong [Mon, 19 Aug 2019 21:01:18 +0000 (14:01 -0700)]
Merge "BatteryService: scheduleUpdate asynchronously" am: 238a04ef59
am: 8eec5d9ee4

Change-Id: I97342299680ab5e89ad6fb53c7a24c469c30a4d3

5 years ago[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours
Siarhei Vishniakou [Mon, 19 Aug 2019 20:47:25 +0000 (13:47 -0700)]
[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours
am: 2a051239f9 -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: I9af92a9410bfee55e238631e1e27245e5bbab129

5 years agoMerge "BatteryService: scheduleUpdate asynchronously"
Yifan Hong [Mon, 19 Aug 2019 20:47:09 +0000 (13:47 -0700)]
Merge "BatteryService: scheduleUpdate asynchronously"
am: 238a04ef59

Change-Id: I77add2054b9f9e1c19067dfa169476a9e9d583f6

5 years ago[automerger skipped] Merge changes Ie18bce98,I1c600bc2
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

5 years agoDo not notify SS change with invalid subId
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

5 years agoMerge "WebView: prettyprint docs" into qt-dev
Nate Fischer [Mon, 19 Aug 2019 20:22:57 +0000 (13:22 -0700)]
Merge "WebView: prettyprint docs" into qt-dev
am: 20f2f0b5ea

Change-Id: I30af1cf394092fa83c376e96f9d174bd456b6026

5 years agoMerge "BatteryService: scheduleUpdate asynchronously"
Yifan Hong [Mon, 19 Aug 2019 20:14:15 +0000 (20:14 +0000)]
Merge "BatteryService: scheduleUpdate asynchronously"

5 years agoMerge changes Ie18bce98,I1c600bc2
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

5 years agoMerge "WebView: prettyprint docs" into qt-dev
TreeHugger Robot [Mon, 19 Aug 2019 19:06:32 +0000 (19:06 +0000)]
Merge "WebView: prettyprint docs" into qt-dev

5 years agoAdd keylayout for Xbox One USB controller
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

5 years agoKeylayout for xbox controllers
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

5 years agoMerge "Add agent startup-attach" into qt-dev-plus-aosp
TreeHugger Robot [Mon, 19 Aug 2019 17:32:25 +0000 (17:32 +0000)]
Merge "Add agent startup-attach" into qt-dev-plus-aosp

5 years agoStart platform compat service eariler.
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

5 years agoStart platform compat service eariler.
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

5 years agoAdd a platform-compat-config to the framework services.
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

5 years agoMerge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e
Leland Miller [Mon, 19 Aug 2019 15:14:28 +0000 (08:14 -0700)]
Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e
am: 6ef5b6c183

Change-Id: I602eafce4122063c07e6ff09f61f5ca43f47a0f4

5 years agoMerge "Fix incorrect descriptions under SMS contract"
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

5 years agoMerge "Fix incorrect descriptions under SMS contract"
Treehugger Robot [Mon, 19 Aug 2019 14:22:21 +0000 (14:22 +0000)]
Merge "Fix incorrect descriptions under SMS contract"

5 years agoMerge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac
satayev [Mon, 19 Aug 2019 09:47:37 +0000 (02:47 -0700)]
Merge "Cover framework code in hiddenapi-mappings." am: d39df1d0ac
am: ad6cf4a97c

Change-Id: Ia14fb9b3d20f0f0304232c816c0546a71ece15a1

5 years agoMerge "Cover framework code in hiddenapi-mappings."
satayev [Mon, 19 Aug 2019 09:37:47 +0000 (02:37 -0700)]
Merge "Cover framework code in hiddenapi-mappings."
am: d39df1d0ac

Change-Id: Ia3d88cfe55d48959d56fd8755d72d1eb4107d0bd

5 years agoMerge "Cover framework code in hiddenapi-mappings."
satayev [Mon, 19 Aug 2019 09:13:55 +0000 (09:13 +0000)]
Merge "Cover framework code in hiddenapi-mappings."

5 years agoBatteryService: scheduleUpdate asynchronously
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

5 years agoCover framework code in hiddenapi-mappings.
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

5 years agoAdd agent startup-attach
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

5 years agoMerge "API updated for ICU4J 64.2" am: 4c322503bb
vichang [Fri, 16 Aug 2019 11:16:57 +0000 (04:16 -0700)]
Merge "API updated for ICU4J 64.2" am: 4c322503bb
am: 5cff30ded7

Change-Id: I212e16bc49edf03c3d07f8c064582f98bfb4d38f

5 years agoMerge "API updated for ICU4J 64.2"
vichang [Fri, 16 Aug 2019 11:01:41 +0000 (04:01 -0700)]
Merge "API updated for ICU4J 64.2"
am: 4c322503bb

Change-Id: Ifc90aefe3f13a82c6b484362216ecc2d82099082

5 years agoMerge "API updated for ICU4J 64.2"
vichang [Fri, 16 Aug 2019 10:50:08 +0000 (10:50 +0000)]
Merge "API updated for ICU4J 64.2"

5 years agoMerge "Update wifi interface ip state upon receiving ap disable event" am: 25d4c75c26
Jianpeng Li [Fri, 16 Aug 2019 05:56:22 +0000 (22:56 -0700)]
Merge "Update wifi interface ip state upon receiving ap disable event" am: 25d4c75c26
am: 8e27bc49d4

Change-Id: I0ae8f80c9a4019977e3a26d1f3ef4270a069137e

5 years agoMerge "Update wifi interface ip state upon receiving ap disable event"
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

5 years agoMerge "Update wifi interface ip state upon receiving ap disable event"
Treehugger Robot [Fri, 16 Aug 2019 05:15:12 +0000 (05:15 +0000)]
Merge "Update wifi interface ip state upon receiving ap disable event"

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor...
Xin Li [Fri, 16 Aug 2019 00:47:08 +0000 (17:47 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master
am: c64852517a -s ours
am skip reason: subject contains skip directive

Change-Id: I8cfc0d65ebe07ca52903e6f7a3570408394e5ad4

5 years ago[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463...
Xin Li [Thu, 15 Aug 2019 23:35:23 +0000 (16:35 -0700)]
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
am: 80860803a4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb510ec02656e59b851599f88ae31c6e10377fca

5 years agoMerge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage...
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

5 years agoMerge "Move Half implementations to libcore to allow ART optimizations" am: 6bf381b5b1
Hans Boehm [Thu, 15 Aug 2019 21:38:36 +0000 (14:38 -0700)]
Merge "Move Half implementations to libcore to allow ART optimizations" am: 6bf381b5b1
am: eaad9ac3e2

Change-Id: I05dd47313bee0bfe3a871a65dbfd28a658cbbd13

5 years agoMerge "Move Half implementations to libcore to allow ART optimizations"
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

5 years ago[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar...
Anna Trostanetski [Thu, 15 Aug 2019 20:44:47 +0000 (13:44 -0700)]
[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar" am: 1261967c52 -s ours
am: 1d57038e6d -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1 fee45aa4dc is in history

Change-Id: I6d9f1abf1f0f9c77d64614f8bb2cb5e193d5f8a1

5 years agoMerge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
satayev [Thu, 15 Aug 2019 20:39:04 +0000 (13:39 -0700)]
Merge "Move telephony/cdma/ classes into appropriate package." am: 46c04b7bb8
am: 4a607da02b

Change-Id: I1516a6375c546f4af54984a4bff2ab2dcbc1783c

5 years agoMerge "Move Half implementations to libcore to allow ART optimizations"
Hans Boehm [Thu, 15 Aug 2019 20:35:13 +0000 (20:35 +0000)]
Merge "Move Half implementations to libcore to allow ART optimizations"

5 years ago[automerger skipped] Merge "API: Explicitly track incompatibilities with previous...
Adrian Roos [Thu, 15 Aug 2019 20:30:22 +0000 (13:30 -0700)]
[automerger skipped] Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev
am: d3b53e080d -s ours
am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 369246b4cc is in history

Change-Id: Icac6f223315835821685d2e1f16f7a8aa35c465b

5 years ago[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar"
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

5 years agoMerge "Move telephony/cdma/ classes into appropriate package."
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

5 years ago[automerger skipped] API: Explicitly track incompatibilities with previous API versions
Adrian Roos [Thu, 15 Aug 2019 20:16:38 +0000 (13:16 -0700)]
[automerger skipped] API: Explicitly track incompatibilities with previous API versions
am: 369246b4cc -s ours
am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 9597f8c84f is in history

Change-Id: Iac468779fa5baa6e68704bab5b9f1e1d80643156

5 years agoMerge "Move IPlatformCompat.aidl definition to framework.jar"
Anna Trostanetski [Thu, 15 Aug 2019 19:34:09 +0000 (19:34 +0000)]
Merge "Move IPlatformCompat.aidl definition to framework.jar"

5 years agoUpdate wifi interface ip state upon receiving ap disable event
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

5 years agoMerge "API: Explicitly track incompatibilities with previous API versions" into qt-dev
TreeHugger Robot [Thu, 15 Aug 2019 18:07:32 +0000 (18:07 +0000)]
Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev

5 years agoMerge "Move telephony/cdma/ classes into appropriate package."
satayev [Thu, 15 Aug 2019 17:29:37 +0000 (17:29 +0000)]
Merge "Move telephony/cdma/ classes into appropriate package."

5 years agoMerge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master
Anna Trostanetski [Thu, 15 Aug 2019 14:02:57 +0000 (07:02 -0700)]
Merge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master
am: 77a833f3e0

Change-Id: I8d9d5bcaed39facc14e72289db3b4896b162f54d

5 years agoMerge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master
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

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801...
Xin Li [Thu, 15 Aug 2019 07:20:44 +0000 (00:20 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 5937562bfb -s ours
am: c45017650c -s ours
am skip reason: subject contains skip directive

Change-Id: Icd996e35bd851ac5fbadd7a0ce064af800c740ca

5 years ago[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801...
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

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002)...
Xin Li [Thu, 15 Aug 2019 06:51:39 +0000 (23:51 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 1702a9da19 -s ours
am: 387550abfd -s ours
am skip reason: subject contains skip directive

Change-Id: Ia74421a52fa2611b4a70d8b1c445fa1c105867be

5 years ago[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002)...
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