Commit Graph

18628 Commits

Author SHA1 Message Date
Treehugger Robot
cc7e711cfd Merge "Move myself to emeritus section" am: c8fd9b844b am: b4a032843b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697183

Change-Id: Ie735d8b711a7e852c010398f5ea2f9ce00ead32b
2021-05-07 03:11:46 +00:00
Eran Messeri
d5296e3ec4 Move myself to emeritus section
Will no longer be actively developing Device Policy Manager code.

Bug: 187395769
Test: N/A
Change-Id: Ifed25031a8b57e22dec0c8c5e07e27a92431b13f
2021-05-06 15:13:18 +01:00
Tom Natan
65654644bc Merge "Add an API method for clearing compat overrides on release builds" am: b9680bac79 am: 9e9e1c4af5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688626

Change-Id: Ic1b9bb5b3f6cfba5192838020fc1b9770715f80a
2021-05-05 16:13:03 +00:00
Tom Natan
b9680bac79 Merge "Add an API method for clearing compat overrides on release builds" 2021-05-05 14:58:41 +00:00
tomnatan
2697018f70 Add an API method for clearing compat overrides on release builds
This will be useful when we want to clear overrides for apps that are no longer needed regardless of the version that is installed on device, e.g., when an app is being uninstalled, when we want to rollback an override, or when we deprecate a change-id.

In addition, rename CompatChanges#setPackageOverride to
addPackageOverrides.

Bug: 183183372
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: Iff416c8b4c88b5eddc9e21c73219198d23266fa1
2021-05-05 07:10:41 +00:00
Tom Natan
bfc894c34f Merge "Document version codes in CompatChanges API" am: d4691f8a31 am: de7b72d03e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688067

Change-Id: Ibf988dded00d18d3ceb7e7642e466641eea27862
2021-04-28 10:00:17 +00:00
Benjamin Franz
d6124893c0 Document version codes in CompatChanges API
Bug: 184654568
Test: make docs
Change-Id: Ie3bc5cccefd794cdd75be9c61d707b8679025ad8
2021-04-27 12:29:31 +00:00
Mathew Inwood
8a46fb77b2 Merge "Revert^2 "API changes as requested by API council."" am: 0bd58c09b2 am: 67084eda34
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684202

Change-Id: Ide1a12e8e7507383b4c233ff88a1a63590f0210e
2021-04-26 08:55:23 +00:00
Mathew Inwood
1f71b142e5 Revert^2 "API changes as requested by API council."
0b13609925

Change-Id: I88039e798e26e2f3f33d5e3b85865b2958a963a1
2021-04-22 14:47:34 +00:00
Florian Mayer
c60be93eef Merge "Revert "API changes as requested by API council."" am: 6b4ecd94c1 am: 5e3ed6416a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683628

Change-Id: If9f9aae036070f0f49ff0f016fc164ad07a4ee00
2021-04-22 14:41:34 +00:00
Florian Mayer
0b13609925 Revert "API changes as requested by API council."
Revert "API changes as requested by API council."

Revert submission 1662226-compatibility-rename

Reason for revert: Broke aosp-stage-master.
Reverted Changes:
Ie465c49ff:API changes as requested by API council.
I3c5a5734b:API changes as requested by API council.
I16bf86a9c:API changes as requested by API council.

Change-Id: I3af51d240cec9dac013d81dc448b44ef2ca60f9c
2021-04-22 13:58:55 +00:00
Treehugger Robot
a1d8ab1ac9 Merge "API changes as requested by API council." am: 359a8859aa am: 521cb5949f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662459

Change-Id: I60b899f2e3f57bfce4856df131d7d9f07dad041c
2021-04-22 13:12:17 +00:00
Mathew Inwood
080e301930 API changes as requested by API council.
Bug: 183512729
Test: m
Merged-In: Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4
Change-Id: Ie465c49ff02065e78a2e8e211a13350a0ff7f0a4
2021-04-21 10:24:50 +01:00
Donald Chai
afa759cd3e Merge "Fix typo" am: 6b5e6bba9b am: f3fcd261ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676087

Change-Id: I933a3bba4bf54759c015772455372be3a2ab64f1
2021-04-15 18:37:11 +00:00
Donald Chai
979191a80b Fix typo
Change-Id: I2fccfa4d88e157eccaa822105484ae56297bc1c9
2021-04-14 23:26:30 +00:00
Bill Yi
4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
2021-04-13 19:36:45 -07:00
Steven Moreland
1dce7fe5f7 Merge "reflect libbinder/am split" am: da164b6f83 am: af31a081dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664801

Change-Id: Ieb02fc37074b906baca37510ce9f145e9d18ac3a
2021-04-08 22:12:21 +00:00
Christopher Tate
33b7a223b1 DO NOT MERGE - Disallow deletion of channels with FGS notifications am: 2a33098b6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13533554

Change-Id: I2ef6e18ac31692cb083411cbac5e08eaee4fda0a
2021-04-06 16:29:10 +00:00
Steven Moreland
2b5acf1040 reflect libbinder/am split
Minimizing cost for using libbinder.

Bug: 183654927
Test: boot
Change-Id: I1a4785a58afcaf2d312ef52a07f41fe3dd3a8fa6
2021-04-05 23:19:26 +00:00
Louis Chang
2b5dae1c57 Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev am: b6d433cdbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13896651

Change-Id: I199c71ab75007a6fef25c71ecf433d2f939e43e9
2021-03-31 06:55:05 +00:00
Louis Chang
b6d433cdbd Merge "Dump warning logs to prevent app crash while no top-resumed changes" into rvc-qpr-dev 2021-03-31 06:15:30 +00:00
Treehugger Robot
f555b4252e Merge "Create a new permission to override Overridable change ids" am: 44008b63fb am: a5b9c920e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599153

Change-Id: I2f32113b8421c56ad9e0705ce240eed71c323c61
2021-03-25 18:06:23 +00:00
Treehugger Robot
44008b63fb Merge "Create a new permission to override Overridable change ids" 2021-03-25 17:35:45 +00:00
Benjamin Franz
229b809643 Create a new permission to override Overridable change ids
With this change we allow system packages with the new permission to
override ChangeIds specifically annotated as Overridable to set
overrides even on non-debuggable builds.

Bug: 174043039
Bug: 175874108
Test: atest FrameworksServicesTests:CompatConfigTest
Test: atest FrameworksServicesTests:PlatformCompatTest
Change-Id: Ib8d5d83b5fd62acb5808d10f5c413616f29ee65c
Merged-In: Ib8d5d83b5fd62acb5808d10f5c413616f29ee65c
2021-03-25 16:07:32 +00:00
Hui Yu
51def1dc06 Merge "Allow FGS started from MediaButtonReceiver to have while-in-use permissions." into rvc-qpr-dev am: 4221ca489c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13857805

Change-Id: I3982b3754778fd40303d501b89b3a3bf2483b0ae
2021-03-24 18:14:54 +00:00
Hui Yu
4221ca489c Merge "Allow FGS started from MediaButtonReceiver to have while-in-use permissions." into rvc-qpr-dev 2021-03-24 17:41:39 +00:00
Hui Yu
ebfad50cc1 Allow FGS started from MediaButtonReceiver to have while-in-use
permissions.

1. Create FgsWhileInUseTempAllowList, the uid on this list is allowed to
have while-in-use permission when the FGS is started from background for
a duration of time.
2. When media button is pressed, the targetUid is added to
FgsWhileInUseTempAllowList for the duration of 10 seconds, this way the
targetUid can start FGS from background and have while-in-use permission.
3. When checking for ProcessRecord.
mAllowBackgroundActivityStartsTokens, it is the caller app's
ProcessRecord should be checked instead of the service's ProcessRecord.

Bug: 182481312
Test: use b/167998084 reproduce steps, use Line app to make a voip call, the
 receiver side screen is unlocked, the receiver side uses bluetooth
headset button to pick up the call, "dumpsys activity -a" shows the FGS
"com.linecorp.voip.core.common.notification.VoipNotificationCommand" has
"allowWhileInUsePermissionInFgs=true" and "isForeground=true".

Change-Id: Ic80aefe4202fe2210881bb8eea24b6e34cb1e7d0
Merged-In: I32a14d675550cd262976bb8e16a48a070387d318
2021-03-23 23:19:19 -07:00
Louis Chang
ed9f50dd58 Dump warning logs to prevent app crash while no top-resumed changes
Applications crashed due to duplicated top resumed activity change
events. Currently, the only possible scenario we know if that the
application invokes Looper#loop() and reverse the messages order.

Write warning logs vs. throwing exceptions to prevent application
crashes.

Bug: 140571893
Test: build and boot pass
Change-Id: If6f6c502b96ccc11b230ba075c61118f03e13d5c
2021-03-19 02:37:37 +00:00
Christopher Tate
2a33098b6c DO NOT MERGE - Disallow deletion of channels with FGS notifications
Bug: 156090809
Test: atest CtsAppTestCases:NotificationManagerTest
Test: atest CtsAppTestCases:android.app.cts.ServiceTest
Change-Id: I1c2bb78d86f194585d273661cecf3419f51965df
Merged-In: I1c2bb78d86f194585d273661cecf3419f51965df
(cherry picked from commit 39b3890268913bc2dc8b90671d042c0e9b4090d2)
2021-03-17 17:29:36 -07:00
Tobias Thierer
3a9dd32f61 Merge changes from topic "bug158482162_rvc-qpr-dev" into rvc-qpr-dev
* changes:
  Fix DevicePolicyManager.isBackupServiceEnabled() breakage.
  BackupManagerService: Make new behavior conditional on ChangeId.
  Enforce BACKUP permission on Service end.
2021-03-17 12:09:13 +00:00
Chalard Jean
25cae56500 Merge "Annotate NSM heavy methods with @WorkerThread" am: db9e849986 am: 11166d7d71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859

Change-Id: I4091f82e7b95901a88cd9528c92df4519fb3edd1
2021-03-17 03:08:28 +00:00
Chalard Jean
db9e849986 Merge "Annotate NSM heavy methods with @WorkerThread" 2021-03-17 02:03:22 +00:00
Aaron Huang
ce43593e5e Merge changes from topic "pacproxy-service" am: 16f50075b1 am: 688ae36dcb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife210de3adbdaff6c88caf744d805571b365b294
2021-03-15 12:30:17 +00:00
Aaron Huang
16f50075b1 Merge changes from topic "pacproxy-service"
* changes:
  Make PacProxyService be a system service
  Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
2021-03-15 11:49:45 +00:00
Aaron Huang
5d31a15d84 Make PacProxyService be a system service
PacProxyInstaller class is running a thread all the time and is
listening to intent ACTION_PAC_REFRESH so it would be better to
make it be a system service with a manager class PacProxyManager
which is obtained with getSystemService(PacProxyManager.class).
Besides, rename PacProxyInstaller to PacProxyService will
be easier to know it's the service for PacProxyManager.

ConnectivityService is going to be a mainline module and it
needs constructor of PacProxyService to be SystemApi.
However, in current design, it needs to pass a handler and
an int arguments to the constructor which would be difficult
to maintain if just expose the constructor directly.

So, define a listener for the event that the current PAC
proxy has been installed so that the handler and the int
arguments can be removed from the constructor.

Bug: 177035719
Test: FrameworksNetTests
Change-Id: I2abff75ec59a17628ef006aad348c53fadbed076
2021-03-15 14:40:58 +08:00
Chalard Jean
ed40025e25 Annotate NSM heavy methods with @WorkerThread
Test: TH
Bug: 181906747
Change-Id: Ia30273466c1b91a3dcc5d36dac61f92185dec96e
2021-03-11 10:47:46 +00:00
Riddle Hsu
4b5690b9bd Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" am: 90e336819c am: 5028f8923a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3f761098ec224c709b1f779e3e4b296f08e265a
2021-03-10 16:38:05 +00:00
weihua.li
af6f90bbf1 Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo
Use memInfo.getTotalRss instead of memInfo.getTotalPss
to get the value of 'TOTAL of Rss Total'.

bug 182328162

Signed-off-by: weihua.li <weihua.li@unisoc.com>
Change-Id: I5487abe4870e10f4ee79c86c0ad0e75a3843deb1
2021-03-10 13:56:35 +08:00
Paul Hu
a8469c27cb Merge "New API for comparing two intents of PendingIntent object." am: 687da317ad am: 46a371b494
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0beb8b5bebdddba8e01f3dbef595212862150365
2021-03-09 11:51:29 +00:00
Paul Hu
687da317ad Merge "New API for comparing two intents of PendingIntent object." 2021-03-09 10:55:00 +00:00
paulhu
514881581d New API for comparing two intents of PendingIntent object.
Bug: 174237997
Test: atest PendingIntentTest
Merged-In: Ic5eb20f94ff6fd6953315a5f848effa25b813da7

Change-Id: Ic5eb20f94ff6fd6953315a5f848effa25b813da7
2021-03-09 02:49:43 +00:00
Sudheer Shanka
b3cb4e56ea Merge "Remove network capability from CAPABILITY_ALL constant." am: 9ffb8a6bc6 am: bae26c2434
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id47ab43ab3265371371195ce00d7e5cb6aa551cc
2021-03-06 00:38:11 +00:00
Sudheer Shanka
4d9cc95b52 Remove network capability from CAPABILITY_ALL constant.
We shouldn't include it until we also update OomAdjuster
to add it to certain processes.

Fixes: 181902246
Test: atest ./tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
Change-Id: I3bfdd2b01c3ba8010e96177e41fc90be3dce8a55
Merged-In: I888764ff22fba92fe2cccf3d8442ed318a19ad2a
2021-03-05 09:09:55 +00:00
Sudheer Shanka
2640acbea8 Merge "Add new network process capability." am: ae0fa6d359 am: 028e394c23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6894d30d9cc47c3d14596f878b0b91084a4d50e8
2021-03-04 04:23:15 +00:00
Sudheer Shanka
ae0fa6d359 Merge "Add new network process capability." 2021-03-04 03:02:49 +00:00
Xin Li
1af6a12e98 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:39 +00:00
Treehugger Robot
695f4e3373 Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 0f2ed8b795
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1f3a928ed881ddd9826675f4729f35d9d0f1727
2021-03-03 17:22:35 +00:00
Treehugger Robot
0f2ed8b795 Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b20786397ff83c0d086549a0d942c5703e31b9a
2021-03-03 16:21:54 +00:00
junyulai
33b44da527 [FUI18] Expose notifyNetworkStatus as system API
Test: m -j doc-comment-check-docs
Bug: 174123988
Merged-In: I11d4c9ab24de87fb2ad120e3787b78b73133e874
Change-Id: I11d4c9ab24de87fb2ad120e3787b78b73133e874
  (cherry-picked from ag/13749978)
2021-03-03 20:01:46 +08:00
Chilun Huang
e58d56d580 Merge "Add ownership for ConfigurationController" am: c8677e4d05 am: 00a8690dc9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612036

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7bcd0a1ec24961df911e2b89d3a83969354e6ac
2021-03-03 08:34:30 +00:00