Commit Graph

530366 Commits

Author SHA1 Message Date
Mattias Nilsson
59c5560509 Remove config_inflateSignalStrength
This resource has moved to CarrierConfig to support dual
sim devices and MVNOs.

Bug: 148483577
Test: Manual
Merged-In: I494cb93a2c72ff3df2ef45ad737c5606132e32d1
Change-Id: I494cb93a2c72ff3df2ef45ad737c5606132e32d1
2020-07-27 17:30:43 +00:00
Mattias Nilsson
f8c6f34832 Move config_inflateSignalStrength to CC
Sim based customizations should not be resources because
of two reasons:
1. The MCC/MNC value in AssetManager for Dual sim devices is undefined
2. There is no support for MVNOs.

For dual sim devices there is only one value for MCC/MNC in
AssetManager and that value is updated from multiple places without
deciding if it should be the default voice sim card, the default
data sim card or whatnot.
  This means that when frameworks is trying to decide what resource
to use there is no guarantee that the resource that arrives is for
the particular subscription we are asking for.

MVNOs cannot be separated through only MCC/MNC but need more
parameters like service provider, imsi, GID1 etc. MVNO support
is available in CarrierConfig.

When we now have support for ADCP updates of customizations and
start using carrier id this is better placed in CarrierConfig,
we then get support for MVNOs at the same time.

Bug: 148483577
Test: Customize for sim card x and not for sim card y, insert both
sim cards in a dual sim device and see the difference.

Merged-In: I067d55b9ae5e1346dd3b3cd50a0097b05b100055
Change-Id: I067d55b9ae5e1346dd3b3cd50a0097b05b100055
2020-07-27 17:30:27 +00:00
Patrick Baumann
681b236422 RESTRICT AUTOMERGE
Do not set referrerUri on SessionInfo for non-owners

This change leaves the referrerUri field null when the caller leading to
its production is not the owner of the session.

Bug: 142125338
Test: atest SessionReferrerUriTest
Change-Id: I84679ea0636aa2097e25e23813c48134c9cc1d75
2020-07-27 10:24:11 -07:00
Brad Ebinger
31313d6566 Fix Docs for KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL
Fixes: KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL
Test: Docs only change, m
Change-Id: Ifcbf147f3734a33250f46ddfc56c72cdbd4d3626
2020-07-27 10:19:01 -07:00
Nathan Harold
cbdebc8d55 Update Docstrings for #requestLocationUpdate()
Address API Council feedback for CellLocation#requestLocationUpdate

-Update the summary string to indicate the functionality
 for pre-SDK31 behavior.
-Clarify that this API is only useful in power-saving modes.
-Remove justification for deprecation leaving a simple link to
 a superior alternative.

Bug: 161207204
Test: make offline-sdk-docs && make (docstring only change)
Change-Id: Ib931906323fe1ec2c730271cefd0d46aee60d963
2020-07-27 10:08:53 -07:00
Tom Cherry
9db78024c5 Log only a summary 'Found stale backup journal' message.
With the goal of reducing log spam, print only a summary 'Found stale
backup journal' messages instead of logging within the inner loop.
Previously, over 12k messages could be printed at a time from this
function.

Before this CL:
 - a backup was scheduled for each packageName from each stale
   journal
 - one (or two, if MORE_DEBUG) message was logged for each
   packageName in each journal file.

After this CL:

 - packageNames are de-duplicated before scheduling backups or logging
   (it's not clear to me whether duplicate packageNames previously
   occurred, in practice).
 - one message is logged for the number (if > 0) of stale journals.
 - one message is logged for the number (including their names, if
   MORE_DEBUG) of packages.

Bug: 161940947
Test: fewer 'Found state backup journal' messages printed
Merged-In: Ia1343e4cea31feb1eba9da561d20736eb5df0a14
Change-Id: Ia1343e4cea31feb1eba9da561d20736eb5df0a14
2020-07-27 09:27:39 -07:00
Tom Cherry
4b4e781943 Log only a summary 'Found stale backup journal' message.
With the goal of reducing log spam, print only a summary 'Found stale
backup journal' messages instead of logging within the inner loop.
Previously, over 12k messages could be printed at a time from this
function.

Before this CL:
 - a backup was scheduled for each packageName from each stale
   journal
 - one (or two, if MORE_DEBUG) message was logged for each
   packageName in each journal file.

After this CL:

 - packageNames are de-duplicated before scheduling backups or logging
   (it's not clear to me whether duplicate packageNames previously
   occurred, in practice).
 - one message is logged for the number (if > 0) of stale journals.
 - one message is logged for the number (including their names, if
   MORE_DEBUG) of packages.

Bug: 161940947
Test: fewer 'Found state backup journal' messages printed
Merged-In: Ia1343e4cea31feb1eba9da561d20736eb5df0a14
Change-Id: Ia1343e4cea31feb1eba9da561d20736eb5df0a14
(cherry picked from commit 112e3c2d04)
2020-07-27 16:26:31 +00:00
Tom Cherry
f2ce01511e Merge "Remove log spam from onSubscriptionsChangedListener()" am: 1720916a97 am: 17c2d70b04 am: 9012bb9d95
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371664

Change-Id: I1088f0a27dcba486eb1b2806c8870fa804e6def3
2020-07-27 15:40:13 +00:00
Tom Cherry
9012bb9d95 Merge "Remove log spam from onSubscriptionsChangedListener()" am: 1720916a97 am: 17c2d70b04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371664

Change-Id: Ic13383605bb47980cef2393bedd601b1fdc88e18
2020-07-27 15:23:18 +00:00
Tom Cherry
17c2d70b04 Merge "Remove log spam from onSubscriptionsChangedListener()" am: 1720916a97
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371664

Change-Id: Ic49ac0f956a03326212dcb924441063495f0bb5c
2020-07-27 15:04:28 +00:00
Tom Cherry
1720916a97 Merge "Remove log spam from onSubscriptionsChangedListener()" 2020-07-27 14:50:14 +00:00
Victor Chang
304910489a Update language in android.text.format to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: m droid
Change-Id: I643275c1ea39fa1a5fef7283076827b93dffcab1
2020-07-27 15:44:28 +01:00
Treehugger Robot
268f3268b1 Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0 am: fc99d35ccf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: I01bf98c6c5c0f816fbe5a6e90831b11b1f9fcd2e
2020-07-27 14:00:45 +00:00
Treehugger Robot
fc99d35ccf Merge "Remove gendered language" am: 35616155b5 am: 5c018260e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: I04e61237104aca879ceed99f3d24cff76fe4570b
2020-07-27 13:43:16 +00:00
Treehugger Robot
5c018260e0 Merge "Remove gendered language" am: 35616155b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371586

Change-Id: Id351aef2dc3869ab5fa0b4c909f367b64eead9b2
2020-07-27 13:29:07 +00:00
Treehugger Robot
35616155b5 Merge "Remove gendered language" 2020-07-27 13:15:52 +00:00
Treehugger Robot
240de71ebd Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 am: 5383e257e2 am: 9df4a45b87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372976

Change-Id: I5a210748f9e6e06789b8758fd0c3861e77a41bc7
2020-07-27 06:03:39 +00:00
Treehugger Robot
9df4a45b87 Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 am: 5383e257e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372976

Change-Id: Ic3ef5f4df089968c4105fec48c9c494c57f1f608
2020-07-27 05:49:03 +00:00
Zhiyin Luo (罗植尹)
fc869035b6 fix uninitialization issue in JankTracker
We should initialize mSwapDeadline in JankTracker, or it can be a very
large randomized value and then makes jank tracker not collect concrete
jank type of frames appropriately as expected.

Bug: 161656795
Test: run cts -m CtsIncidentHostTestCases -t
   com.android.server.cts.GraphicsStatsValidationTest#testJankyDrawFrame
Change-Id: I057a50a74502918619204f9164f6a954f8e9c5de
Merged-In: I057a50a74502918619204f9164f6a954f8e9c5de
(cherry picked from commit 7a0d224756)
2020-07-27 05:46:14 +00:00
Treehugger Robot
5383e257e2 Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372976

Change-Id: Iccc3389dfc0ee64f819dd9c2d9bf7ca78f0a1490
2020-07-27 05:37:31 +00:00
Treehugger Robot
f366f37aa1 Merge "Update language to comply with Android’s inclusive language guidance" 2020-07-27 05:21:10 +00:00
Yo Chiang
d5a6030fd2 Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for
reference

#inclusivefixit

Bug: 161896447
Test: TH presubmit
Test: atest DynamicSystemInstallationServiceTests
Change-Id: I94ab7cabc4f86ecb266c1d7d89357da1e3f88921
2020-07-27 04:26:09 +00:00
android-build-team Robot
87a6fd7acd Merge cherrypicks of [12236535, 12236686, 12236706, 12236707, 12236708, 12236709, 12236710, 12236711, 12236687, 12236608, 12236629, 12236688, 12236459, 12236460, 12236536, 12236412] into rvc-release
Change-Id: I27766eaf2a654e4676823df532a0c930dd385d6b
2020-07-26 20:57:04 +00:00
Zim
d58101e2b2 Reduce demo user FUSE volume mount timeout
A long timeout seems to break demo users when calling
DevicePolicyManagerService#enableSystemApp.

We soft-revert Ia8f6f121448f6b5e484fd3e8cca845fdd89afc23 just for demo
users while investigating the root cause.

Test: Manual
Bug: 161702661
Change-Id: I8ff153f2649e3a1d05f2e3e6e382bbba8c79630c
(cherry picked from commit 1d6554f0e1)
2020-07-26 20:56:04 +00:00
Lais Andrade
dc21a3c479 Propagate AudioAttributes flags to VibrationAttributes
Set supported flags from AudioAttributes into VibrationAttributes on the
builder constructor.

Fix: b/161761418
Test: manual
Change-Id: I4a8e1db278843b2f9f19aba43b0b8f264cb696bd
(cherry picked from commit c2777148df)
2020-07-26 20:55:59 +00:00
Jack Yu
35c84e1293 Allow network stack UID caller to retrieve cell identity
For backwards compatibility, we allow phone, system UID to
access cell identity through getServiceState. Cell broadcast
service, which is used to be part of telephony, now is running
under network stack UID. We should consider network stack UID as
trustable components like system/telephony.

Fix: 157618105
Test: Manual
Change-Id: I9b2dfc778752e130f5c7e44c4b2e45b63ac6f918
(cherry picked from commit 56cfdd1e87)
2020-07-26 20:55:54 +00:00
Steve Elliott
a1efa34f0b Ignore GONE views in shade when processing sections
Fixes: 161606040
Test: atest
Change-Id: I8ab108aea23ea6a139f758abdaf222f5f3641104
(cherry picked from commit dfd9f17703)
2020-07-26 20:55:49 +00:00
Patrick Baumann
1adf9e6560 Fix unintended preferred activity reset
When the preferred handler of an action is saved with "always", the set
of components displayed as options to the user are saved with it. On
subsequent queries, if that set of components change, the preference is
cleared to allow the user to consider the new set. With the introduction
of app visibility filtering in R (and to a lesser extent, Instant Apps
in O), the set of apps that an app can see may be less than the set that
the system can. As a result, if the caller calls resolveIntent and
cannot see all of the apps the system can, it may reset the user
preference unexpectedly.

This change ensures that before we clear the user preference that we're
comparing against the full set of apps. As such, if we encounter a call
to the method from an app that cannot see all apps, we avoid any
mutations and instead just return the set of apps that the user can see
or the preferred app if it's part of the set they can see. If the system
calls or if the call is part of an activity start, we'll allow reset of
the preference.

Test: Manual - Install 3 cameras, verify preference only reset on start
Fixes: 157548344
Change-Id: Icb50a66500edba26c4c6c3e80a6a9c544d4d63d6
(cherry picked from commit 312755820a)
2020-07-26 20:55:43 +00:00
Christopher Tate
fd90ff85eb Skip bg PSS collection for apps using a camera
Bug: 144138979
Test: grant camera appOp and observe logging
Test: use camera app and observe logging
Change-Id: I6422b432f0d6fcf411073c0528a4ee485d46f005
(cherry picked from commit 5a7e662751)
(cherry picked from commit fc76b97d1b)
2020-07-26 20:55:38 +00:00
Automerger Merge Worker
3ef9881f32 Merge "Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 95846eed9d" into rvc-d1-dev-plus-aosp 2020-07-25 16:07:29 +00:00
Zimuzo Ezeozue
c6d3cdc760 Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 95846eed9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: Ic5f8bf0637ef0bd5227326c6210a1e244e9487e4
2020-07-25 16:07:23 +00:00
Zimuzo Ezeozue
c94d92c03a Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72 am: 53c4fc325e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: I40c808ea467d68fdd4e2970bc3d5be8e8ac15427
2020-07-25 16:07:12 +00:00
Zimuzo Ezeozue
95846eed9d Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: If9a70b62d964ea355f69a9e5d0aa73cac55d0ca3
2020-07-25 15:53:41 +00:00
Zimuzo Ezeozue
53c4fc325e Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev am: 0df699ae72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12217292

Change-Id: I4f02725faeee1e2ac0cd7c9cc1f76cccda6444a4
2020-07-25 15:53:29 +00:00
Zimuzo Ezeozue
0df699ae72 Merge "Reduce demo user FUSE volume mount timeout" into rvc-dev 2020-07-25 15:31:00 +00:00
Treehugger Robot
9a1b33f61f Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1 am: ab368be7ad
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I68d4ba8f821a24219b02a026bffcb5676010ce84
2020-07-25 01:46:25 +00:00
Treehugger Robot
ab368be7ad Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09 am: aa0cee06b1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I2cc60fb80d146a2121d0c5cba79e83581f281816
2020-07-25 01:28:24 +00:00
Treehugger Robot
aa0cee06b1 Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" am: 85a6580f09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365553

Change-Id: I0a278fa284a3654c4cb85fb864be1c9df72677b3
2020-07-25 01:18:34 +00:00
Treehugger Robot
85a6580f09 Merge "Add KEYCODE_WINDOW mapping to USB HID Usage consumer page (0x0c/0x67) "Picture-in-Picture Toggle"" 2020-07-25 01:08:00 +00:00
Nate Jiang
fefb3398b6 Merge "Make broadcast protected" into rvc-d1-dev am: 1263a94728
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12228948

Change-Id: I9a47676ee09afefb6a330efc5504edd99b4d63e6
2020-07-25 01:03:26 +00:00
Nate Jiang
1263a94728 Merge "Make broadcast protected" into rvc-d1-dev 2020-07-25 00:52:08 +00:00
Automerger Merge Worker
0830cb4d85 Merge "Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: be22e7af3f" into rvc-d1-dev-plus-aosp 2020-07-25 00:28:14 +00:00
TreeHugger Robot
fbcde7cdc1 Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: be22e7af3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: Iccf5e3cf7ee7fd845f1ce0fe9ffea4a1598500b8
2020-07-25 00:28:04 +00:00
TreeHugger Robot
38570d081d Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76 am: 61e32caa0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: I4018198636aa327dee326842e3e0c25478583d7b
2020-07-25 00:27:55 +00:00
TreeHugger Robot
be22e7af3f Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: If44bc27e2001a98deb7346783645c97554111708
2020-07-25 00:10:41 +00:00
TreeHugger Robot
61e32caa0b Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev am: 863c82fa76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12218307

Change-Id: I3b5157ab8e234e349465ed94f15f6d9ef53cac5f
2020-07-25 00:10:39 +00:00
TreeHugger Robot
863c82fa76 Merge "Propagate AudioAttributes flags to VibrationAttributes" into rvc-dev 2020-07-24 23:55:38 +00:00
Steven Moreland
3c95ad9cda [automerger skipped] Merge "Allow module libs to use VINTF AIDL." am: 298d06f292 am: d40462e66d -s ours am: bd491fffc7 -s ours
am skip reason: Change-Id I1ab977248b1c39a7d08e0ca34389a7ba168c05b0 with SHA-1 95dd53bb5f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371822

Change-Id: Iecc0621243ba7bef779923f3fe4f46f8fc366342
2020-07-24 23:39:11 +00:00
Steven Moreland
bd491fffc7 [automerger skipped] Merge "Allow module libs to use VINTF AIDL." am: 298d06f292 am: d40462e66d -s ours
am skip reason: Change-Id I1ab977248b1c39a7d08e0ca34389a7ba168c05b0 with SHA-1 95dd53bb5f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371822

Change-Id: Ie3fbdd102d49b439e001c75c298876c8ae7ade8f
2020-07-24 23:27:01 +00:00
Steven Moreland
d40462e66d Merge "Allow module libs to use VINTF AIDL." am: 298d06f292
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371822

Change-Id: I306603dfaacaa1647276bfd4a072a9cfdafb2d3e
2020-07-24 23:08:32 +00:00