Commit Graph

21239 Commits

Author SHA1 Message Date
Wu Ahan
dcf263a2bc Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09cab3 am: 96c0c34fb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307

Change-Id: Ic8ec587e86ec11f8d0fe8b1b4bce756c7f813d66
2022-01-19 22:34:15 +00:00
Wu Ahan
96c0c34fb9 Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09cab3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307

Change-Id: If81af003f6b9c82e42076a38196787e7ba9dea6a
2022-01-19 22:15:57 +00:00
Wu Ahan
4c5f09cab3 Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"
This reverts commit 51b874f628.

Reason for revert: will deliver a better fix for that, ag/16580245.

Change-Id: Icf2d0a656512e6b6bb46dd7ffef3e3cd71ac1a37
2022-01-13 14:39:56 +00:00
Josh Tsuji
52d5d43afc Merge "Merge "Don't allow background apps to change theme" into sc-dev am: d47e6d84d1" into sc-qpr1-dev am: df4bc3589e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16517186

Change-Id: I7dc5a52f84fb1a45d539390bfcf525618edf2fc2
2021-12-22 20:24:08 +00:00
TreeHugger Robot
a5e9066c27 Merge "Don't allow background apps to change theme" into sc-dev am: d47e6d84d1
Fixing imports conflict

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

Test: build
Fixes: 211693294
Merged-In: I2086b29ef9bf3bb6fb7d9ebba6e7b8db9392e459
Change-Id: I3039403e7400a141f58f4589ef0fdae3f97b9a40
2021-12-22 18:15:35 +00:00
TreeHugger Robot
d47e6d84d1 Merge "Don't allow background apps to change theme" into sc-dev 2021-12-21 23:23:06 +00:00
Hui Wu
8c7f2f8695 Merge "Adding owners in cloudsearch packages" am: d628edb425 am: f921b4b76d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1925161

Change-Id: I60c619f8c1275b22e069aa256b1569c1efe9eebe
2021-12-16 20:44:09 +00:00
Hui Wu
d628edb425 Merge "Adding owners in cloudsearch packages" 2021-12-16 19:33:49 +00:00
Junyu Lai
a562604531 Merge "[MS03] Remove ServiceNotFoundException hidden API usage" am: 7fee9dd710 am: c270bbf232
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878043

Change-Id: I8d973c5e74e72621b4083b7389c5c5ca6f37de60
2021-12-16 11:17:15 +00:00
Junyu Lai
7fee9dd710 Merge "[MS03] Remove ServiceNotFoundException hidden API usage" 2021-12-16 10:42:15 +00:00
Hui Wu
fa11d35357 Adding owners in cloudsearch packages
Bug: 210528288
Test: not needed as this is a meta file change
Change-Id: I6bbf9f350639ed53edb1643c937c8c55702ff254
2021-12-16 00:03:19 +00:00
Treehugger Robot
2755887938 Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 6a8b9f3964 am: f9ed5725da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899035

Change-Id: I70d0ad84b306d15e890cca70ac31eb711ebba198
2021-12-13 15:52:37 +00:00
Treehugger Robot
f9ed5725da Merge "Register NSD service from ConnectivityFrameworkInitializerTiramisu" am: 6a8b9f3964
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899035

Change-Id: I658096512da1c4eaa6b60691f6f226b86adb44fe
2021-12-13 15:29:43 +00:00
paulhu
474a8aaffc Register NSD service from ConnectivityFrameworkInitializerTiramisu
INsdManager is going to move into connectivity mainline module
and it will be not visible to SystemServiceRegistry after
migration done. Thus, use ConnectivityFrameworkInitializerTiramisu
to register NSD service instead.

ConnectivityFrameworkInitializerTiramisu will be implemented in
the framework-connectivity-tiramisu bootclasspath JAR, which need
to be separated from the S+ framework-connectivity bootclasspath
JAR to be only loaded by the module on T+. So its methods cannot
be in the same class as ConnectivityFrameworkInitializer.

Bug: 206702844
Test: atest FrameworksNetTests CtsNetTestCases
Merged-In: Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3
Change-Id: Ibf89ab9a35e35dac4978ba70c7ab306b6155a4a3
2021-12-13 15:33:03 +08:00
Junyu Lai
9d08a3ff2a [MS03] Remove ServiceNotFoundException hidden API usage
Since ServiceNotFoundException is not a system API. Remove
the unsupported interface which uses this exception.
This is safe since the method annotated with maxTargetSdk = R
and from dashboard it is not using by anybody.

Test: TH
Bug: 204830222
Change-Id: Ib8c0ce7b165732d24929851792d35371b90a5dfc
2021-12-13 06:26:07 +00:00
Treehugger Robot
f626e66561 Merge changes from topic "ms07-movestats" am: 942c713c9d am: 6d0a6803c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895044

Change-Id: Ieac82283e7f0a3cfdaceaff44bdabb3b21587c03
2021-12-10 19:20:32 +00:00
Treehugger Robot
6d0a6803c9 Merge changes from topic "ms07-movestats" am: 942c713c9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895044

Change-Id: I85d704b09dac07e91b8400a2bbd15867e2b80d6d
2021-12-10 18:57:08 +00:00
Junyu Lai
d82296cf33 [MS08] Move NetworkStats files to f/b/package/ConnectivityT
NetworkStatsService is going to be moved into ConnectivityService
module. Move all related files to packages/ConnectivityT so that
it can be easily migrate these files to connectivity module
after clearing the hidden API usages.

Bug: 197717846
Test: TH
Change-Id: Iead00832b5eb7b1dc40a92027c5a14ae8316b16c
2021-12-10 16:11:08 +00:00
Wu Ahan
21df742dd4 DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 51b874f628 am: f374966fd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375906

Change-Id: I6d9e94362504d6c8cf58c66c6729a19b28d5cead
2021-12-09 02:01:15 +00:00
Wu Ahan
f374966fd9 DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 51b874f628
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375906

Change-Id: I181af4dcc8c850c9f610736e8fb0fab0f60b6012
2021-12-09 01:45:15 +00:00
Wu Ahan
51b874f628 DO NOT MERGE: Decode the input of both setStream and setResource calls first
The size of the input of both setStream and setResource may very big
that system server got oom while handling it, so we try to decode it
first before copying it to the wallpaper path, if the decoding fails, we
treat the input as an invalid input.

Bug: 204087139
Test: Manually set wallpaper, no PDoS observed.
Change-Id: I014cf461954992782b3dfa0dde67c98a572cc770
2021-12-06 03:11:47 +00:00
Peiyong Lin
9e526c1d91 Merge "Add owners for GameManager and GameManagerService" am: 6e9b910de2 am: 3afdacc87b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896952

Change-Id: Ic5c758c011bf2a98db0d6393b288d058f71dfba8
2021-11-18 23:04:05 +00:00
Peiyong Lin
3afdacc87b Merge "Add owners for GameManager and GameManagerService" am: 6e9b910de2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896952

Change-Id: I743b627784dd5b39cfd645fe41eb67bd5587acf0
2021-11-18 22:47:30 +00:00
Peiyong Lin
ab0ae6b571 Add owners for GameManager and GameManagerService
Bug: N/A
Test: N/A
Change-Id: I48f986e1ca5eadc6c23ca693143f122e415eeefd
2021-11-18 18:25:14 +00:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
2021-11-18 17:00:37 +00:00
Lucas Dupin
efaa814a99 Don't allow background apps to change theme
A background app that changes the wallpaper, was able to change the
device theme.

This change will apply the theme if the app is on the foreground, like
WallpaperPicker would be, but would defer the event until the next power
button cycles, like we do with Live Wallpapers, to avoid the same type
of DoS.

Test: manual
Test: atest ThemeOverlayControllerTest
Fixes: 205140487
Change-Id: I2086b29ef9bf3bb6fb7d9ebba6e7b8db9392e459
Merged-In: I2086b29ef9bf3bb6fb7d9ebba6e7b8db9392e459
2021-11-11 19:10:41 +00:00
Varun Shah
41e23753cc Merge "Update deletion conditions for a package's UsageStats." into sc-dev am: 2a14be36ff am: 837f58f7fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222839

Change-Id: I483fcba4ada48dcb8be415063f101d523def3a8b
2021-11-11 01:37:09 +00:00
Varun Shah
e1a38189da Merge "Update deletion conditions for a package's UsageStats." into sc-dev am: 2a14be36ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222839

Change-Id: Ic05768dc4213e00f93829ace282fd847dc2e5fed
2021-11-11 01:19:38 +00:00
Varun Shah
837f58f7fa Merge "Update deletion conditions for a package's UsageStats." into sc-dev am: 2a14be36ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16222839

Change-Id: I4eabd7f3cafc5e95399e7265c56c937c04d5992d
2021-11-11 01:18:16 +00:00
Varun Shah
157fbcfbe4 Update deletion conditions for a package's UsageStats.
If a profile owner is defined for a specific user, do not delete usage
stats for a package on package deletion.

Bug: 197399948
Test: atest UserUsageStatsServiceTest
Test: atest UsageStatsTest [all]
Change-Id: I94a8e3dfca8ef4c7616f77944d61726e06043b85
Merged-In: I94a8e3dfca8ef4c7616f77944d61726e06043b85
2021-11-10 17:11:32 +00:00
Wei Sheng Shih
6ff3d2241c Merge "setTurnScreenOn can only used as wakeup" am: 385935d07f am: a833f2152a am: b87acfcfde
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884170

Change-Id: I31e99549b48b1fb257915ba285a7c2454d31d179
2021-11-08 07:57:38 +00:00
Wei Sheng Shih
b87acfcfde Merge "setTurnScreenOn can only used as wakeup" am: 385935d07f am: a833f2152a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884170

Change-Id: I812de347deb83ced762560260b62544c924b7056
2021-11-08 07:44:40 +00:00
wilsonshih
966a61366e setTurnScreenOn can only used as wakeup
setTurnScreenOn shouldn't dismiss keyguard automatically even when the
keyguard is insecure.
The keyguard state should only be affected by requestDismissKeyguard
and/or setShowWhenLocked, and for either case setTurnScreenOn can be
used to wakeup device if the activity is going to be resumed and
visible.

Bug: 201103497
Test: atest ActivityVisibilityTests KeyguardTests KeyguardLockedTests
Change-Id: I283dea469a33286fc9cf835e39ee5a3be2444739
(cherry picked from commit f3a1274a38)
2021-11-08 07:18:20 +00:00
wilsonshih
5ffa690f0c setTurnScreenOn can only used as wakeup
setTurnScreenOn shouldn't dismiss keyguard automatically even when the
keyguard is insecure.
The keyguard state should only be affected by requestDismissKeyguard
and/or setShowWhenLocked, and for either case setTurnScreenOn can be
used to wakeup device if the activity is going to be resumed and
visible.

Bug: 201103497
Test: atest ActivityVisibilityTests KeyguardTests KeyguardLockedTests
Change-Id: I283dea469a33286fc9cf835e39ee5a3be2444739
2021-11-08 11:04:10 +08:00
Bill Yi
ba584f1fa1 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I7e267e3c046d726750180efa81806cbbefb17b68
Merged-In: I5ff5973c95868bee2b7444ecded7443d6e6429c9
Change-Id: Ic3cd62083de4219dbf52f568ca4f34bdc7a08516
2021-11-02 21:07:53 -07:00
lucaslin
6a6fe48094 Add new appOps to track the behavior of VPN app am: e89ec676a4 am: f050c4f072 am: 071b7b5ed8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854373

Change-Id: I3f03cd91566c1c2aca478f42937ea5d09ff659ee
2021-11-01 09:20:36 +00:00
lucaslin
071b7b5ed8 Add new appOps to track the behavior of VPN app am: e89ec676a4 am: f050c4f072
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854373

Change-Id: Ic141975cf5747210aae605f3fbe6cb72e1fa2ca0
2021-11-01 09:02:07 +00:00
lucaslin
f050c4f072 Add new appOps to track the behavior of VPN app am: e89ec676a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854373

Change-Id: Id325da12dc7b08b05a9ca789dc655bd98bead967
2021-11-01 08:46:44 +00:00
Lucas Lin
357179542a Merge changes from topic "VPN_APPOPS"
* changes:
  Add startOp and finishOp to track the behavior of VPN app
  Add new appOps to track the behavior of VPN app
2021-11-01 08:33:36 +00:00
Brad Stenning
779d574b3d Merge "Allow a shared library to be positioned after the application on the classpath" am: 3120b13f56 am: 6e2646eacd am: dfb49ce58c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852914

Change-Id: Id6cf9e1e78db5f8aea040bcf51b24435a7529e0f
2021-10-27 22:02:48 +00:00
Brad Stenning
dfb49ce58c Merge "Allow a shared library to be positioned after the application on the classpath" am: 3120b13f56 am: 6e2646eacd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852914

Change-Id: I6b68af9a6f028103453e4cb6e014e852ef8838d1
2021-10-27 21:43:17 +00:00
Brad Stenning
3120b13f56 Merge "Allow a shared library to be positioned after the application on the classpath" 2021-10-27 21:06:17 +00:00
Brad Stenning
89dfd0902e Allow a shared library to be positioned after the application on the classpath
This is useful if/when it's desired that an application contains the same
fully qualified class name that's also in the library.

The shared libraries that are treated in this manor are controlled by the resource
com.android.internal.R.config_shared_libraries_loaded_after_app

Bug: 179429740

Test: atest SharedLibraryLoadingTests

Change-Id: Ia37ff9bd545918d1e0f1f38548dcd86f177559d5
2021-10-27 10:06:16 -07:00
Chalard Jean
9bdb13089e Merge "Remove the static application context fetcher" am: 35cbd1d5ee am: ac2bc495f5 am: 4afb2fa833
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870453

Change-Id: Ib142d3e85962c9e4c24a782a691fc387ce5aec15
2021-10-27 06:16:54 +00:00
Chalard Jean
4afb2fa833 Merge "Remove the static application context fetcher" am: 35cbd1d5ee am: ac2bc495f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870453

Change-Id: I8f46557f919db2fa777b8fcab49c30c316b7278e
2021-10-27 05:49:11 +00:00
Chalard Jean
ffeab27dbd Remove the static application context fetcher
On the plus side, this is no longer used and can be removed.
On the minus side, the bug it used to solve is back : b/202978965

Still this should be removed.

Test: build
Change-Id: I32f5b38539864ce2846793863cc20e245823e3c7
2021-10-26 16:00:52 +09:00
lucaslin
e89ec676a4 Add new appOps to track the behavior of VPN app
OPSTR_USE_VPN_SERVICE is used for tracking VPN app which uses
VpnService.
OPSTR_USE_VPN_MANAGER is used for tracking VPN app which uses
VpnManager.

Bug: 197135981
Test: TH
Change-Id: Idaa262623440c178caf346bca76a72b673235850
2021-10-26 03:49:54 +08:00
xshu
44a90fb123 Add new wifi nearby devices app-ops am: b4933d744e am: e8a5bf3545 am: 0b632103df
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863288

Change-Id: I62eb2e26be2b95409d25362201eed9c2aa56270a
2021-10-25 18:58:58 +00:00
xshu
0b632103df Add new wifi nearby devices app-ops am: b4933d744e am: e8a5bf3545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863288

Change-Id: I645ef4e64dd2a4fa15059b53d6d7912156a1720f
2021-10-25 18:45:37 +00:00
xshu
e8a5bf3545 Add new wifi nearby devices app-ops am: b4933d744e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863288

Change-Id: Ib9d3764ccf2a0a0dbb0e943969b236fe0811a237
2021-10-25 18:40:40 +00:00