OSDN Git Service
junyulai [Mon, 13 May 2019 06:19:00 +0000 (14:19 +0800)]
Fix concurrent modification exception in KeepaliveTracker
In aosp/951200, the clean up function delete the item in the
hash map that holds the record while iterating it, where the
list used to iterate the records is backed by the hash map,
so changes to the map are reflected in the list and caused
the concurrent modification exception.
Bug:
132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 300
2. atest FrameworksNetTests --generate-new-metrics 10
(Clean cherry-pick of aosp/959599)
Change-Id: I9cdfe6f6d11c5400c856cc30a33ff4a44ba9d811
Merged-In: I0481a469ee23231e5f0ab738a06b5e09f6cdb680
Junyu Lai [Thu, 9 May 2019 20:24:32 +0000 (13:24 -0700)]
Clean up the keepalive slots when network disconnect
In general, keepalive slots are released after result of
stopping has returned. However, for network disconnect case,
the service side cannot communicate with network agent since
the async channel is broken.
Clean up keepalive slots right after stop in this case.
Bug:
132341736
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
2. atest FrameworksNetTests --generate-new-metrics 10
Change-Id: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f
(cherry picked from commit
a5f6bd16062fba89bcf900aca93aa3514d93f662)
Merged-In: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f
Merged-In: Icb5a1b5bb10617aa5a7b35db6cf48db3dc53b7fd
Junyu Lai [Tue, 16 Apr 2019 06:00:02 +0000 (23:00 -0700)]
Release keepalive slot after stopped
Currntly, keepalive slot is released when stop() is called. Next
starting keepalive can use the same slot number while previous
keepalive is still stopping. When the previous keepalive is
stopped, the incoming as will be processed by the new keepalive.
This change release keepalive slot after the result of stopping
has returned. Thus, newly created keepalive cannot allocate the
same slot number while lower layer is still processing stop event.
This change also disable flaky assertions that are caused by
test port has been occupied by other process.
Bug:
129512753
Test: 1. atest com.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
2. atest FrameworksNetTests --generate-new-metrics 10
3. simulate the fail case manually.
Change-Id: I790f6bbc5efc3f088034ac45ec379da5f781d0ca
Merged-In: I1991627545519ee5cb408a3df3a006f710f4af7b
(cherry picked from commit
3523a3d02a1f88a3990ab9cc4948c705ecc713c8)
Junyu Lai [Mon, 13 May 2019 09:44:49 +0000 (09:44 +0000)]
Merge changes I92f6d977,I06840834 into qt-dev
* changes:
Limit unprivileged keepalives per uid
Support customization of supported keepalive count per transport
Narayan Kamath [Mon, 13 May 2019 09:35:14 +0000 (09:35 +0000)]
Merge "MediaProjectionManagerService: Use the right user for app lookups." into qt-dev
Dario Freni [Mon, 13 May 2019 07:57:13 +0000 (07:57 +0000)]
Merge "Preserve active staged sessions." into qt-dev
Narayan Kamath [Mon, 13 May 2019 07:39:58 +0000 (07:39 +0000)]
Merge "Improve polish for the MediaProjectionPermissionActivity." into qt-dev
junyulai [Tue, 30 Apr 2019 06:42:05 +0000 (14:42 +0800)]
Limit unprivileged keepalives per uid
Public APIs for creating unprivileged NATT socket keepalive
might allow users to exhaust resource if malicious apps try
to create keepalives with fd which is not created by
IpSecService through binder call. Thus, this change add
customizable limitation per uid to prevent resource exhaustion
attack.
Bug:
129371366
Bug:
132307230
Test: atest FrameworksNetTests
Clean cherry-pick of aosp/954040
Merged-In: Ibcb91105e46f7e898b8aa7c2babc3344ef2c6257
Merged-In: Ia667386c1a8949839871a6949d79552d9c8b88f0
Change-Id: I92f6d977b6dfde4e1bf74df6b60c9a0b9e8eec40
junyulai [Wed, 17 Apr 2019 07:22:46 +0000 (15:22 +0800)]
Support customization of supported keepalive count per transport
This change specifies the required minimum supported keepalives
in SDK, and allows OEMs to customize supported keepalive count
per network through resource overlay.
Bug:
129371366
Test: 1. m -j doc-comment-check-docs
2. atest FrameworksNetTests
Clean cherry-pick of aosp/946359
Change-Id: I06840834d0ee8121358bf4829fe47ecf9964d395
Merged-In: I0218f3674628c13ead63fc9a873895ba7f113033
Merged-In: Ia667386c1a8949839871a6949d79552d9c8b88f0
TreeHugger Robot [Mon, 13 May 2019 03:42:27 +0000 (03:42 +0000)]
Merge "Update default home after preferred activity is changed." into qt-dev
TreeHugger Robot [Mon, 13 May 2019 03:36:47 +0000 (03:36 +0000)]
Merge "Fix RelativeLayout rules" into qt-dev
TreeHugger Robot [Mon, 13 May 2019 02:41:34 +0000 (02:41 +0000)]
Merge "Add CTS API coverage for APIs which are used by NetworkStack" into qt-dev
TreeHugger Robot [Mon, 13 May 2019 02:28:03 +0000 (02:28 +0000)]
Merge "Add ApfCapabilities common test cases" into qt-dev
TreeHugger Robot [Mon, 13 May 2019 02:23:43 +0000 (02:23 +0000)]
Merge "Add LinkProperties common test cases" into qt-dev
TreeHugger Robot [Mon, 13 May 2019 01:55:24 +0000 (01:55 +0000)]
Merge "Test updates for I044ac25a19ba5b7fd0ee470ca0a13dc65cbd2679" into qt-dev
Paul Hu [Sun, 12 May 2019 17:37:59 +0000 (10:37 -0700)]
Add ApfCapabilities common test cases
Bug:
129199900
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass
Change-Id: I737ab11ccd1bf6f92bae4eae21e67d4d6f86a758
Merged-In: Icfd80943212430b2a0e6a4b55f53270cbc3d1693
Merged-In: I737ab11ccd1bf6f92bae4eae21e67d4d6f86a758
(cherry picked from commit
ce54fa5cb392c38bfec62b81664fcc25098eb9dc)
Wei Sheng Shih [Mon, 13 May 2019 01:17:19 +0000 (01:17 +0000)]
Merge "Fixed an issue that activity might be invisible after unlocking." into qt-dev
Paul Hu [Fri, 10 May 2019 22:28:40 +0000 (15:28 -0700)]
Add LinkProperties common test cases
Bug:
129198747
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases: added tests pass
Change-Id: I03d162ea3c5bc2ccb8f913bbfdf85ebcd194c35a
Merged-In: I8d36177cbf4f39da602331e091a60a40f6eaea33
Merged-In: I03d162ea3c5bc2ccb8f913bbfdf85ebcd194c35a
(cherry picked from commit
385757291c2e822f1338157a2368e319d4048c89)
TreeHugger Robot [Sun, 12 May 2019 16:31:18 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Jeff Sharkey [Sun, 12 May 2019 14:12:39 +0000 (14:12 +0000)]
Merge "Legacy insertImage() should use IS_PENDING." into qt-dev
Jeff Sharkey [Sun, 12 May 2019 14:12:11 +0000 (14:12 +0000)]
Merge "Parse Exif OffsetTime in MediaScanner" into qt-dev
Bill Yi [Sun, 12 May 2019 10:07:25 +0000 (03:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2e30d2410efdf2a4b45f5e8d4953df4e6d1c9b6f
TreeHugger Robot [Sun, 12 May 2019 05:43:32 +0000 (05:43 +0000)]
Merge "[InformationElementUtil] Add FT/SAE AKM" into qt-dev
TreeHugger Robot [Sun, 12 May 2019 04:29:40 +0000 (04:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sun, 12 May 2019 04:27:41 +0000 (04:27 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Jeff Sharkey [Sun, 12 May 2019 02:51:57 +0000 (20:51 -0600)]
Legacy insertImage() should use IS_PENDING.
Also stream known file directly into place instead of doing a lossy
and expensive transcode.
Bug:
131710636
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: Icbfe4f79725c705a1197296f1fd4518c0179a9c1
TreeHugger Robot [Sun, 12 May 2019 02:43:06 +0000 (02:43 +0000)]
Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev
Ken Narita [Fri, 7 Sep 2018 08:06:25 +0000 (17:06 +0900)]
Parse Exif OffsetTime in MediaScanner
MediaScanner parses Exif OffsetTime value to use UTC time
for DATE_TAKEN value.
Bug:
62856173
Change-Id: Iffb7e0ae296b73ce6fb6515246871f0dcfe42bb0
Bill Yi [Sat, 11 May 2019 23:48:41 +0000 (16:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I22ecd11b2e010cc3d66d51f62d19a8bc3c1a1a99
Tracy Zhou [Sat, 11 May 2019 15:56:43 +0000 (15:56 +0000)]
Merge "Set the correct PiP mode at the end of the PiP animation." into qt-dev
Bill Yi [Sat, 11 May 2019 14:42:57 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id3aa933df80ac51807ff69693287d82d1b2aefe2
Yuncheol Heo [Wed, 8 May 2019 21:52:20 +0000 (14:52 -0700)]
Workaround to make CarSystemUi work on the multiple displays.
Bug:
132204986
Change-Id: I04af78bd23e1d4983845751535639587396092f5
Test: Check if the facet buttons are properly selected in the multi
displays.
Yuncheol Heo [Sat, 11 May 2019 13:09:50 +0000 (13:09 +0000)]
Merge "Add CarPowerChanged, GarageModeInfo atom." into qt-dev
TreeHugger Robot [Sat, 11 May 2019 07:11:05 +0000 (07:11 +0000)]
Merge "Implement pending notification indicator" into qt-dev
Tracy Zhou [Tue, 7 May 2019 23:32:02 +0000 (16:32 -0700)]
Set the correct PiP mode at the end of the PiP animation.
Previously, we didn't update the PiP at the end of the PiP animation
when the animation type if FADE_IN. That results in map getting stuck
in the PiP even after user puts the PiP window back to fullscreen. This
change takes care of it by covering the FADE_IN case.
Fixes:
129545599
Fixes:
130550078
Fixes:
131812563
Test: atest PinnedStackTests
Change-Id: Ib40b9c6bafaa50f2f0b03cb88ae819bfe75547b5
Yuncheol Heo [Thu, 9 May 2019 00:13:42 +0000 (17:13 -0700)]
Add CarPowerChanged, GarageModeInfo atom.
Bug:
131688824
Bug:
131086247
Test: It builds.
Change-Id: Ie67ea04107c6aa2929a1e6b859ddabda8494437e
Jonathan Koo [Mon, 6 May 2019 15:20:14 +0000 (08:20 -0700)]
Implement pending notification indicator
Bug:
131262206
Test: Manual.
Change-Id: I25a2892b55ea9761823dee1596cbf5d189b95dd7
(cherry picked from commit
61d832588a575a108cc86709edca5a4e8a512aad)
TreeHugger Robot [Sat, 11 May 2019 04:17:40 +0000 (04:17 +0000)]
Merge "Creating a new private styles/dimens for action bar" into qt-dev
TreeHugger Robot [Sat, 11 May 2019 03:01:50 +0000 (03:01 +0000)]
Merge changes from topics "role-dialer-dialog", "role-sms-dialog" into qt-dev
* changes:
Deprecate intent action to the old changing default dialer/SMS dialogs.
Remove TelecomManager.ACTION_CHANGE_DEFAULT_DIALER for apps targeting Q.
Remove Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT for apps targeting Q.
Philip P. Moltmann [Sat, 11 May 2019 02:28:17 +0000 (02:28 +0000)]
Merge "Call grantOrUpgradeDefaultRuntimePerms for new usr" into qt-dev
John Choi [Wed, 8 May 2019 00:12:04 +0000 (17:12 -0700)]
Creating a new private styles/dimens for action bar
Bug:
130377115
Test: manual
Change-Id: I790c50c883269a87f24b916f0c126a9d691b3f0a
Kevin Chyn [Sat, 11 May 2019 01:52:47 +0000 (01:52 +0000)]
Merge changes I50af022a,I82b77ec1 into qt-dev
* changes:
Do not vibrate if last acquire message was NOT_DETECTED
Persist dialog state across configuration change
Hai Zhang [Sat, 11 May 2019 01:13:47 +0000 (18:13 -0700)]
Update default home after preferred activity is changed.
Or the update won't find any change for preferred activity.
Bug:
132208447
Test: presubmit
Change-Id: Ic8e0173518efefec033ab39a9e6697f8c862dd60
Peiyong Lin [Sat, 11 May 2019 01:11:27 +0000 (01:11 +0000)]
Merge "Use SRGB instead of nullptr when create hardware bitmap." into qt-dev
Ryan Mitchell [Sat, 11 May 2019 00:44:52 +0000 (17:44 -0700)]
Fix RelativeLayout rules
A previous change restricted rules that are added to the rule dependency
graph to resource ids rather than just integers greater that zero.
Restore the previous behavior and also allow for negative resource ids
to work as expected.
Bug:
132447676
Test: loaded maps and view looks as expected
Change-Id: I88d86c77c696d1e494a743fdd2e398283383c64e
Hai Zhang [Fri, 3 May 2019 07:31:43 +0000 (15:31 +0800)]
Deprecate intent action to the old changing default dialer/SMS dialogs.
Bug:
124452117
Bug:
131204827
Test: presubmit
Change-Id: Iee636cf2dbcf4bdda5fc487d6883591e9463b0af
Hai Zhang [Wed, 1 May 2019 06:16:23 +0000 (14:16 +0800)]
Remove TelecomManager.ACTION_CHANGE_DEFAULT_DIALER for apps targeting Q.
This intent supported starting with startActivity() so we may not be
able to get caller information in the started activity, hence remove
it for apps targeting Q and later here.
Bug:
124452117
Bug:
131204827
Test: presubmit
Change-Id: Ifd05c6797d01df42d92489d5d2e0c55231cbde2d
Hai Zhang [Wed, 1 May 2019 05:46:06 +0000 (13:46 +0800)]
Remove Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT for apps targeting Q.
This intent supported starting with startActivity() so we may not be
able to get caller information in the started activity, hence remove
it for apps targeting Q and later here.
Bug:
124452117
Bug:
131204827
Test: presubmit
Change-Id: I261d6b6ccd42e148789ed03f7b3e8268b2f62480
TreeHugger Robot [Sat, 11 May 2019 00:46:36 +0000 (00:46 +0000)]
Merge "Grant STATUS_BAR permission to com.android.shell" into qt-dev
TreeHugger Robot [Sat, 11 May 2019 00:09:22 +0000 (00:09 +0000)]
Merge "DO NOT MERGE: Delete persisted historical app ops on package uninstall" into qt-dev
TreeHugger Robot [Sat, 11 May 2019 00:01:51 +0000 (00:01 +0000)]
Merge "Loosen the user id check for master mute on automotive" into qt-dev
Jorim Jaggi [Fri, 10 May 2019 23:43:07 +0000 (23:43 +0000)]
Merge "Don't take activity options that contain remote animation" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 23:33:39 +0000 (23:33 +0000)]
Merge "Add extra comment for implementation." into qt-dev
TreeHugger Robot [Fri, 10 May 2019 23:33:28 +0000 (23:33 +0000)]
Merge "MediaPLayer: remove unused code" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 23:19:38 +0000 (23:19 +0000)]
Merge "Disable dark mode tile when in battery saver" into qt-dev
Michael Groover [Fri, 10 May 2019 22:54:54 +0000 (22:54 +0000)]
Merge "Remove keys from adb_keys after period of inactivity" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 22:22:37 +0000 (22:22 +0000)]
Merge "Clarify required/optional fields in BubbleMetadata." into qt-dev
TreeHugger Robot [Fri, 10 May 2019 22:13:22 +0000 (22:13 +0000)]
Merge "Do not show work profile encryption notification if already unlocked." into qt-dev
Philip P. Moltmann [Fri, 10 May 2019 22:01:32 +0000 (15:01 -0700)]
Call grantOrUpgradeDefaultRuntimePerms for new usr
... instead of always user 0
Bug:
132368462
Test: Installed work profile and made sure that
RESTRICTION_UPGRADE_EXEMPT was set on
android.permission.READ_EXTERNAL_STORAGE for com.google.android.contacts
Change-Id: Ic0489fb832c5f5192f2c2dc68b750fed8326604e
Lucas Dupin [Fri, 10 May 2019 21:45:42 +0000 (14:45 -0700)]
Disable dark mode tile when in battery saver
Test: toggle battery saver, try to toggle dark mode
Test: toggle battery saver, look at dark mode tile
Fixes:
132348329
Change-Id: I265309fb554637ac342c4cb360b03897d0b47b8f
TreeHugger Robot [Fri, 10 May 2019 21:45:42 +0000 (21:45 +0000)]
Merge "Fix the constant value for hidden BIND flag" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 21:25:32 +0000 (21:25 +0000)]
Merge "Document non-effective mode return of AppOps batch fetch" into qt-dev
Anil Admal [Fri, 10 May 2019 21:21:36 +0000 (21:21 +0000)]
Merge "Make non-framework emergency location notification configurable" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 21:16:11 +0000 (21:16 +0000)]
Merge "Notify OverviewProxyService of scrim colors" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 21:10:49 +0000 (21:10 +0000)]
Merge "Fix APC documentation" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 20:49:15 +0000 (20:49 +0000)]
Merge "Put SIM locked text in parenthesis" into qt-dev
Varun Shah [Fri, 10 May 2019 20:46:02 +0000 (20:46 +0000)]
Merge "Add DefaultContainerService to CleanSpec." into qt-dev
Hai Shalom [Fri, 10 May 2019 20:12:27 +0000 (13:12 -0700)]
[InformationElementUtil] Add FT/SAE AKM
Add FT/SAE AKM to InformationElementUtil class and parse it correctly so
that the phone would be able to associate with APs advertising it.
Added additional unit tests that were missing.
Bug:
132378498
Test: atest InformationElementUtilTest
Change-Id: I470e4e071de36dfe8f79475477c6077ed8bef3cb
Hai Shalom [Wed, 8 May 2019 21:39:50 +0000 (14:39 -0700)]
[WPA3] Fix connectivity issues with PSK-SAE Transtion mode
Fix two reported issues regarding PSK-SAE transition mode:
1. When phone supports SAE, creating a manual saved network with PSK
and manually connecting would cause the phone to connect but Settings
does not display any connected AP. Phone would not autoconnect.
2. When phone doesn't support SAE, phone cannot connect to an AP in
PSK-SAE Transition mode because the framework always targets the highest
security.
Bug:
132278271
Test: Connect to WPA2 network
Test: Connect to WPA3 network (w/capable phone)
Test: Connect to WPA2/3 Transition w/SAE capable phone
Test: Connect to WPA2/3 Transition w/SAE not-capable phone
Change-Id: I2e2db7a7583b0a8fabbe927e6ab1d04e3edbc000
Varun Shah [Fri, 10 May 2019 20:28:35 +0000 (13:28 -0700)]
Add DefaultContainerService to CleanSpec.
Bug:
132438832
Bug:
111838160
Test: builds and flashes.
Change-Id: Id76eb62c569911743097f1ff6136a9fbf9746510
William Hester [Fri, 10 May 2019 20:31:04 +0000 (20:31 +0000)]
Merge "Start THM outside of the frp block" into qt-dev
Daichi Hirono [Fri, 10 May 2019 20:19:57 +0000 (13:19 -0700)]
[automerger skipped] Stop invoke initAppOps in Camera default constructor.
am:
9799956531 -s ours
am skip reason: change_id Id738c4d46a8e3625bc3b1142b11acac9cfb0b603 with SHA1
2dba5c8417 is in history
Change-Id: I1ef23741d979ead55ccfbd9df49dc93fa0dfb9ea
Brad Ebinger [Fri, 10 May 2019 20:17:38 +0000 (20:17 +0000)]
Merge "Make getSimCallManager msim aware" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 20:14:54 +0000 (20:14 +0000)]
Merge "Remove temporary UserUsageStatsService logging" into qt-dev
Peiyong Lin [Fri, 10 May 2019 20:07:43 +0000 (13:07 -0700)]
Use SRGB instead of nullptr when create hardware bitmap.
BUG:
132153082
Test: Reproducible steps in the bug no longer reproducible.
Change-Id: I297e7d1f44cfc2157a39cea3d5ce968e5e45e095
Brad Ebinger [Fri, 10 May 2019 19:42:55 +0000 (19:42 +0000)]
Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev
* changes:
Trampoline SMS disambig dialog to Telephony
No longer show disambig when calling SmsManager#getSubId
Anil Admal [Fri, 10 May 2019 02:58:13 +0000 (19:58 -0700)]
Make non-framework emergency location notification configurable
Add carrier config parameter to enable/disable posting notification
in the status bar when device location is provided for non-framework
location requests in user initiated emergency use cases.
Bug:
130892418
Test: Manual verification
Change-Id: Ibd10f68c6804f7a6f72feb4fa7948ff5629bbeeb
Winson [Tue, 7 May 2019 23:29:59 +0000 (16:29 -0700)]
DO NOT MERGE: Delete persisted historical app ops on package uninstall
They're removed from the current state, but not the persisted state.
This adds HistoricalRegistry#clearHistoryForPackage which reads the
disk state, strips the corresponding UID/package, and re-writes
to disk.
Bug:
129796626
Test: manual test app with location access
Test: atest AppOpsServiceTest#testPackageRemovedHistoricalOps
Change-Id: I8daa2e3474b400a3789b2eaf178441c6d1578af1
Irina Dumitrescu [Thu, 9 May 2019 16:50:50 +0000 (17:50 +0100)]
Do not show work profile encryption notification if already unlocked.
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Fixes:
112892128
Change-Id: Ia6be7c2ec6e4724fe59acd32b988c69aefcc3b9c
Fabian Kozynski [Wed, 8 May 2019 20:06:51 +0000 (16:06 -0400)]
Put SIM locked text in parenthesis
Changes how SIM locked text is assembled in CarrierTextController. The
text is put in parenthesis after the carrier name (or replaces it if the
carrier name is blank). This way, the locked text is easily associated
with the corresponding carrier name.
Test: visual
Fixes:
130857483
Change-Id: I86c5156907b2d245855f8be8158459c30c060495
TreeHugger Robot [Fri, 10 May 2019 19:02:49 +0000 (19:02 +0000)]
Merge "GpuStats: track CPU Vulkan implementation usage" into qt-dev
Andrew Nguyen [Fri, 10 May 2019 18:55:11 +0000 (18:55 +0000)]
Merge "Add VehicleMapServicePacketReported and VehicleMapServicePacketFailureReported to atoms.proto." into qt-dev
Dario Freni [Fri, 10 May 2019 18:40:50 +0000 (19:40 +0100)]
Preserve active staged sessions.
If a staged session is pending, we should never garbage collect it.
Leave it to the installer to abandon the session if needed.
This is a partial revert of Ifaccf50e744a97e30a4fda0e47b88d7dc71adcf8.
In reality, this logic was correctly preserving non-final staged
sessions, and it was the condition in sealAndValidateIfNecessary that
previously caused the erroneous early garbage collection of staged
sessions in final state.
Fix:
132444450
Bug:
132444450
Test: staged a session, manually modified update timestamp, verified
that it's correctly applied on reboot. manually modified update
timestamp again, verified that it's correctly garbage collected.
Change-Id: I5fc568357fb8ec483d52056f5a805b09149cfec9
Andrew T Nguyen [Wed, 1 May 2019 21:40:19 +0000 (14:40 -0700)]
Add VehicleMapServicePacketReported and
VehicleMapServicePacketFailureReported to atoms.proto.
Test: none
Change-Id: I0c9933e11e4b9539546150e810e8332f51aa6382
Bug:
131921165
Chris Tate [Fri, 10 May 2019 18:51:28 +0000 (18:51 +0000)]
Merge "Properly reset doze transition alarms with force-stop" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 18:46:49 +0000 (18:46 +0000)]
Merge "Null check ApplicationInfo for ApplicationPackageManager#loadUnbadgedItemIcon" into qt-dev
Andrii Kulian [Fri, 10 May 2019 18:40:06 +0000 (18:40 +0000)]
Merge "Update resizeableActivity docs" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 18:35:38 +0000 (18:35 +0000)]
Merge "The AdminSupportDetails intent creation preserves the original admin user ID." into qt-dev
TreeHugger Robot [Fri, 10 May 2019 18:15:13 +0000 (18:15 +0000)]
Merge "Add extra debug to capture system state" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 18:14:02 +0000 (18:14 +0000)]
Merge "Notify UI update when get onAudioModeChanged() callback" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 18:10:44 +0000 (18:10 +0000)]
Merge "Dump package settings for shared users" into qt-dev
Joe Onorato [Fri, 10 May 2019 18:09:56 +0000 (18:09 +0000)]
Merge "Fix another copy and paste of the copy and paste error." into qt-dev
Kevin Rocard [Fri, 3 May 2019 00:55:35 +0000 (17:55 -0700)]
Fix APC documentation
Bug:
129948989
Test: m -j offline-sdk-docs
Change-Id: I0205979e37f397794e0dc4f390ad4aad5c74c630
Signed-off-by: Kevin Rocard <krocard@google.com>
Lucas Dupin [Thu, 9 May 2019 18:30:56 +0000 (11:30 -0700)]
Notify OverviewProxyService of scrim colors
Bug:
130451254
Test: manual
Test: atest SysuiColorExtractorTests
Change-Id: I0ce271d3250ff5292a8e195c4c19ee99328ebad4
Winson [Fri, 10 May 2019 17:34:14 +0000 (10:34 -0700)]
Document non-effective mode return of AppOps batch fetch
The getPackagesForOps and getOpsForPackage APIs don't convert the
mode of the return ops to their effective state, which isn't obvious.
Bug:
119281847
Test: none necessary
Change-Id: I60dd26ab771e73f2893981550a71cdaa353056c2
TreeHugger Robot [Fri, 10 May 2019 17:55:25 +0000 (17:55 +0000)]
Merge "Add support for FalsingPlugin to supply a replacement FalsingManager." into qt-dev
Julia Tuttle [Mon, 15 Apr 2019 18:06:54 +0000 (14:06 -0400)]
Clarify required/optional fields in BubbleMetadata.
Bug:
130427148
Test: make docs, examine out/
Change-Id: I8def5c4481be881784fb656ca77917eb9834eb79
Amith Yamasani [Fri, 10 May 2019 17:29:47 +0000 (10:29 -0700)]
Fix the constant value for hidden BIND flag
The hidden flags should use higher values so as to not
interleave with public flags.
Bug:
132438913
Test: CtsAppTestCases
Change-Id: Ic1dad21c2da5e5e60dc0401ee163f2188cc0f5dc
TreeHugger Robot [Fri, 10 May 2019 17:45:12 +0000 (17:45 +0000)]
Merge "Fix flaky test" into qt-dev
Siarhei Vishniakou [Fri, 10 May 2019 17:44:03 +0000 (17:44 +0000)]
Merge "Revert "Changed local refs in JNI to ScopedLocalRef"" into qt-dev