frameworks-base

Fork

Fix PermissionMonitor issues

PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

PermissionMonitor#hasUseBackgroundNetworksPermission only uses
the first package name of the uid for checking permission.
This is incorrect since each package declared different
permissions. So using the mApps which already checked both
network and using restricted network permissions. If uid is in
the mApps list that means uid has one of permission at least.

Bug: 144679405
Test: Build, flash, manual test
atest FrameworksNetTests

Change-Id: I2da730feda4d7ebed1f158b073167bb3964b3e7d
Merged-In: I8b03c9e23ffc9ff46264d6307fb841a7eda76a76
Merged-In: Ib08a940a6e5d3365c392ab7174d8484c197e0947
(cherry picked from commit 2e1da35b3b903f4aa01435c46b7014b88a41328d)

Snap for 6083172 from 0416784c2e41d8ac316d4b1f2473cfbd9d0a228e to qt-qpr2-release

Change-Id: I614266df56b6aacc8113b0ead8a013930680df2d

DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip

meta-data bundle keys (values are resids):

CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label"
CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon"

Test: manual, confirm that correct name & icon are used
and that custom icon is tinted in light/dark theme
(and that the copy chip is tinted right, too!)
Bug: 144290152
Change-Id: I57157e07630fa8bec3057e6d18336c59944fcb4f

DO NOT MERGE: Fix alignment of share chips.

Bug: 144290152
Test: visual inspection in landscape & portrait
Change-Id: Ib60b7b56bdf23a45c61416b8309a921451010e8e

Merge "Security Fix: Race Condition + NPE" into qt-qpr1-dev

Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev

Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev

AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING

Require MODIFY_AUDIO_ROUTING system permission to exercise
hidden (non-SDK, non-SystemApi) method setMasterMute

Bug: 141622311
Test: see bug for POC app
Change-Id: I4ee93276daa1285c55c4c838e2b43833135d76f6

Security Fix: Race Condition + NPE

ShellSubscriber is lazily initialized, and multiple threads can attempt
to write the same pointer since it is not initialized in threadsafe
code. Additionally, there is an NPE that crashes statsd when a null
ResultReceiver is passed in, which allows an attacker to repeatedly
crash statsd until the race condition occurs. More details, including a
proof of concept attack, are in the bug.

Bug: 141243101
Test: repro steps in bug no longer crash statsd
Test: with only the lock on iniitiallizing mShellSubscriber, statsd
still crashed but after ~7 minutes, no race condition occurred.

Change-Id: Ib56f888620497fb41d1627c07867693eb251738e

Merge "Remove keyguard_indication_area_overlay" into qt-qpr1-dev

Merge changes from topic "cp-fingerprint" into qt-qpr1-dev

* changes:
Don't mark terminal staged sessions as failed
Add build fingerprint checks to APK sessions

Merge "Do not restart activity when pinned set changes - just re-sort." into qt-qpr1-dev

Log native crashing process

Use the new sys.init.updatable_crashing_process_name in
Watchdog-triggered rollback logs in order to track the
process that causes updatable_crashing to be set.

Test: Run atest StagedRollbackTest#testNativeWatchdogTriggersRollback,
manually test correct process "zygote" is sent to logs.
Bug: 146415463

Change-Id: I81b55dbf9dc74c9b8d505988b99f7e97ef659fe9
Merged-In: I81b55dbf9dc74c9b8d505988b99f7e97ef659fe9
(cherry picked from commit cf6a399e006d24dbe5bf8ae2e946f8d2e648b630)

Log watchdog-initiated rollback reason

To help with monitoring Mainline releases, log the reason
for a watchdog-initiated rollback. This may be due to
native crashes, app crashes, ANRs or explicit health check
failures.

Add a mapping from PackageWatchdog failure reason to the
new metrics.

Bug: 146415463
Test: atest PackageWatchdogTest
Test: atest StatsdHostTestCases
Change-Id: Ia3e73d955508297004591eac762555665c557b8a
Merged-In: Ia3e73d955508297004591eac762555665c557b8a
(cherry picked from commit dd1dabaef7dfae54b20f225ee407f182e86411ac)

Add package failure flags to Package Watchdog

This is a prerequisite for adding additional logging of
the Watchdog-triggered rollback reason. Add flags which
indicate the failure observed (native, crash, ANR, explicit
health check). These will be used in the future by
RollbackPackageHealthObserver to map the failure type to the
(new) set of available logging metrics.

Test: atest PackageWatchdogTest
Bug: 146415463
Change-Id: I7e7c5e5399011e2761dada2b989a95c2013307e9
Merged-In: I7e7c5e5399011e2761dada2b989a95c2013307e9
(cherry picked from commit f305f4def072363087595a610043852127c399e2)

Fix security problem on PermissionMonitor#hasPermission

PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

Bug: 144679405
Test: Build, flash, manual test
Change-Id: Iae9c273af822b18c2e6fce04848a86f8dea6410a
Merged-In: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
Merged-In: I2da730feda4d7ebed1f158b073167bb3964b3e7d

Merge "Make preview text focusable." into qt-qpr1-dev

Fix security problem on PermissionMonitor#hasPermission

PermissionMonitor#hasPermission only checks permssions that app
requested but it doesn't check whether the permission can be
granted to this app. If requested permission doens't be granted
to app, this method still returns that app has this permission.
Then PermissionMonitor will pass this info to netd that means
this app still can use network even restricted network without
granted privileged permission like CONNECTIVITY_INTERNAL or
CONNECTIVITY_USE_RESTRICTED_NETWORKS.

Bug: 144679405
Test: Build, flash, manual test
Change-Id: I5eba4909e4c2e1d9f275f66be90ac36466b93e90
Merged-In: I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4
Merged-In: Iae9c273af822b18c2e6fce04848a86f8dea6410a

Make preview text focusable.

Otherwise, the parent item gets focus, and Talkback will read
the preview text but perform an Action Row action on click.

Bug: 145720818
Test: Manual per bug repro steps
Change-Id: I8938606882e121b4a86e9e1723e6fba3c6d75eeb

Do not restart activity when pinned set changes - just re-sort.

Bug: 145703939
Test: Share dialog via screenshot, long press for pin, observe behavior.
Change-Id: I6e9e03b77e1486093097ea1488fa589e3c7bd482
Merged-In: I6e9e03b77e1486093097ea1488fa589e3c7bd482

Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev

Snap for 6079367 from ee9c25e7ea89b6d883fb4d1f61dc249cc0b054b4 to qt-qpr2-release

Change-Id: I22d087209d68bfcd3d2540ddc0e683b2a8b4328c

Battery Saver capitilized in tile

When the phone is in battery saver mode, the "Battery Saver" secondary
label should be capitalized

Test: manual

Fixes: 145694753
Change-Id: Ia88547aa05ad441b07da3044e7148e1a918c28b5

Merge "DO NOT MERGE: Exclude nearby_sharing_component from backup test" into qt-qpr1-dev

DO NOT MERGE: Exclude nearby_sharing_component from backup test

Fixes: 146019461
Test: atest SettingsBackupTest
Change-Id: Ieb953284f2c00d69220e776f2b628f73013140e0

Merge "Fix lock screen wallpaper" into qt-qpr1-dev

Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933 am: 6231cffbb8

Change-Id: I1653273a1d9c0eae7b8a8406bc188e2e909ffaa0

Merge "docs: Fixed typo" into qt-dev am: 3e4f4f9933

Change-Id: Ic625ffed3ce23a7766a12a153d9794a4abf7a6b5

Merge "docs: Fixed typo" into qt-dev

Camera: Fix typo when comparing display size height

Call "getHeight()" instead of "getWidth()" when
comparing against preview size height.

Bug: 146364316
Test: Camera CTS
Change-Id: I588fd3b331380ff20762c24762e997d4a878cc44
Merged-In: I588fd3b331380ff20762c24762e997d4a878cc44
(cherry picked from commit 8649a916868979e5b46ebc70c7ec14602aff0998)