Commit Graph

20943 Commits

Author SHA1 Message Date
Felipe Leme
b368761e09 Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev am: 60ec24eb1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948897

Change-Id: Ia28e5a549a58c1c44bcab2b966839f128d1feb54
2021-06-17 00:26:25 +00:00
Felipe Leme
60ec24eb1e Merge "Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal." into sc-dev 2021-06-17 00:03:24 +00:00
Humza Azam
3399307282 Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev am: 83f88bc43a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994638

Change-Id: Iaa59f1656fbb70a4f775aa6a21654e4c8d47b093
2021-06-16 22:04:31 +00:00
Humza Azam
83f88bc43a Merge "Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""" into sc-dev 2021-06-16 22:03:08 +00:00
Humza Azam
32eef1d580 Revert "Revert "Revert "HULK SMASH! We've gotta declare REL."""
This reverts commit 67f28e7448.

Reason for revert: Testing fix for b/191191441

Bug: 191191441
Change-Id: I15ca686c7c44626b734ba45e785adbe66fcf624a
2021-06-16 20:51:30 +00:00
Felipe Leme
43dc489afd Split DevicePolicyManagerInternal into DevicePolicyManagerLiteInternal.
DevicePolicyManagerInternal is not set when the device doesn't have
the device_admin feature, but some methods are still needed in that
scenario (like notifyUnsafeOperationStateChanged() on automotive).

Fixes: 190395562

Test: manual verification
Test: atest FrameworksServicesTests:DevicePolicyManagerTest FrameworksServicesTests:DevicePolicyManagerServiceMigrationTest

Change-Id: I48271b828ff01c4e4f3e0365410a7a745f1b0a1d
2021-06-16 08:57:50 -07:00
Issei Suzuki
387cc25cf2 Merge "Persist Theme name instead of ID for ShortcutInfo" into sc-dev am: 41e7f367ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14783472

Change-Id: Ib9cbb8c121483602fd6a1d28f0ab63047a36a2a3
2021-06-16 15:17:24 +00:00
Issei Suzuki
41e7f367ed Merge "Persist Theme name instead of ID for ShortcutInfo" into sc-dev 2021-06-16 14:57:36 +00:00
Colin Cross
d8d461402c Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev am: 5c80e3491d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14991077

Change-Id: Ib6d5ba46ada533cbb903c52eb3531f6a854d4236
2021-06-16 02:11:59 +00:00
Colin Cross
5c80e3491d Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev 2021-06-16 01:55:36 +00:00
Colin Cross
67f28e7448 Revert "Revert "HULK SMASH! We've gotta declare REL.""
This reverts commit 30bb1d09eb.

Reason for revert: b/191191441

Bug: 171506470
Bug: 191191441
Change-Id: I698709a27f3b09e5e02143efd7a71157b5ecf75a
2021-06-16 01:54:59 +00:00
Jeff Sharkey
7084489ea9 Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev am: a56beb126d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14973563

Change-Id: Ieae4615f2d4f3cfc17838bd8a5cb7b0e9a08cdad
2021-06-15 21:36:59 +00:00
Jeff Sharkey
a56beb126d Merge "Revert "HULK SMASH! We've gotta declare REL."" into sc-dev 2021-06-15 21:03:41 +00:00
TreeHugger Robot
4db2952895 Merge "Update docs for onBackPressed" into sc-dev am: 1e40e4068d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908762

Change-Id: I730056623d373f7cf6ab5a7b4b9ae06afde1dba1
2021-06-15 18:51:46 +00:00
TreeHugger Robot
1e40e4068d Merge "Update docs for onBackPressed" into sc-dev 2021-06-15 18:33:01 +00:00
TreeHugger Robot
750ed6aa97 Merge "Fix: query TYPE_WIFI usage with empty string" into sc-dev 2021-06-15 04:41:22 +00:00
Jeff Sharkey
30bb1d09eb Revert "HULK SMASH! We've gotta declare REL."
This reverts commit 90153d67e0.

Reason for revert: Temporary fix no longer needed; this was only added until an updated prebuilt for the referenced package was merged
Bug: 171506470
Test: none

Change-Id: Ibd3fec1d2ecd505693b4cf89ee8323eb8a50a604
2021-06-15 03:57:02 +00:00
Jeff Sharkey
e83424e586 Merge "HULK SMASH! We've gotta declare REL." into sc-dev am: 2a75262a96
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966105

Change-Id: If56cb533235591c7e983240390d001fc03185ed2
2021-06-15 03:54:46 +00:00
Jeff Sharkey
2a75262a96 Merge "HULK SMASH! We've gotta declare REL." into sc-dev 2021-06-15 03:51:43 +00:00
Les Lee
913037cba0 Fix: query TYPE_WIFI usage with empty string
Starting with API level 31, the subscriberId is applicable
for the wifi network. Considering applications may use
null or an empty string as subscriberId (for instance, cts),
frameworks create MATCH_WIFI_WILDCARD NetworkTemplate when querying
wifi network with null or an empty string which is the behavior before
API level 31.

Bug: 188915450
Test: atest -c NetworkStatsManagerTest
Test: atest -c NetworkUsageStatsTest
Merged-In: I084b69903f8ba7a6225b312560752e8508938714
Change-Id: I084b69903f8ba7a6225b312560752e8508938714
2021-06-15 10:52:49 +08:00
TreeHugger Robot
03cdc9f400 Merge "Handle exact alarm permission state changes" into sc-dev am: cd140900ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922432

Change-Id: I3175d002c71e39dbb572f45f1b2b831771ac6c25
2021-06-14 21:53:52 +00:00
TreeHugger Robot
cd140900ed Merge "Handle exact alarm permission state changes" into sc-dev 2021-06-14 21:43:49 +00:00
Jeff Sharkey
90153d67e0 HULK SMASH! We've gotta declare REL.
Bug: 171506470
Test: none
Change-Id: I22d317f873abf22586d9907fbc22330639d5e773
2021-06-14 15:28:31 -06:00
Prabir Pradhan
c257fb9ee1 Update docs for onBackPressed
After changing the default behavior of the back button in S, we should
update the javadocs to reflect the change.

We also make a recommendation for developers to call through to the
super implementation to maintain consistency in navigation patterns
throughout the platform, especially for things like splash screens.

Bug: 186142540
Bug: 188832670
Test: None
Change-Id: I1c71250b26bec743be15f4ac95965ef046dcf4f3
2021-06-14 19:37:22 +00:00
Calin Juravle
b6e7f8aa77 Merge "Register the DexLoadReporter before creating the main class loader" am: 6fe0c8ea30 am: 0bd0d7e053
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1735263

Change-Id: I4d42d5b4721354a8f98ba0e24f69a72be0066290
2021-06-14 18:06:55 +00:00
Les Lee
5ac7901f25 Merge "Fix: query TYPE_WIFI usage with empty string" am: d9905a0e64 am: e0c2f2d5d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727620

Change-Id: Ia869e47edec33397ccac5ec97fddf633fc9b8ab7
2021-06-14 16:59:57 +00:00
Calin Juravle
60f7b38892 Register the DexLoadReporter before creating the main class loader
We used to register the DexLoadReporter after the main class loader
was created. That was done to avoid superfluous reports of the app's
primary apks (since we already know about them).

However that also means that if the app would start as an isolated
process we would miss this signal in the DexManager.

Make sure we get signals for isolated processes by registering the
reporter before we create the main class loader.

Test: manual, using chrome and maps go
adb shell cmd package compile -m speed-profile com.android.chrome
adb shell am start -n \
com.google.android.apps.mapslite/com.google.maps.lite.twa.MapsLiteTwaLauncherActivity
adb shell dumpsys package dexopt
(confirm that chrome is used by an isolated process)
adb shell cmd package compile -m speed-profile com.android.chrome
(confirm that chrome is speed compiled - or verify, based on the device
setting)

Bug: 163018062
Merged-In: I5d683ae85b3973cc2011dd33b4cb14837b18005f
Change-Id: I5d683ae85b3973cc2011dd33b4cb14837b18005f
(cherry picked from commit 875888eff3)
2021-06-14 16:51:39 +00:00
Calin Juravle
6fe0c8ea30 Merge "Register the DexLoadReporter before creating the main class loader" 2021-06-14 16:51:03 +00:00
Calin Juravle
875888eff3 Register the DexLoadReporter before creating the main class loader
We used to register the DexLoadReporter after the main class loader
was created. That was done to avoid superfluous reports of the app's
primary apks (since we already know about them).

However that also means that if the app would start as an isolated
process we would miss this signal in the DexManager.

Make sure we get signals for isolated processes by registering the
reporter before we create the main class loader.

Test: manual, using chrome and maps go
adb shell cmd package compile -m speed-profile com.android.chrome
adb shell am start -n \
com.google.android.apps.mapslite/com.google.maps.lite.twa.MapsLiteTwaLauncherActivity
adb shell dumpsys package dexopt
(confirm that chrome is used by an isolated process)
adb shell cmd package compile -m speed-profile com.android.chrome
(confirm that chrome is speed compiled - or verify, based on the device
setting)

Bug: 163018062
Change-Id: I5d683ae85b3973cc2011dd33b4cb14837b18005f
2021-06-14 14:31:57 +00:00
Kholoud Mohamed
013e3748c3 Merge "Fix security vulnerability in DPMS" into sc-dev am: 58d0a17836
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919135

Change-Id: Ia405b5ed58d9eca1d4b8431f5adc52d565e6a1c3
2021-06-14 09:29:00 +00:00
Kholoud Mohamed
58d0a17836 Merge "Fix security vulnerability in DPMS" into sc-dev 2021-06-14 09:11:57 +00:00
Suprabh Shukla
c3f067c103 Handle exact alarm permission state changes
The permission SCHEDULE_EXACT_ALARM state changes at the following
boundaries:
 1. App-op: This gets toggled by the user via Settings.
 2. Deny-list: Packages can be added to the deny list via DeviceConfig
 APIs.
 3. Package changes: A package's manifest may changes when it gets
 updated.

In both cases 1 and 2, if alarm manager detects a permission change
from revoked to granted, it sends the
ACTION_SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED broadcast to the
app.
If it detects a permission change from granted to revoked, it kills
all the processes within the hosting uid.
In all three cases, when the permssion changes from granted to revoked,
all the exact alarms scheduled by the relevant package are removed.
Package updates are treated differently as they require processes to
restart anyway. The broadcast is not needed in this case as there
are no alarms expected to have been lost by a previous revocation, and
apps can always use ACTION_MY_PACKAGE_REPLACED for post-update setup as
usual.

All this only applies to packages that have the change
REQUIRE_EXACT_ALARM_PERMISSION enabled.

Also changed canScheduleExactAlarms to return false if the change is not
enabled for the calling package.

Test: atest FrameworksMockingServicesTests:AlarmManagerServiceTest
atest CtsAlarmManagerTestCases

Bug: 179541791
Bug: 187206399
Change-Id: Icd68275701f2804be65b3a10a7dd81bbf6e2a0bb
2021-06-13 16:55:21 -07:00
Erik Wolsheimer
188e1736d3 Merge "Store whether attribution tag is valid separate from bypass" into sc-dev am: 6d3212e617
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14955197

Change-Id: I4e57121d58d758838849043cb91a818cd2444bf9
2021-06-13 03:28:17 +00:00
Erik Wolsheimer
947cb752b8 Store whether attribution tag is valid separate from bypass
Bug: 189484870
Bug: 190073375
Test: Manual
Change-Id: Iccc0e887d28c837a8ef4099af611794590af25c5
2021-06-12 16:36:57 -07:00
Les Lee
6a358bf024 Fix: query TYPE_WIFI usage with empty string
Starting with API level 31, the subscriberId is applicable
for the wifi network. Considering applications may use
null or an empty string as subscriberId (for instance, cts),
frameworks create MATCH_WIFI_WILDCARD NetworkTemplate when querying
wifi network with null or an empty string which is the behavior before
API level 31.

Bug: 188915450
Test: atest -c NetworkStatsManagerTest

Change-Id: I084b69903f8ba7a6225b312560752e8508938714
2021-06-11 18:14:50 +08:00
Ryan Mitchell
0b81d98549 Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev am: 55128109d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923667

Change-Id: I0223ae25eaccbb5357b6738e0b75df7c534a72a3
2021-06-10 19:52:00 +00:00
Ryan Mitchell
55128109d9 Merge "Fix RRO handleConfigurationChanged race condition" into sc-dev 2021-06-10 19:49:40 +00:00
Ryan Mitchell
119a7f5591 Fix RRO handleConfigurationChanged race condition
Retrieval of the system and system UI themes should be done with the
ResourcesManager lock held to ensure the theme retrieved has the new
overlays applied.

Bug: 189100984
Test: manual
Change-Id: Ibe27ec745ea5a914d3d05e393598a336d96a55e6
2021-06-10 08:41:17 -07:00
Pavel Grafov
0365d2850a Merge "Don't reset user VPN without reason" into sc-dev am: c0115519f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717702

Change-Id: I4fb463bae9700c5e633ec10e5d6fe0090783734e
2021-06-10 15:36:37 +00:00
Pavel Grafov
c0115519f6 Merge "Don't reset user VPN without reason" into sc-dev 2021-06-10 15:31:04 +00:00
kholoud mohamed
342fd83483 Fix security vulnerability in DPMS
Changed DPMS#isPackageAllowedToAccessCalendarForUser to always require
INTERACT_ACROSS_USERS/_FULL permission if called for a different uid
than the calling uid.

Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Bug: 187043716
Change-Id: I230bbffbdf97c251c8a40add097b3b4254d39452
2021-06-10 13:49:25 +00:00
James O'Leary
dc4c3fbc4b Merge changes from topics "quantizer_improved_logic", "reintroduce_scaling_fixes" into sc-dev am: e0970984c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14802974

Change-Id: I85e5f01f2a1ca271a779ea251613dcee87dc16da
2021-06-09 22:29:34 +00:00
James O'Leary
e0970984c8 Merge changes from topics "quantizer_improved_logic", "reintroduce_scaling_fixes" into sc-dev
* changes:
  Quantize image to 128 colors instead of 5
  Quantizer improvements
  Sort colors from high count => low count
  Don't interpolate image input to quantizer
  Cache set wallpaper as PNG instead of JPEG
  Only rescale wallpaper if its > display height
2021-06-09 22:23:24 +00:00
Julia Reynolds
78cea6e7e4 Merge "Update logic about parent and convo channels" into sc-dev am: b87598c3cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14907947

Change-Id: I1022456aabdd973fac8f9617f62ae95460c3cbf7
2021-06-09 18:02:32 +00:00
James O'Leary
bf1b65be0e Quantize image to 128 colors instead of 5
Quantizing an image to five colors results in an extreme amount of
averaging of colors, leading to low chroma colors and erasing colors
from the image that the eye gravitates towards.

Coupled with a change to ensure there's still a broadly accurate signal
of a given cluster's population of the image, via summing the population
of all the clusters close to the hue of the cluster, and with proof that
having this many data points doesn't lead to instability in results,
we gain access to a much larger variety of colors. This gives room to
add heuristics to avoid 'bad' colors, as well as increase the
number of colorful colors we offer.

Bug: 189931209
Test: Test tons and tons of wallpapers over a couple days.
Change-Id: Ifc2d9393039194c151920536b9217ae9636ff0d6
2021-06-09 13:33:41 -04:00
James O'Leary
d1bc261d8d Quantizer improvements
The original versions of these quantizers landed a couple months back,
and they were fine. Since then, we've had several opportunities to
iterate on them. This change lands improvements from those iterations.
TL;DR: 18% faster, big bug fix to WSMeans, code is cleaner (hopefully)

- QuantizerMap indexes an image's pixels, 'unique-ing' them by reducing
the pixel array to a map with keys of colors, and values of population.
This allows other quantizers to operate much more quickly: instead of
working on each pixel individually, they're able to operate in bulk.
- QuantizerWu uses flat arrays instead of 3D arrays and is more
understandable IMHO.
- QuantizerWsmeans has speed improvements, most importantly, it has a
big bug fix. When a Kmeans-based quantizer algo starts, it must first
assign the pixels to any one of the starting clusters. The original
implementation decided what cluster to assign a pixel to by finding the
cluster closest to the pixel. However, the algo terminates if no pixels
moved after one iteration of the algorithm, and since the pixels were
already in the cluster closest to them, the algo would immediately
terminate before it actually figured out where the cluster moved to
after pixels were assigned to it, and had a chance to move pixels around
based on that.
- Funnily enough, even though this _should_ mean Wsmeans got a lot
slower since it has to do more iterations, it is actually 16% faster

Additionally, during review of this CL:
An accidental dependency on iteration order of a Set was introduced,
causing inconsistent initialization of the mPoints array, creating
inconsistent results from the quantizer.

Removing the dependency on hashes of float[], and avoiding Maps
altogether, removes a dependency on hash codes of pointers that existed
during review, making it easier to have verifiable consistency across
iterations. This also improves speed slightly, from 55 ms to 39 ms
(tested on sunfish, first 9 wallpapers in Landscapes, City Scapes, and
Art categories, and averaged)

Bug: 189931209
Test: ran performance tests with VariationalKMeansQuantizer,
the previous Celebi = Wu + Wsmeans quantizer, and the new Celebi =
new Wu + new Wsmeans quantizers, over 100 iterations. Wu speed is
roughly the same, Wsmeans is 18%. Verified quantizer output is stable
for the same input pixels, run 100,000 times for each of two wallpapers.
Change-Id: I3324d29860c098ea1fd602b8d4197837e732f4f1
2021-06-09 13:33:41 -04:00
Julia Reynolds
b87598c3cc Merge "Update logic about parent and convo channels" into sc-dev 2021-06-09 17:33:23 +00:00
Rubin Xu
6cfe624e1f Merge "Allow any apps to call DPM.isUsbDataSignalingEnabled()" into sc-dev am: b9be267361
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14807577

Change-Id: I007834e3abb82662d3790fd275a57706b9747139
2021-06-09 16:13:08 +00:00
Rubin Xu
b9be267361 Merge "Allow any apps to call DPM.isUsbDataSignalingEnabled()" into sc-dev 2021-06-09 15:54:21 +00:00
James O'Leary
70cfb49c65 Sort colors from high count => low count
The colors were being sorted by population ascending, sorting by
population descending fixes a long-standing flaky test that became
a 100% reproducible failure once scaling fixes were introduced.

The test failure that caught this is CTS' WallpaperManagerTest's method
wallpaperColors_secondary. It creates a bitmap that is mostly red, with
a smaller area of blue.

Before the set of 4 CLs in this topic, when the wallpaper was downscaled
by WallpaperManager, it introduced new colors to the wallpaper due to
bilinear filtering and JPEG compression. With the new colors introduced
by scaling, the least popular color was blue enough to pass
WallpaperManagerTest's wallpaperColors_primary method, and the 2nd least
popular color was red enough to pass wallpaperColors_secondary.

With CLs for consistent image input to quantizers, namely 2 CLs, cache
wallpaper as PNG instead of JPEG, and only rescale the wallpaper if it
is greater than the display height, the scaling/JPEG artifacts are not
introduced, which then exposes the bug that primary/secondary were the
least popular/2nd least popular colors in the image, instead of the
most popular/2nd most popular, as intended.

Bug: 188373181
Test: atest CtsAppTestCases:android.app.cts.WallpaperManagerTest
#wallpaperColors_secondary --, use helper methods to store
the bitmap after downscaling to confirm introduction of new colors
before other CLs in this topic, use go/monetstudio to confirm
quantization results from that downscaled image. Check test against
all 4 CLs, confirm test starts failing once "Only rescale wallpaper if
its > display height" CL is introduced.

Change-Id: I143f824fbd961b81604d427a0570b3a171bdeb79
2021-06-09 11:31:57 -04:00