OSDN Git Service
Wale Ogunwale [Tue, 4 Jun 2019 19:04:53 +0000 (19:04 +0000)]
Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 18:03:32 +0000 (18:03 +0000)]
Merge "Rendering fixes for assist handles." into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 18:00:31 +0000 (18:00 +0000)]
Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev
Wale Ogunwale [Tue, 4 Jun 2019 13:44:14 +0000 (13:44 +0000)]
Revert "Collect NeededUriGrants without holding locks."
This reverts commit
344ce7ce703f806f50ea253047d6dbbb10eaa424.
Bug:
115619667
Bug:
134494852
Reason for revert: Causes "Permission Denial: opening provider" error
Change-Id: I9986618b6e338fef9843b2103da6a728a36c6ea6
Makoto Onuki [Tue, 4 Jun 2019 16:57:23 +0000 (16:57 +0000)]
Merge "Fix slow query log." into qt-dev
Hongyi Zhang [Tue, 4 Jun 2019 16:47:35 +0000 (16:47 +0000)]
Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 16:39:34 +0000 (16:39 +0000)]
Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev
Matt Casey [Mon, 3 Jun 2019 17:59:47 +0000 (13:59 -0400)]
Rendering fixes for assist handles.
Compute the arc angle based upon a fixed distance along the perimeter.
If that angle exceeds 90 degrees, add "arms" extending from the 90
degree corner and lighten the stroke slightly.
Fixes corner display on small-radius phones.
Bug:
134487710
Fixes:
133834204
Test: Visual inspection with UX across several devices.
Change-Id: I6ce625d14bd7224114da311e54c86b87e92533a1
TreeHugger Robot [Tue, 4 Jun 2019 15:38:18 +0000 (15:38 +0000)]
Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 15:06:08 +0000 (15:06 +0000)]
Merge "Fix atoi build errors" into qt-dev
Lorenzo Colitti [Tue, 4 Jun 2019 05:37:26 +0000 (14:37 +0900)]
Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.
This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.
Bug:
130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
Alan Stokes [Tue, 21 May 2019 13:54:28 +0000 (14:54 +0100)]
Cleanup background activity starts for release.
This removes the parts of the feature that were only needed in beta
releases:
- Toast when a start is or would be blocked.
- Configurable whitelist of exempt apps.
- Global setting to disable.
Not to be submitted until after beta 5 is cut.
Bug:
131747138
Test: atest BackgroundActivityLaunchTest
Test: atest RootWindowContainerTests
Test: atest WmTests:ActivityStarterTests
Test: atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
Test: atest CtsAppTestCases:.ServiceTest
Change-Id: I3d8b9c72c8fac86b93ac57a8a1988f4133043af8
junyulai [Tue, 4 Jun 2019 12:26:38 +0000 (05:26 -0700)]
Fix cannot create Nat-T keepalive on mobile data
Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.
This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.
Bug:
134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
2. atest android.net.cts.ConnectivityManagerTest
3. atest FrameworksNetTests
4. atest FrameworksTelephonyTests
Merged-In: If630d5b339aa722717258c721daa8ead8c431e2d
Change-Id: Ic0f168be6f5a6263a5e0565b6381dcb5c645660f
(cherry picked from commit
9ede677bb2c081ccdc41c8c3c19c949114bcc138)
TreeHugger Robot [Tue, 4 Jun 2019 12:36:12 +0000 (12:36 +0000)]
Merge "Fix loading classloader for plugins whitelisted by component name" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 12:35:42 +0000 (12:35 +0000)]
Merge "Dismiss all snoozed notifications upon swiping another" into qt-dev
Alan Stokes [Tue, 4 Jun 2019 07:46:52 +0000 (07:46 +0000)]
Merge "Do not allow app to start background activity after stop app switches triggered" into qt-dev
Ryan Mitchell [Tue, 4 Jun 2019 06:01:34 +0000 (23:01 -0700)]
Fix atoi build errors
Use strtol instead of atoi to check vendor partition version.
Bug:
119390857
Test: manual
Change-Id: I49c5963d8bbc5a803b3ccc0dd41d7bd7f2a42226
Lorenzo Colitti [Tue, 4 Jun 2019 03:57:07 +0000 (03:57 +0000)]
Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev
Yao Chen [Tue, 4 Jun 2019 03:31:15 +0000 (03:31 +0000)]
Merge "Fix a bug in saving local history of the metrics report." into qt-dev
Lorenzo Colitti [Tue, 4 Jun 2019 03:18:12 +0000 (03:18 +0000)]
Revert "[DO NOT MERGE] Handle config override via settings correctly"
This reverts commit
aa5ba4f75ff8391ce14f8b357450ca4be98c589c.
Reason for revert: Breaks presubmits. Bootloops blueline on qt-dev.
Bug:
134445287
Change-Id: I6ad17fa66a1ddc681339966acd007ebd43d7ba3b
TreeHugger Robot [Tue, 4 Jun 2019 02:27:26 +0000 (02:27 +0000)]
Merge "Ignore setAssistHintVisible if overlays are not available." into qt-dev
Kevin Yao [Tue, 4 Jun 2019 01:29:21 +0000 (01:29 +0000)]
Merge "User education support on disambiguation dialog" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 01:20:51 +0000 (01:20 +0000)]
Merge "Fix regression in swiping up from lockscreen" into qt-dev
TreeHugger Robot [Tue, 4 Jun 2019 00:54:05 +0000 (00:54 +0000)]
Merge "AudioService: hearing aid volume updates for voice vs media" into qt-dev
TreeHugger Robot [Mon, 3 Jun 2019 23:58:17 +0000 (23:58 +0000)]
Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev
Matt Casey [Mon, 3 Jun 2019 23:21:34 +0000 (19:21 -0400)]
Ignore setAssistHintVisible if overlays are not available.
Fixes:
134066197
Test: TBD
Change-Id: If18322aa939e3433f5c3543699f91d06af7989e1
TreeHugger Robot [Mon, 3 Jun 2019 22:52:59 +0000 (22:52 +0000)]
Merge "RootViewImpl: Fix measure size hint for WRAP_CONTENT windows" into qt-dev
Svetoslav Ganov [Mon, 3 Jun 2019 22:38:35 +0000 (22:38 +0000)]
Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev
Chavi Weingarten [Mon, 3 Jun 2019 22:22:49 +0000 (22:22 +0000)]
Merge "Clear VISIBLE_FOR_USER flag when isHiddenFromUser is true" into qt-dev
Winson Chung [Mon, 3 Jun 2019 21:29:20 +0000 (14:29 -0700)]
Fix regression in swiping up from lockscreen
Bug:
134391878
Test: Swipe up to assistant from lockscreen
Change-Id: I32fe638de507775c5744344bc5e71509e4a5b0e1
Yao Chen [Mon, 3 Jun 2019 21:45:54 +0000 (14:45 -0700)]
Fix a bug in saving local history of the metrics report.
A condition was reversed in code refactoring during previous code review.
Test: unit tests added for all 4 combination cases.
Bug:
134417583
Change-Id: Id79a827ec7a5404b9006769f9595de773b4724ef
Victor Hsieh [Fri, 31 May 2019 18:07:28 +0000 (11:07 -0700)]
Skip legacy-fs-verity setup if file already has it
Test: 1. put com.foo.apk in /system/priv-app
2. adb install-multiple -r -p com.foo split.apk
3. adb install-multiple -r -p com.foo split.apk (second time, only
succeed with this change)
Test: update a priv app (no regression)
Bug:
129509604
Change-Id: I591dd4504e3ba6f1499ebd045dc4f1adbd88d4e3
TreeHugger Robot [Mon, 3 Jun 2019 21:48:24 +0000 (21:48 +0000)]
Merge "Revert "Offload role manager work to background thread"" into qt-dev
Hongyi Zhang [Mon, 3 Jun 2019 21:27:39 +0000 (14:27 -0700)]
Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER
fix a typo when comparing gnssDataProvider, which leads to a bug of
logging API usage of add/remove NavigationMessageListener as API_ADD_GNSS_MEASUREMENTS_LISTENER
Test: toggling button "Measurements" in apk Gnssloger
Bug:
133906682
Change-Id: I81c386ebba01ec89d73347a979d307fbcd7b3617
Jean-Michel Trivi [Fri, 31 May 2019 23:21:59 +0000 (16:21 -0700)]
AudioService: hearing aid volume updates for voice vs media
Fix interactions between hearing aid volume control and Sound
Settings and Slice UIs with the following changes:
When receiving volume change, only change the hearing aid volume
if the device is hearing aid and the stream type to change matches
the stream type returned by AudioService.getHearingAidStreamType().
Modify AudioService.getHearingAidStreamType() to rely on the
audio mode OR the activity of the VOICE_COMMUNICATION* usage.
Add a listener of audio playback activity to monitor the start
and end of the use of VOICE_COMMUNICATION* to reset the hearing
aid volume to that of media.
Do this only when HEARING_AID device is connected: register/unregister
callback for playback activity according to hearing aid connections.
Bug:
129163231
Test: use Sound Settings UI to control voice vol outside of call, verify
volume is unchanged when listening to media later.
Change-Id: I7af9554d04139e1a3929efa53cdcb04e37878571
TreeHugger Robot [Mon, 3 Jun 2019 21:29:16 +0000 (21:29 +0000)]
Merge "Sharesheet - Adjust dark mode colors for GAR" into qt-dev
Heemin Seog [Mon, 3 Jun 2019 21:17:01 +0000 (21:17 +0000)]
Merge "Small fixes to CarSysUI Volume Dialog" into qt-dev
Makoto Onuki [Mon, 3 Jun 2019 20:57:21 +0000 (20:57 +0000)]
Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev
TreeHugger Robot [Mon, 3 Jun 2019 20:31:59 +0000 (20:31 +0000)]
Merge "Remove stopship for idmap2 vendor sdk checking" into qt-dev
Jeff Sharkey [Mon, 3 Jun 2019 20:11:33 +0000 (20:11 +0000)]
Merge "Collect NeededUriGrants without holding locks." into qt-dev
Ritwika Mitra [Mon, 3 Jun 2019 19:15:49 +0000 (19:15 +0000)]
Merge "Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS" into qt-dev
Hai Zhang [Mon, 3 Jun 2019 18:50:33 +0000 (18:50 +0000)]
Revert "Offload role manager work to background thread"
This reverts commit
f105c93c4aa6d1cbebe94c5c8d7d6297258f6fc9.
Reason for revert: b/
132974796#23 the offloaded thread will be holding a lock for a noticeable period of time and cause contention.
Bug:
132974796
Change-Id: Ic81a2e3ee7226266c8f97b606fc1a2834240f689
TreeHugger Robot [Mon, 3 Jun 2019 18:29:30 +0000 (18:29 +0000)]
Merge changes from topic "SoftHardStoragePerm" into qt-dev
* changes:
Link to SoftRestrictedPermissionPolicy twin
Pre-Q storage perm should behave hard restricted
Factor out soft restricted permissions policy
Ryan Mitchell [Mon, 3 Jun 2019 17:48:48 +0000 (10:48 -0700)]
Remove stopship for idmap2 vendor sdk checking
Idmap now checks if the version of the vendor partition is greater than
or equal to 29 or a development codename to enable enforcement of
overlayable resources.
Bug:
119390857
Test: manual
Change-Id: Ica25800432993beb7464436d4fba7cb391e621ef
Ned Burns [Mon, 3 Jun 2019 18:21:19 +0000 (18:21 +0000)]
Merge "Allow notification reordering after user adjusts importance" into qt-dev
TreeHugger Robot [Mon, 3 Jun 2019 18:09:34 +0000 (18:09 +0000)]
Merge "Fix a bug about missing onConfigurationChanged" into qt-dev
Steve Elliott [Fri, 31 May 2019 20:55:03 +0000 (16:55 -0400)]
Fix loading classloader for plugins whitelisted by component name
Fixes:
134162974
Test: manual
Change-Id: I1e6df38b455eb0038f1b255724619ba53561ff2a
chaviw [Wed, 29 May 2019 00:05:28 +0000 (17:05 -0700)]
Clear VISIBLE_FOR_USER flag when isHiddenFromUser is true
The current code was clearing the LEGACY_POLICY_VISIBILITY flag when
isHiddenFromUser was returning true. This was causing issues since there was no
path to add that flag when the Window was visible for that user. The correct
way is to clear the VISIBLE_FOR_USER flag since that flag will get added again
when the window is visible for that user.
Fixes:
133235040
Test: Switch from one user to another and back. Launcher is visible.
Change-Id: I5161dd83a7a0811a7e3a6ab2af439f352f967a6c
Ritwika Mitra [Wed, 29 May 2019 20:05:01 +0000 (13:05 -0700)]
Initializing the Telephony Sms DB based on RoleManager.ROLE_SMS
Fix:
133356079
Test: manual
Change-Id: I49dcdc450e1113ffae887ad488d39f74a96787ed
Fabian Kozynski [Mon, 3 Jun 2019 17:41:12 +0000 (17:41 +0000)]
Merge "Revert "Change carrier name shown No Service to ECO"" into qt-dev
Makoto Onuki [Fri, 31 May 2019 23:03:50 +0000 (16:03 -0700)]
Fix slow query log.
SQLiteDebug.Const isn't supposed to be preloaded.
Fix:
134176355
Test: "setprop db.log.slow_query_threshold.10045 0" and make sure ...
it works for UID 10045
Change-Id: I06ca1531e968faa2378d0cb7f627e2c6a87cf502
Lei Yu [Mon, 3 Jun 2019 16:54:29 +0000 (16:54 +0000)]
Merge "Use new API to build NetworkTemplate" into qt-dev
TreeHugger Robot [Mon, 3 Jun 2019 16:45:21 +0000 (16:45 +0000)]
Merge "No need to fake P->Q upgrade anymore" into qt-dev
Ricky Wai [Mon, 3 Jun 2019 16:25:28 +0000 (17:25 +0100)]
Do not allow app to start background activity after stop app switches triggered
Bug:
133450759
Bug:
132333960
Test: atest CtsActivityManagerBackgroundActivityTestCases
Change-Id: Ifec482d94437cb9e26fa30a1aa66d212c463cd99
Svet Ganov [Sat, 1 Jun 2019 00:40:49 +0000 (17:40 -0700)]
[DO NOT MERGE] Handle config override via settings correctly
Initialize persistence only after we can read the settings
provider as we need to take into account the current config
potentially set as an override in settings vs using the
hard coded defaults.
Make the last persist time more robust to ensure it always
termines to guard against other unforeseen cases wehere the
persistet files don't match what is expected under the current
config.
Test: atest CtsAppOpsTestCases
Test: atest android.appsecurity.cts.AppOpsTest
bug:
134093967
Change-Id: I211d267ccca044093d83dc5928f0531afa47791e
Chavi Weingarten [Mon, 3 Jun 2019 16:08:42 +0000 (16:08 +0000)]
Merge "Only updateBoundsSurface when surface size has changed." into qt-dev
Philip P. Moltmann [Thu, 30 May 2019 18:14:33 +0000 (11:14 -0700)]
Link to SoftRestrictedPermissionPolicy twin
We cannot create an API for now, hence the code needs to be duplicated.
Make sure we find the twin-class.
Test: Built
Bug:
131188778
Change-Id: I1cf50f15fb63fd02d9c6a0f326c3a5cd90192d8c
Philip P. Moltmann [Thu, 30 May 2019 15:27:19 +0000 (08:27 -0700)]
Pre-Q storage perm should behave hard restricted
Test: atest --test-mapping frameworks/base/services/core/java/com/android/server/policy:presubmit
Fixes:
131188778
Change-Id: If99dc99e8164156ae15f6617d0383513d505e15e
Philip P. Moltmann [Wed, 29 May 2019 23:18:18 +0000 (16:18 -0700)]
Factor out soft restricted permissions policy
So that later we can add more policy to it.
Test: atest CtsPermission2TestCases:RestrictedPermissionsTest
Bug:
131188778
Change-Id: Idc8738cbdb418fa7494100309345660139f32373
Philip P. Moltmann [Mon, 3 Jun 2019 15:28:21 +0000 (15:28 +0000)]
Merge "Revert "Reset SYSTEM_FIXED flags for hard restricted perms"" into qt-dev
TreeHugger Robot [Mon, 3 Jun 2019 14:18:18 +0000 (14:18 +0000)]
Merge "Re-notify if the network goes to PARTIAL." into qt-dev
Kevin Yao [Fri, 31 May 2019 03:52:00 +0000 (11:52 +0800)]
User education support on disambiguation dialog
Support Accessibility education according to
1. Gesture Navigation is on or off
2. Screen reader feature (such as TalkBack) is enabled or not
Manual test screenshot: https://drive.google.com/open?id=1afTDRYPMcZphM5cL0krPDA_Vh9pRX-8x
Bug:
133811747
Test: Manual
Change-Id: I04ca36c9e88ff14e29103db41cfab2a9b53985d5
Lorenzo Colitti [Mon, 3 Jun 2019 13:04:00 +0000 (06:04 -0700)]
Re-notify if the network goes to PARTIAL.
If NetworkMonitor detects partial connectivity before
EVENT_PROMPT_UNVALIDATED arrives, show the partial
connectivity notification immediately. Re-notify
partial connectivity silently if no internet
notification already there.
Bug:
130683832
Bug:
130766237
Test: atest com.android.server.ConnectivityServiceTest
Change-Id: I7d4eddc643ec795c3961097dc1bdd314d168f6c7
Merged-In: I1b79d3faf96ffe792738935088e4ebbdfcc0d878
(cherry picked from commit
58d4e7304cfce68e338ab34022a0b29d45f42c38)
Matt Pietal [Mon, 3 Jun 2019 13:18:02 +0000 (09:18 -0400)]
Sharesheet - Adjust dark mode colors for GAR
The background for dark mode dialogs is lighter than the pixel/gm2
grey 800 color, while the text is a bit darker. Manually adjust the
colors per UX's recommendations.
Bug:
132861725
Test: Visual inspection
Change-Id: Iaa65c69ed387165987c41d8e2e7843e86e909dcc
Bonian Chen [Sun, 2 Jun 2019 23:59:31 +0000 (23:59 +0000)]
Revert "Change carrier name shown No Service to ECO"
This reverts commit
b023773a18c37a8a50a6d18e552b1e440dff13e7.
Reason for revert: Not yet decided to release this at this stage
Change-Id: Ic0018cadcc228667a64f6f8c694bb6a04f00adc9
Bug:
130857483
Bug:
133201131
Bug:
132291669
Matt Pietal [Fri, 31 May 2019 16:06:17 +0000 (12:06 -0400)]
Sharesheet - Fix layouts for multi-window mode
When using multi-mode and holding the phone in portrait, android will
report it's orientation as LANDSCAPE. Take multi-window mode into
account when determining fixed widths as well as number of items per
row.
Bug:
132828939
Test: Use multi-window mode
Change-Id: I97b722ea58c9f79aea2a3ab594c3ad7d78f8607c
TreeHugger Robot [Mon, 3 Jun 2019 10:13:18 +0000 (10:13 +0000)]
Merge "Invoke setWindowStopped on the thread that created the view" into qt-dev
Baligh Uddin [Sun, 2 Jun 2019 13:14:26 +0000 (13:14 +0000)]
Merge "Remove these subdirectories per b/
133225687" into qt-dev
TreeHugger Robot [Sun, 2 Jun 2019 04:38:22 +0000 (04:38 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sun, 2 Jun 2019 01:41:54 +0000 (01:41 +0000)]
Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev
Tyler Gunn [Sat, 1 Jun 2019 23:52:16 +0000 (23:52 +0000)]
Merge "Fix bugs with Remote Connection Services." into qt-dev
Bill Yi [Sat, 1 Jun 2019 14:59:15 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia4e260dc7c3a62b2252468391a548e00e1ec0f2d
TreeHugger Robot [Sat, 1 Jun 2019 14:44:50 +0000 (14:44 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 14:41:32 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bonian Chen [Sat, 1 Jun 2019 12:47:31 +0000 (12:47 +0000)]
Merge "Change carrier name shown No Service to ECO" into qt-dev
Bill Yi [Sat, 1 Jun 2019 07:09:58 +0000 (00:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5318ae0fb85ad6f40291511ee6b647686c387a3a
TreeHugger Robot [Sat, 1 Jun 2019 05:31:14 +0000 (05:31 +0000)]
Merge "Handle condition changes when metric is not active." into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 04:48:58 +0000 (04:48 +0000)]
Merge "Revert "Statsd: apex modules in uid map"" into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 02:30:20 +0000 (02:30 +0000)]
Merge "Do not create EMPTY batterystats history file." into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 02:05:39 +0000 (02:05 +0000)]
Merge "HUN should not show up when the Notification shade is open" into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 01:32:20 +0000 (01:32 +0000)]
Merge "Bring back silent icons for Q->Q devices" into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 01:31:17 +0000 (01:31 +0000)]
Merge "Catch NPE in getServiceStateForSubscriber" into qt-dev
TreeHugger Robot [Sat, 1 Jun 2019 01:28:39 +0000 (01:28 +0000)]
Merge "Fix SysUI-Assistant metrics logging" into qt-dev
Tyler Gunn [Thu, 30 May 2019 23:52:28 +0000 (16:52 -0700)]
Fix bugs with Remote Connection Services.
1. A previous change was made in ConnectionServiceAdapterServant to add
another parameter, requiring the user of SomeArgs. I think this fix is
pretty self-explanatory. (facepalm)
2. queryRemoteConnectionServices in ConnectionServiceAdapter had an issue
where the callback would not get called if there was more than one
IConnectionServiceAdapter instances. This isn't an error condition, but
a condition where we don't query telecom for the list of valid remote
connection services. We ensure a callback with an empty list is made
(this is similar to what Telecom already does).
This seems to be an issue inherent with DSDS because there can be multiple
SIM ConnectionServices where before there was only one.
Test: Run CTS tests.
Bug:
133639062
Change-Id: I1c508e97d1f0ea1bc72ad7ebd026c1ad66a52de3
TreeHugger Robot [Sat, 1 Jun 2019 00:25:51 +0000 (00:25 +0000)]
Merge "Verify staged APKs pre-reboot." into qt-dev
chaviw [Wed, 29 May 2019 21:57:50 +0000 (14:57 -0700)]
Only updateBoundsSurface when surface size has changed.
Currently, updateBoundsSurface was getting called when the surface
changed, not just when the size changed. This meant it could be calling
setWindowCrop and deferTransaction when no size had changed. If size
hadn't changed, there was a high possibility that no new frames would be
submitted by the client, causing the deferTransaction to wait forever.
Since the deferTransaction was still waiting, SurfaceFlinger would wake
up every vsync to check if it should call doTransaction for the deferred
transaction. This caused 60Hz composition even when frames were rendered
slower.
Fixes:
132110524
Test: SF doesn't compose 30fps app at 60Hz
Change-Id: Icf3a99b34c288575438bfcd05e9077ea7919b4ca
Christopher Ferris [Sat, 1 Jun 2019 00:07:29 +0000 (00:07 +0000)]
Merge "Avoid using usap when wrap property set." into qt-dev
Evan Tyra [Fri, 31 May 2019 18:04:58 +0000 (11:04 -0700)]
Catch NPE in getServiceStateForSubscriber
ITelephony can enter a bad state with an incorrect SubId and throw an
NPE as shown in the attached bug. This is not an expected error, so a
bugreport will be triggered on userdebug builds on catch.
Test: Local
Bug:
134067547
Change-Id: Ib8f3b69eb3870c3567578aadaee6cf2693526fbd
Hui Yu [Fri, 31 May 2019 22:14:43 +0000 (15:14 -0700)]
Do not create EMPTY batterystats history file.
Previously when batterystats history buffer exceeds MAX_HISTORY_BUFFER
size, we create a new history file which is empty until batterystats
history buffer is written to the file. But the buffer is written to the
file every 30 minutes by default. When the file is empty, if the
system server process crashed or abrupt powered off, the file will remain
empty.
During the device bootup, batterystats reads history buffer from
the empty file and failed. The important mHistoryBaseTime variable is zero,
which causes all timestamps in subsequent history events are wrong, this
causes volta go/powerbug displays wrong, also Battery Usage in Settings
are wrong.
The fix is to not create new empty history file on disk until we actually
write history buffer to the file.
This problem can be manually reproduced by creating new empty file under
battery-history directory, then power off the device by long press power
button.
Bug:
133525277
Test: frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsHistoryTest.java
Change-Id: I0c22881df6897e8832b472cc5e82fbf2727eb252
Bill Yi [Fri, 31 May 2019 23:36:54 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e8bccdc1397a8270c58f411e8383524b8f105b8
Philip P. Moltmann [Fri, 31 May 2019 23:35:33 +0000 (23:35 +0000)]
Revert "Reset SYSTEM_FIXED flags for hard restricted perms"
This reverts commit
3c2731fdce14bf99a043e8c4bd214fd6fb11160f.
Reason for revert: This was only needed to unbreak internal dogfooding
Test: This is a clean revert
Bug:
134161027
Change-Id: I309bc5158190da71fc0ba867a5d15c6260623ed5
Pengquan Meng [Fri, 31 May 2019 23:31:27 +0000 (23:31 +0000)]
Merge "Add new WiFi Calling string without hyphen" into qt-dev
Nazanin Bakhshi [Fri, 31 May 2019 23:20:48 +0000 (23:20 +0000)]
Merge "Supported data enabled override for different scenarios" into qt-dev
TreeHugger Robot [Fri, 31 May 2019 23:17:35 +0000 (23:17 +0000)]
Merge "Reset SYSTEM_FIXED flags for hard restricted perms" into qt-dev
Priyank Singh [Tue, 7 May 2019 21:30:13 +0000 (14:30 -0700)]
HUN should not show up when the Notification shade is open
Bug:
132131722
Test: Manual
Change-Id: Id759421fd402e917ca4722df6fb597b5991ed31d
(cherry picked from commit
ff78b8ec8c31e3eac40db5d321dd6926ef0903a1)
Fabian Kozynski [Fri, 31 May 2019 22:43:08 +0000 (22:43 +0000)]
Merge "DO NOT MERGE Remove Privacy Indicators" into qt-dev
TreeHugger Robot [Fri, 31 May 2019 22:42:43 +0000 (22:42 +0000)]
Merge "Enhancements to conference for non-conference host scenarios." into qt-dev
Muhammad Qureshi [Fri, 24 May 2019 23:38:49 +0000 (16:38 -0700)]
Handle condition changes when metric is not active.
Treat metric activation like conditions as much as possible. Keep track
of condition changes even when metric is not active. Right now, we
ignore all condition changes if metric is not active.
This is a band-aid fix. Ideally, we should re-think how metric activation is
implemented and consider implementing it as a condition with a timebomb.
Bug:
130838341
Test: statsd_test
Test: cts-tradefed run cts-dev -m CtsStatsdHostTestCases -t
android.cts.statsd.metric
Change-Id: I96bb7a7c6ee88359f310065e166f858be945eaff
Govinda Wasserman [Fri, 31 May 2019 15:59:19 +0000 (11:59 -0400)]
Fix SysUI-Assistant metrics logging
Logging was broken by a refactor, this fixes it so that it works
correctly again. Also adds handle, phone state, and dismiss reason
logging to the metrics as they were never being logged.
Test: Tested locally
BUG:
128982146
BUG:
133407447
BUG:
133247164
Change-Id: I3d925243f9826439c6acb718e8436ccdd1d27564
TreeHugger Robot [Fri, 31 May 2019 22:24:32 +0000 (22:24 +0000)]
Merge "Reduce calls to updateOomAdj() during unbind" into qt-dev