Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
570,594 Commits 3 Branches 0 Tags
ae288fc64f4899b6367488555907d0023b1ecd31
Commit Graph

570594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ae288fc64f Merge "Fix Typo in CellIdentityNr" am: 4e8328c972 am: 6804e518ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691212

Change-Id: Ice68a8603d3413732413f309c84bd62d264afb01
 2021-04-30 04:23:44 +00:00
Treehugger Robot
6804e518ab Merge "Fix Typo in CellIdentityNr" am: 4e8328c972 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691212

Change-Id: Ied7a8404d613c194b957b9664d78db0766467264
 2021-04-30 03:40:16 +00:00
Treehugger Robot
4e8328c972 Merge "Fix Typo in CellIdentityNr" 2021-04-30 03:19:46 +00:00
TreeHugger Robot
81e48b7275 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 02b69dcab3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f95b55825d228c2fe5470d7abb2314ae7152575
 2021-04-30 02:56:16 +00:00
TreeHugger Robot
02b69dcab3 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-30 02:27:39 +00:00
Treehugger Robot
3f0c3db187 Merge "Add additional biometric OWNERs" am: 9674d6d6d6 am: 1176cad7f2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691211

Change-Id: Ie6d4938961f7725cc141dd1a43f69a906b913f24
 2021-04-30 00:35:10 +00:00
Treehugger Robot
1176cad7f2 Merge "Add additional biometric OWNERs" am: 9674d6d6d6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691211

Change-Id: Ic0ec9c3c12571b3405c1b7668528f5c50d083896
 2021-04-30 00:13:30 +00:00
Treehugger Robot
9674d6d6d6 Merge "Add additional biometric OWNERs" 2021-04-29 23:52:46 +00:00
Treehugger Robot
8f2e634505 Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 am: fc7a26cd21 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675900

Change-Id: I987c4a882529bf55ba9697889347b6a50b583942
 2021-04-29 23:03:32 +00:00
Kelvin Zhang
9934485847 Merge "Add API to ApexManager for compressed APEX" am: 4890c80904 am: bce6d733a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675675

Change-Id: Ic5a2ea0dcecfa4e2e2c470457c5ca3b44c65c23b
 2021-04-29 23:02:32 +00:00
Treehugger Robot
fc7a26cd21 Merge "LockSettingsService: migrate to its own keystore namespace" am: b8e5426266 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675900

Change-Id: Ibc8bdbcf832b90e3a5628829a6206374c9504374
 2021-04-29 22:43:19 +00:00
Kelvin Zhang
bce6d733a8 Merge "Add API to ApexManager for compressed APEX" am: 4890c80904 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675675

Change-Id: If4e1adb75ec311a7cddd1db28f76cf87da779529
 2021-04-29 22:37:33 +00:00
Treehugger Robot
b8e5426266 Merge "LockSettingsService: migrate to its own keystore namespace" 2021-04-29 22:35:52 +00:00
Nathan Harold
ee37ef15d4 Fix Typo in CellIdentityNr 
s/fomrat/format/

Bug: 176222981
Test: compilation (docstring only change)
Change-Id: I9c488d468f3e9f207922b13c16dccbaa96c0df7f
 2021-04-29 15:30:54 -07:00
Kelvin Zhang
4890c80904 Merge "Add API to ApexManager for compressed APEX" 2021-04-29 22:16:08 +00:00
Kevin Chyn
bda79da64b Add additional biometric OWNERs 
Change-Id: I024252070bd806d50d54377190fdc5cd5b4445e1
 2021-04-29 15:07:35 -07:00
Martin Brabham
50e294ad9b Merge changes from topic "bluetooth_oob_api" am: 2e67798711 am: 8411b5d7b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I3158af61bd86f2be7f602510ee0ec30b0418b2f5
 2021-04-29 21:10:28 +00:00
Martin Brabham
2d3dbcab8f OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd am: e897917de7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: I98f507b1e35126406ae5f768a346afa8e4dd22d5
 2021-04-29 21:10:21 +00:00
Peter Collingbourne
43ce684e3b Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 am: b16d968e54 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: Ia06cfe69ef224be2cbe3abf32df3f83622481861
 2021-04-29 21:09:27 +00:00
Jack Nudelman
611a55f03d Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d am: 296cec5c58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: I30f132276181affdc448995ab7b93900b6f22512
 2021-04-29 21:08:28 +00:00
Grace Jia
5585bdb0ec Add D2D sharing level setting APIs. am: d5eb6fb0ef am: f018ea3c3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623183

Change-Id: Ic98c8b07df96a19472176a65109aff99cd9704a2
 2021-04-29 21:08:24 +00:00
Martin Brabham
8411b5d7b3 Merge changes from topic "bluetooth_oob_api" am: 2e67798711 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686315

Change-Id: I5c7de78ec2e77a617daf90cdc45052865d03a037
 2021-04-29 20:56:21 +00:00
Martin Brabham
e897917de7 OOB: Remove static creator methods in favor of public constructors am: 1cd46165dd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684129

Change-Id: I36420ea92322b00a6b55a4b4c5bbd759cc7ee263
 2021-04-29 20:53:58 +00:00
Peter Collingbourne
b16d968e54 Merge "Fix two problems in the ExecuteBinary function." am: e0561210b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1677048

Change-Id: I778cc45627af85a3b7bc5a140540302772638c1d
 2021-04-29 20:46:46 +00:00
Jack Nudelman
296cec5c58 Merge changes from topics "VOIMS_OPT_IN", "d2d" am: f99f7fce5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689571

Change-Id: Iaefd51c1ebe49a81739600c6ef56d5663e54a81d
 2021-04-29 20:43:24 +00:00
Grace Jia
f018ea3c3e Add D2D sharing level setting APIs. am: d5eb6fb0ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623183

Change-Id: I5b17ef39ba935914c9e63a363c972d00ac664d0a
 2021-04-29 20:42:32 +00:00
Bill Yi
543791e6f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I82f341d6143d0ef888eab164c227ca9496b0c82c
 2021-04-29 20:20:34 +00:00
Julia Reynolds
9b873fe85e [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours am: f70b22f3be -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: Ibda9eec07625c1c002ea16bf9f1b79234e56eab7
 2021-04-29 19:47:18 +00:00
Martin Brabham
2e67798711 Merge changes from topic "bluetooth_oob_api" 
* changes:
  Convert onOobData parameter for OobData from @Nullable to @NonNull
  OOB: Remove static creator methods in favor of public constructors
 2021-04-29 18:51:28 +00:00
Peter Collingbourne
e0561210b2 Merge "Fix two problems in the ExecuteBinary function." 2021-04-29 18:44:44 +00:00
Julia Reynolds
f70b22f3be [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours am: f08bd224bb -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I833e5f4c72d25055df6ade76eb209405834c9e27
 2021-04-29 18:43:29 +00:00
Jack Nudelman
f99f7fce5d Merge changes from topics "VOIMS_OPT_IN", "d2d" 
* changes:
  Add new provisioning flag for VOIMS opt-in
  Add D2D sharing level setting APIs.
 2021-04-29 18:31:39 +00:00
Julia Reynolds
f08bd224bb [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours am: 80b1e85c12 -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I38139a95761f70ad6a523888cdda2076ce65aa30
 2021-04-29 18:28:02 +00:00
Julia Reynolds
80b1e85c12 [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours am: 08db350c8b -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: I26564121399185079e7dccd619971d57c21249bc
 2021-04-29 18:11:46 +00:00
Daniel Santiago Rivera
1cfbf3a69e Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I9ae5f4063db356c4bf70782db3492635e83daee4
 2021-04-29 18:11:41 +00:00
Julia Reynolds
08db350c8b [automerger skipped] Restrict alarm broadcast am: d61aae299c -s ours 
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 f1e84b42b1 is already in history

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

Change-Id: If437855aa9b9c788f2f03d3d3091c5034cf93ba7
 2021-04-29 17:48:51 +00:00
TreeHugger Robot
a18e01b554 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ef50365ba84344d686a6f5de7bc96e900005314
 2021-04-29 17:47:52 +00:00
TreeHugger Robot
805d5813ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a98eab00e305877c63390de15c37af4d464162e
 2021-04-29 17:46:55 +00:00
Daniel Santiago Rivera
e40b2193fe Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I6df7f027d41fada91f46873a4bdafae1b5e88cbc
 2021-04-29 17:38:43 +00:00
TreeHugger Robot
8c3a3602b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-29 17:31:46 +00:00
TreeHugger Robot
35615bd603 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-29 17:13:54 +00:00
Brad Ebinger
1286675083 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I19af2165d5e6e50c37596b2b0aed7f4092334379
 2021-04-29 17:06:20 +00:00
Daniel Santiago Rivera
2a2aa6d3c5 Merge "Added SQLite versions used on API levels 28, 30 and 31." 2021-04-29 17:00:01 +00:00
Bill Yi
ac18886190 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie59c293266e86c840c172bca4915df55ed99ae3b
 2021-04-29 16:57:57 +00:00
Brad Ebinger
be8de58cf0 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I5e1b81be5320cffb3fe1a709abbe0346f6021733
 2021-04-29 16:42:55 +00:00
Brad Ebinger
a2fc362eb9 Merge "Do not throw NPE if GRUU uri is not populated" 2021-04-29 16:28:40 +00:00
Bill Yi
ba94d565cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I873d14583db283b2cbbe45347bf4949d4c0f2001
 2021-04-29 15:45:07 +00:00
Julia Reynolds
d61aae299c Restrict alarm broadcast 
To android only

Test: NotificationManagerTest, NotificationManagerServiceTest
Bug: 175614289
Change-Id: I4f8e56729d90f8f5288d08881129b1c45d5790e7
Merged-In: I4f8e56729d90f8f5288d08881129b1c45d5790e7
(cherry picked from commit abf15b731a)
(cherry picked from commit 4056976f1e)
(cherry picked from commit f1e84b42b1)
 2021-04-29 15:30:43 +00:00
Bill Yi
47ff768e64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9cf1d15d0bbb219131fbc0838211d1cd6c0f39d8
 2021-04-29 15:16:45 +00:00
Bill Yi
b69af71af4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If64c8aa8d6fe16e15cf55099310a97f155e4b5a6
 2021-04-29 12:43:54 +00:00