OSDN Git Service

android-x86/frameworks-base.git
5 years agoAdded debug messages and watchdog am: 594931f5d9
Jack Yu [Fri, 23 Aug 2019 10:06:51 +0000 (03:06 -0700)]
Added debug messages and watchdog am: 594931f5d9
am: 75db0a70dd

Change-Id: I54bc7865d6abe84225daea1316b6b7425e40d63b

5 years agoMerge "Add geo targeting implementation" am: df2293f68b
Pengquan Meng [Fri, 23 Aug 2019 10:02:24 +0000 (03:02 -0700)]
Merge "Add geo targeting implementation" am: df2293f68b
am: 52cd1fe0f1

Change-Id: I85db283d7a47a8fcaf07256aec783c0f91540e40

5 years agoMerge "Added Part & Addr Constants." am: f5d5de8a0f
Nagaraja [Fri, 23 Aug 2019 09:58:48 +0000 (02:58 -0700)]
Merge "Added Part & Addr Constants." am: f5d5de8a0f
am: 633db92447

Change-Id: I8606aed63df7fb46f805acadf3973f8f4dfe7d33

5 years agoMerge "Rename android.compat.IPlatformCompat" am: ee716a23a2
Anna Trostanetski [Fri, 23 Aug 2019 09:54:36 +0000 (02:54 -0700)]
Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2
am: 81af0fc8bb

Change-Id: I815189c133f274d1a754327807915a02e642a44b

5 years agoMerge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c
Tobias Thierer [Fri, 23 Aug 2019 09:53:18 +0000 (02:53 -0700)]
Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c
am: 41438c3730

Change-Id: Id2c69ea4d9e0c75c871ab4ff3f7e609e4e2746cb

5 years agoMerge "avoid generating reserved local MACs" am: e5d5b73109
Oscar Shu [Fri, 23 Aug 2019 09:52:20 +0000 (02:52 -0700)]
Merge "avoid generating reserved local MACs" am: e5d5b73109
am: 65a98b4002

Change-Id: Id195e44b72fb0f92f4b12fb9a269b39227d1ee0d

5 years agoAdded debug messages and watchdog
Jack Yu [Fri, 23 Aug 2019 09:38:59 +0000 (02:38 -0700)]
Added debug messages and watchdog
am: 594931f5d9

Change-Id: Iaa6d60382dba87a19f6794201caf51ea7f90d23c

5 years agoMerge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a
Tobias Thierer [Fri, 23 Aug 2019 09:33:50 +0000 (02:33 -0700)]
Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a
am: 3f1d5d92fc

Change-Id: Ie30ff146804d651ddf922ea790150fbd57a9281d

5 years agoMerge "Add geo targeting implementation"
Pengquan Meng [Fri, 23 Aug 2019 09:32:14 +0000 (02:32 -0700)]
Merge "Add geo targeting implementation"
am: df2293f68b

Change-Id: Iaa8d3d72bff57cbbd36b9f5ed63807fef2a0b119

5 years agoMerge "Added Part & Addr Constants."
Nagaraja [Fri, 23 Aug 2019 09:28:01 +0000 (02:28 -0700)]
Merge "Added Part & Addr Constants."
am: f5d5de8a0f

Change-Id: Ieac6f8911910c9fea16d60457b5108222f68ca92

5 years agoMerge "Rename android.compat.IPlatformCompat"
Anna Trostanetski [Fri, 23 Aug 2019 09:26:15 +0000 (02:26 -0700)]
Merge "Rename android.compat.IPlatformCompat"
am: ee716a23a2

Change-Id: I88fd93b46bcaa5ed782c407f2a9e9469fb0f5f0e

5 years agoMerge "Tweak RuntimeInit docs around MimeMap registration."
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

5 years agoMerge "avoid generating reserved local MACs"
Oscar Shu [Fri, 23 Aug 2019 09:24:15 +0000 (02:24 -0700)]
Merge "avoid generating reserved local MACs"
am: e5d5b73109

Change-Id: Ia6d0eb0c5e8101d9c4b4bc63de79157f7d1c2284

5 years agoMerge "Move default MimeMap implementation to frameworks."
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

5 years agoMerge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage...
Neil Fuller [Fri, 23 Aug 2019 09:04:15 +0000 (02:04 -0700)]
Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master
am: 6948bc8ce1

Change-Id: I14075dad9f3242425b11ff78ed74e87acaad289d

5 years agoMerge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage...
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

5 years ago[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into...
Remi NGUYEN VAN [Fri, 23 Aug 2019 03:19:53 +0000 (20:19 -0700)]
[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master
am: d3f8bbc6c0 -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history

Change-Id: I25e6a04e2e8dc7802b25b873612624a5f7cf791a

5 years agoMerge "Remove DeviceConfig usage from NetworkStackClient" 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

5 years agoMerge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy...
Android Build Merger (Role) [Thu, 22 Aug 2019 22:57:07 +0000 (22:57 +0000)]
Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history" into qt-dev-plus-aosp

5 years ago[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check
Yi Kong [Thu, 22 Aug 2019 22:56:14 +0000 (15:56 -0700)]
[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check
am: fbafa5162a -s ours
am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history

Change-Id: I1c7732303fd16e3de76712fe9f3b2f079a0589a0

5 years agoMerge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp
TreeHugger Robot [Thu, 22 Aug 2019 22:54:57 +0000 (22:54 +0000)]
Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp

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)
(cherry picked from commit a0914d81ef9f4d7258f1530dc3bfdd575f6e448d)

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 agoresolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp...
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

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 agoRemove DeviceConfig usage from NetworkStackClient
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)

5 years agoAdded debug messages and watchdog
Jack Yu [Wed, 14 Aug 2019 09:32:17 +0000 (02:32 -0700)]
Added debug messages and watchdog

Added debug messages and watchdog to catch
unresponsive data service issue.

Bug: 139076980
Test: Manual
Merged-In: I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5
Change-Id: I52dd126fddc1b1e8b18d5388a92aabaa3e2e48d5
(cherry picked from commit 36e2bfbaad3e1edcbb3ad0bf2be1e94643c38b07)

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 "Add geo targeting implementation"
Pengquan Meng [Thu, 22 Aug 2019 00:04:10 +0000 (00:04 +0000)]
Merge "Add geo targeting implementation"

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 "Added Part & Addr Constants."
Treehugger Robot [Wed, 21 Aug 2019 21:18:31 +0000 (21:18 +0000)]
Merge "Added Part & Addr Constants."

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 agoAdd geo targeting implementation
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)

5 years agoMerge "Rename android.compat.IPlatformCompat"
Anna Trostanetski [Wed, 21 Aug 2019 19:46:39 +0000 (19:46 +0000)]
Merge "Rename android.compat.IPlatformCompat"

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 "Tweak RuntimeInit docs around MimeMap registration."
Treehugger Robot [Wed, 21 Aug 2019 18:38:41 +0000 (18:38 +0000)]
Merge "Tweak RuntimeInit docs around MimeMap registration."

5 years agoMerge "avoid generating reserved local MACs"
Oscar Shu [Wed, 21 Aug 2019 17:45:00 +0000 (17:45 +0000)]
Merge "avoid generating reserved local MACs"

5 years agoMerge "Move default MimeMap implementation to frameworks."
Treehugger Robot [Wed, 21 Aug 2019 16:39:33 +0000 (16:39 +0000)]
Merge "Move default MimeMap implementation to frameworks."

5 years agoRename android.compat.IPlatformCompat
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

5 years agoTweak RuntimeInit docs around MimeMap registration.
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

5 years agoMerge "Add entry to OWNERS."
Santos Cordon [Wed, 21 Aug 2019 15:24:46 +0000 (15:24 +0000)]
Merge "Add entry to OWNERS."

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

5 years agoMove default MimeMap implementation to frameworks.
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

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