Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Baumann
015cb11e24 Handling removing <original-package> tag 
Fixes: 169414761
Test: Manual
Test: Add package A
Test: Verify package A exists
Test: Remove A, add package B w/ original-package A
Test: Verify package A exists, but codepath is to package B
Test: Replace package B w/o original-package A
Test: Verify package A removed and package B added
Change-Id: I198ca545f4fea3ae9d2328a845cbd9167eedf8da
Merged-In: I198ca545f4fea3ae9d2328a845cbd9167eedf8da
 2020-10-08 18:26:23 +00:00
Brad Ebinger
98da2d69ee Merge "Fix un-dismissable incoming call for auto-rejected calls" am: dd27d93ad6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443535

Change-Id: I3b107906f635f2591804120dc75d763d20c03c1c
 2020-10-08 18:00:24 +00:00
Brad Ebinger
dd27d93ad6 Merge "Fix un-dismissable incoming call for auto-rejected calls" 2020-10-08 17:48:00 +00:00
Rubin Xu
d40199b5b2 Fix non-inclusive terms in framework device policy logic 
Bug: 170188829
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Merged-In: I8b8ab1442c3f592a4e3ce70852025b1b169d5f18
Change-Id: I8b8ab1442c3f592a4e3ce70852025b1b169d5f18
 2020-10-08 14:22:47 +00:00
TreeHugger Robot
e5fc7e5489 Merge "Do not re-initialize synthetic password" into rvc-dev am: 5ad4ec37a0 am: b00cccb819 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12653063

Change-Id: I0aef9e528ffbf39d4590cbca17bc38cd9c927bd7
 2020-10-08 11:22:06 +00:00
Jakub Pawlowski
a32477e77e Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 am: 272efa5606 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453036

Change-Id: I1a71a69b61cf07aa2111ef1fa8d516053925053e
 2020-10-08 11:15:58 +00:00
TreeHugger Robot
b00cccb819 Merge "Do not re-initialize synthetic password" into rvc-dev am: 5ad4ec37a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12653063

Change-Id: I2681da6b3919efa0bf86241169219567c15e1864
 2020-10-08 10:55:02 +00:00
Jakub Pawlowski
272efa5606 Merge "Bluetooth: make it possible to advertise service solicitation UUID" am: 60ccba0c52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453036

Change-Id: I2820932b0d5bd80653433393a52ac7aecf1368aa
 2020-10-08 10:41:49 +00:00
TreeHugger Robot
5ad4ec37a0 Merge "Do not re-initialize synthetic password" into rvc-dev 2020-10-08 10:37:53 +00:00
Jakub Pawlowski
60ccba0c52 Merge "Bluetooth: make it possible to advertise service solicitation UUID" 2020-10-08 10:22:52 +00:00
Anton Hansson
ba259ecb01 Merge "Add last_released checking for module-lib API too" am: c34ea595c2 am: 6f7f0d2e31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452496

Change-Id: I992b3d08d6cabc9d48b3f0a75742e5dd9d216d87
 2020-10-08 09:19:38 +00:00
Anton Hansson
6f7f0d2e31 Merge "Add last_released checking for module-lib API too" am: c34ea595c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452496

Change-Id: Iee77bf3c75cd33cf0af9725ecdbcd26bb1c36b40
 2020-10-08 08:54:57 +00:00
Anton Hansson
c34ea595c2 Merge "Add last_released checking for module-lib API too" 2020-10-08 08:20:27 +00:00
Jakub Pawlowski
9b46151ead Bluetooth: make it possible to advertise service solicitation UUID 
Bug: 159827149
Tag: #feature
Test: called the API in test app, verified advertisement content
Change-Id: I3ab43e39bb7fd8fef97e141eeb981419aa3ec35a
 2020-10-08 07:26:01 +00:00
TreeHugger Robot
fa36d922fa Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d am: 488660a841 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I1fb24e81863dde068986b75e421c1dad5a483c50
 2020-10-08 05:51:31 +00:00
TreeHugger Robot
488660a841 Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c am: f1c038465d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I3a3bbd6f1b810d006cbe5e3e06fd00aa5bf09b0d
 2020-10-08 05:36:21 +00:00
TreeHugger Robot
f1c038465d Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 am: e7069bce3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671
 2020-10-08 05:05:38 +00:00
TreeHugger Robot
e7069bce3c Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a am: d29dc3d991 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Ic730c4d98a309aadcde740d77582ffb7d788337f
 2020-10-08 04:54:24 +00:00
TreeHugger Robot
d29dc3d991 Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 am: a2a586a61a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Id5bfe41bdf8ce53c5da5e9d6322abf7f9df46837
 2020-10-08 04:27:35 +00:00
TreeHugger Robot
a2a586a61a Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6db9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I52b4099eca7e8c8069b7fd7446784aae1a0569bc
 2020-10-08 04:10:10 +00:00
TreeHugger Robot
83739b6db9 Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev 2020-10-08 03:40:59 +00:00
Treehugger Robot
c3f4c873df Merge "CallScreeningService API docs cleanup." am: 834c527a3b am: fcafb9acdf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453996

Change-Id: I4b3649b618dffb42adb9f61f373417fd48859c27
 2020-10-08 03:37:49 +00:00
Treehugger Robot
fcafb9acdf Merge "CallScreeningService API docs cleanup." am: 834c527a3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453996

Change-Id: I538fedb66d8ca45aef1daba5e9ba7e26146f307c
 2020-10-08 03:02:42 +00:00
David Su
fe01f078e1 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours am: 3ea188d4d2 -s ours am: 81373b0b89 -s ours am: b6a404e7ff -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I6cf3abadb5d87cace5f6fa5990994aba253c9413
 2020-10-08 02:56:28 +00:00
Paul Hu
19c068653a Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: d00f9f0236 am: 6dad886eee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335

Change-Id: I3330b90cc1bb56b4c0964f47826d607c2f1e907c
 2020-10-08 02:49:43 +00:00
Treehugger Robot
834c527a3b Merge "CallScreeningService API docs cleanup." 2020-10-08 02:49:10 +00:00
David Su
b6a404e7ff [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours am: 3ea188d4d2 -s ours am: 81373b0b89 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I1ca9ae321eba730688222bf132953b5e9c67ab25
 2020-10-08 02:35:42 +00:00
Paul Hu
6dad886eee Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: d00f9f0236 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335

Change-Id: I53a20a48053889357e62f29799e091d22a3ffc59
 2020-10-08 02:19:12 +00:00
David Su
81373b0b89 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours am: 3ea188d4d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff6123ae0567a9066158c2c4b7a07ec3508e1bd7
 2020-10-08 02:13:39 +00:00
Paul Hu
d00f9f0236 Merge "Remove unused ACTION_PACKAGE_ADDED intent." 2020-10-08 02:05:17 +00:00
Treehugger Robot
48b97996fb Merge "Clarify API docs for getCannedTextResponses." am: fc1a08a982 am: 9626f7cc42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451125

Change-Id: I28cc23ba83cd26471e877b1fbfd9d79d5b939870
 2020-10-08 01:46:51 +00:00
David Su
3ea188d4d2 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours am: 3b9f0fb6c3 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I85309b43227c6fcbea1310281ccf7b42981bf1ca
 2020-10-08 01:46:19 +00:00
Treehugger Robot
9626f7cc42 Merge "Clarify API docs for getCannedTextResponses." am: fc1a08a982 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1451125

Change-Id: I42f39b9ed7b25263ec271ef8b0042b32524428f5
 2020-10-08 01:29:48 +00:00
David Su
3b9f0fb6c3 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours am: 88ec485f39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c39f346377c9f591d4207b3c2288344470276e6
 2020-10-08 01:25:05 +00:00
Treehugger Robot
fc1a08a982 Merge "Clarify API docs for getCannedTextResponses." 2020-10-08 01:06:28 +00:00
David Su
88ec485f39 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours am: d840f0c7da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36bdfb8c03950173e51ea9815a6fda619126aff8
 2020-10-08 00:53:06 +00:00
David Su
d840f0c7da [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours am: 816fd66d64 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: Idefd4af0be5dce2baf988135f3062029749dc95b
 2020-10-08 00:24:07 +00:00
David Su
816fd66d64 [automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249a6 -s ours 
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history

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

Change-Id: I19aeca326d6f4faae382fb6a140acde81602eb3a
 2020-10-08 00:11:38 +00:00
Nate Jiang
994c0ba560 Merge "Update javaDoc to make it consistent" am: 36d1da8f62 am: bb446b0c37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424828

Change-Id: I4f13d5167bb237ad7ba4177f60dfc14fb3a8dbda
 2020-10-07 23:08:37 +00:00
Tyler Gunn
467acc47a3 CallScreeningService API docs cleanup. 
Cleanups for call screening service APIs and to provide more clarity for
the lifecycle of the service.

Fixes: 170286897
Test: make docs ; preview docs genreated.
Change-Id: I487b438e39abb83cee1bd050889a6bce164247d7
 2020-10-07 15:54:43 -07:00
Nate Jiang
bb446b0c37 Merge "Update javaDoc to make it consistent" am: 36d1da8f62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424828

Change-Id: I1fff96f9214e8313b6719aeceb9ba436b69a010b
 2020-10-07 22:38:51 +00:00
Nate Jiang
36d1da8f62 Merge "Update javaDoc to make it consistent" 2020-10-07 22:16:58 +00:00
Treehugger Robot
228f145562 Merge "Stop keeping freeform activities visible." am: 82cb76f908 am: 7c0c7500af 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453235

Change-Id: I099612e1a8b69fbe382c2aed95e96364d5407c8c
 2020-10-07 20:27:45 +00:00
Treehugger Robot
7c0c7500af Merge "Stop keeping freeform activities visible." am: 82cb76f908 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453235

Change-Id: I5af42a21fb438f828980ffc05dc3a9be32e6314d
 2020-10-07 19:59:44 +00:00
Treehugger Robot
82cb76f908 Merge "Stop keeping freeform activities visible." 2020-10-07 19:40:05 +00:00
Brad Ebinger
82a16c7900 Merge changes from topic "redo_ims_poll" am: ec6681c927 am: 58e629fd68 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I74f5803c1bc875aa5b22de4e24e0b140d258cd70
 2020-10-07 19:16:28 +00:00
Brad Ebinger
790aaee786 Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 am: 4c8316091f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: I9d3770f5e62038d4c32167e322c74b67dd82876a
 2020-10-07 19:16:20 +00:00
Brad Ebinger
58e629fd68 Merge changes from topic "redo_ims_poll" am: ec6681c927 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449280

Change-Id: I0972e8db35cc51932578fa8e9e785466352d203a
 2020-10-07 18:49:39 +00:00
Brad Ebinger
4c8316091f Clean up IMS based interfaces to use a push model instead of poll am: 1e9cc7b2e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449279

Change-Id: Ia942c0ba88d6ba081569540b617d9b79fb758659
 2020-10-07 18:41:47 +00:00
Brad Ebinger
ec6681c927 Merge changes from topic "redo_ims_poll" 
* changes:
  Remove "one shot" type of FeatureCallback
  Clean up IMS based interfaces to use a push model instead of poll
 2020-10-07 17:49:29 +00:00