Commit Graph

21204 Commits

Author SHA1 Message Date
Bill Yi
6042a19c72 Merge sc-qpr1 to aosp-master - DO NOT MERGE
Merged-In: I90ca5ccbf686a975f479c2488ff34f82af12946a
Merged-In: I128f5ed6c1bad350ea449bba5da21123de3ea31b
Change-Id: Ib18c8042f735dceeee5e6ab9f1c963cf630913a6
2022-01-06 18:38:32 -08:00
Hui Wu
d628edb425 Merge "Adding owners in cloudsearch packages" 2021-12-16 19:33:49 +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
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
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
Varun Shah
a70c46b8a5 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
(cherry picked from commit 157fbcfbe4)
Merged-In:I94a8e3dfca8ef4c7616f77944d61726e06043b85
2021-11-24 23:22:06 +00:00
wilsonshih
bc506448b9 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)
(cherry picked from commit 966a61366e)
Merged-In:I283dea469a33286fc9cf835e39ee5a3be2444739
2021-11-24 23:21:56 +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
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
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
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
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
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
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
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
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
Alex Johnston
4e8851d0d8 Revert "Revert "Cherrypicking flags and override methods for all..."
Revert "Revert "Required change for adding overload method for r..."

Revert submission 1842720-revert-1836473-receiverChangesinAOSP-FWJQDTADTI

Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/202144225
Reverted Changes:
I03409ea39:Revert "Required change for adding overload method...
I583a11d2a:Revert "Cherrypicking flags and override methods f...

Change-Id: I5cdf9c74d51a259fdaa43dfdc9423d22145eac60
2021-10-05 14:57:10 +00:00
Bernardo Rufino
9e26212dac Avoid full unparcelling where possible in Bundle
and put a warning where it's not possible. This is to make sure we know
when to touch bundles provided by apps.

In this CL:
* deepCopy() now doesn't deserialize lazy objects before copying. It
  doesn't copy them either, it merely passes them into the new map as
  the same reference. This works because we implemented fine-grained
  locking into each lazy value, so concurrent access won't be a problem.
  Furthermore, LazyValue caches the deserialized object, so we'd still
  honor the contract of deepCopy() that "Other types of objects (such
  as Parcelable or Serializable) are referenced as-is and not copied in
  any way". I had to perform one extra check in the synchronized block
  in LazyValue to guarantee this (double-checked locking), I explain
  that in the comments.
* Removed filterValues() and codepaths that used it. This was created
  with the purpose of removing items whose classes weren't available to
  the system to prevent crashes coming from full deserialization. This
  is not a concern anymore with lazy bundle, hence we can remove the
  codepaths altogether (see email for more details).
* Put warnings in javadoc of getMap() and PeristableBundle().

Test: Boots
Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I14bb6a7874814f42cbcc6b5fd372c42752aa74c8
2021-10-05 13:39:36 +01:00
Jacky Kao
c3404a20aa Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9 am: 9403386966
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: I2bf6d7e1885ac56e79111263f6de6e44dbf1e18c
2021-10-05 02:29:33 +00:00
Jacky Kao
9403386966 Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa am: 1a894180c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: Icdc4fc061e2b7208fdc6d4e17da860e47bc4548a
2021-10-05 02:19:52 +00:00
Jacky Kao
1a894180c9 Merge "Revert "Cherrypicking flags and override methods for allowing dy..."" am: 98ff8ecdaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842721

Change-Id: Ieaed4fcc2fa97db551a70f4a3076b4237acfb8ab
2021-10-05 02:08:29 +00:00
Jacob Hobbie
56fe73076c Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336 am: 7e5da1ee2e am: 060b377211
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I2ab664531cdf77d597ff19ccff5abadf30215862
2021-10-05 01:56:58 +00:00
Jacky Kao
0827cf0cca Revert "Cherrypicking flags and override methods for allowing dy..."
Revert "Required change for adding overload method for registerR..."

Revert submission 1836473-receiverChangesinAOSP

Reason for revert: <INSERT REASONING HERE>
Reverted Changes:Making build break
I906ce9eb0:Required change for adding overload method for reg...
I9a16f566c:Cherrypicking flags and override methods for allow...

Change-Id: I583a11d2a23651db24acde303d522a5faae15c6b
2021-10-05 01:48:25 +00:00
Jacob Hobbie
060b377211 Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336 am: 7e5da1ee2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I9cd085b98819b50bd520d44220b8b8dec9ce802c
2021-10-05 01:44:09 +00:00
Jacob Hobbie
7e5da1ee2e Merge "Cherrypicking flags and override methods for allowing dynamically registered receivers to mark themselves explicitly as exported or not exported." am: 316e0e8336
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1836473

Change-Id: I39049e42feb66c3fa3f0ebdef8e175ae86d5d410
2021-10-05 01:24:33 +00:00
TreeHugger Robot
35700e13a7 Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev am: 66b1090499
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15843713

Change-Id: Iac3eb4af4d48a5187091e67060e3de8abe160040
2021-10-01 18:17:16 +00:00
TreeHugger Robot
66b1090499 Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev 2021-10-01 18:15:57 +00:00
TreeHugger Robot
d0bfa4c226 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: I151133e723e08ae9bb222970f5ffd81fc9880cd3
2021-09-29 17:12:59 +00:00
TreeHugger Robot
cbb7188ae0 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: Ie556f989ac6ce680b7de6caf37d71c6632ac927b
2021-09-29 17:00:13 +00:00
Etienne Ruffieux
4c70432d82 API renaming asked by API Council
Renamed all "cancelled" to "canceled" for PendingIntent.

Tag: #feature
Bug: 201405682
Test: atest android.app.cts.PendingIntentTest#testCancelListener
Change-Id: I0f5457f58836c6e80845dcd4d874a810008a320e
2021-09-29 13:08:09 +00:00
TreeHugger Robot
4230a055d3 Merge changes from topic "expose-pending-intent" into stage-aosp-master am: b4f626d13e am: 78f1a9bf51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879511

Change-Id: I66a50ffbae15636a6a2221f1b27b2449b724a26b
2021-09-28 11:13:33 +00:00
Makoto Onuki
7baac81d13 Expose PendingIntent.addCancelListener am: 30bd1bb72d am: 81767ac876
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15879510

Change-Id: I8430547bd0a27020be5bcf2c99777f2e95b7b3e5
2021-09-28 11:13:31 +00:00