Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
661,334 Commits 3 Branches 0 Tags
017bfa357af58d430758aecb643725475bcdaa8d
Commit Graph

21220 Commits

Author SHA1 Message Date
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
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
Oscar Shu
5b4121cb00 Merge changes from topic "nearbyWifi" 
* changes:
  Adding wifi nearby permission to DefaultPermissionGrantPolicy
  Add new wifi nearby devices app-ops
  New runtime permission NEARBY_WIFI_DEVICES
 2021-10-25 18:33:37 +00:00
Treehugger Robot
29958c66a6 Merge "Add accessibility framework team to the owners for UiAutomation. Bug:159651900 Test: n/a" am: c12df4f3b1 am: c503fcf05c am: 02d6125883 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850981

Change-Id: I90dd4fbc15aced5523bae8d20a34deaee700953e
 2021-10-20 19:57:39 +00:00
Treehugger Robot
02d6125883 Merge "Add accessibility framework team to the owners for UiAutomation. Bug:159651900 Test: n/a" am: c12df4f3b1 am: c503fcf05c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850981

Change-Id: I3c82423eb16883bee89c9d66315e8369ce9a723c
 2021-10-20 19:36:01 +00:00
xshu
b4933d744e Add new wifi nearby devices app-ops 
(cherry-picked from internal master)
This will be part of nearby devices permission group

Bug: 197776854
Test: compiles
Change-Id: I6002edfd951322d959cd8f4c7a06381badfd1660
Merged-In: I6002edfd951322d959cd8f4c7a06381badfd1660
 2021-10-19 16:26:38 -07:00
Ameer Armaly
187d8c7ac7 Add accessibility framework team to the owners for UiAutomation. 
Bug:159651900
Test: n/a

Change-Id: I7d89bfc67f2077bca00a048d79f4b90792ed8c69
 2021-10-18 20:18:14 +00:00
Jonathan Scott
7f97053267 Merge "Centralise owners for Enterprise Platform team." am: 7593e112ae am: 733ee81b03 am: c0f0020671 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860102

Change-Id: Ic33ad172213349dd93db8e534de88a81eedeaa4b
 2021-10-18 19:02:21 +00:00
Jonathan Scott
c0f0020671 Merge "Centralise owners for Enterprise Platform team." am: 7593e112ae am: 733ee81b03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860102

Change-Id: Iaa05f7bc4d0ed56c190ef8b508b0abf2e07efef1
 2021-10-18 18:50:24 +00:00
Jonathan Scott
7593e112ae Merge "Centralise owners for Enterprise Platform team." 2021-10-18 18:31:04 +00:00
Jonathan Scott
7443751dd9 Centralise owners for Enterprise Platform team. 
This will allow us to point other directories at these files for OWNERS
and make it easier to update after future team changes.

Test: N/A
Bug: 202714830
Change-Id: Iaaf5b8eb7568be4ebfd1b30abae0b757153f0391
 2021-10-18 19:28:50 +01:00
Neil Fuller
8d70e9f514 Merge "Adjust OWNERS to reflect new ownership" am: ead9d53764 am: 81115930fa am: 55f3beebb2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856324

Change-Id: I715015f2defdf26f0dd1f3e25084cd6bfd28a33b
 2021-10-13 17:36:45 +00:00
Neil Fuller
55f3beebb2 Merge "Adjust OWNERS to reflect new ownership" am: ead9d53764 am: 81115930fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856324

Change-Id: Ifba51b22f47f52aa1716dfbc621fb311a3865bba
 2021-10-13 17:21:44 +00:00
Neil Fuller
e26bbeb94a Adjust OWNERS to reflect new ownership 
This changes owners files based on latest org changes and changes
links to improve maintainability.

Changes:
+ It removes a specific owner from most to reduce future maintenance.
+ It adds indirection so android/app references the associated service
code, tests reference the OWNERS of the code under test.
+ services/core/java/com/android/server/timezonedetector/OWNERS is the
single list of time / time zone detector maintainers.
+ Code associated with time zone rules moved to libcore/ ownership
+ It adds one new file for an upcoming commit.
+ Added documentation around API purpose to API OWNERS files, since
there are multiple similar-looking package names with different purposes
/ clients.

Test: None
Bug: 189810551
Change-Id: I948d4b8eff59f3cd5ff63018949e49679795a5c0
 2021-10-13 13:57:42 +01:00
Treehugger Robot
7b03023777 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 am: cb329ca948 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: Ib1f1a23a5e3fcac9691db094f79e63b4415546b3
 2021-10-06 12:55:15 +00:00
Treehugger Robot
cb329ca948 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 am: 3aaf984908 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I598b562401860e5e838f891eb2944e49becc2fe6
 2021-10-06 12:35:43 +00:00
Treehugger Robot
3aaf984908 Merge "Avoid full unparcelling where possible in Bundle" am: 3ad4ecc296 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842226

Change-Id: I0aef93d99d83f20b22753e8e1d41cfb5c4b5cdce
 2021-10-06 12:25:47 +00:00
Treehugger Robot
3ad4ecc296 Merge "Avoid full unparcelling where possible in Bundle" 2021-10-06 12:06:59 +00:00
Alex Johnston
60be94ef59 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce am: 82b82e3a73 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I042c8fbba177a506068183be34fe8a3d053ada99
 2021-10-05 15:54:53 +00:00
Alex Johnston
82b82e3a73 Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 am: c8c3e89dce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I3d56b09b853516237428e695a21ab263722952bd
 2021-10-05 15:23:58 +00:00
Alex Johnston
c8c3e89dce Merge "Revert "Revert "Cherrypicking flags and override methods for all..."" am: 5c35d3bce6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845059

Change-Id: I90e8a4d567fe2de9ab765806fc7bd3aba4fe0845
 2021-10-05 15:11:32 +00:00