Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
660,697 Commits 3 Branches 0 Tags
dc720ea32a5c6d40ea77620d87d34848caa47e65
Commit Graph

660697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Mankoff
dc720ea32a [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours am: 63ee275976 -s ours am: 56a0023c29 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7fda98c7feb34450d2c145ab699f1f35d0eff29
 2021-11-17 22:40:15 +00:00
Treehugger Robot
8d57a8c7b2 Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47 am: 9966ff4bc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878225

Change-Id: I9a74ae94a66c0c3a761bdc18d8be069a872c9cfc
 2021-11-17 22:39:42 +00:00
Dave Mankoff
56a0023c29 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours am: 63ee275976 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdfbfc359cd9167074344c45b4c1d8227b65e8d2
 2021-11-17 22:21:01 +00:00
Treehugger Robot
9966ff4bc5 Merge "[PeopleService] Catch exception when failed to query call log." am: 9220245e47 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878225

Change-Id: Iedf435a92edc51083030b44c4a7bc3fa293efa8b
 2021-11-17 22:20:18 +00:00
Treehugger Robot
9220245e47 Merge "[PeopleService] Catch exception when failed to query call log." 2021-11-17 21:59:43 +00:00
Dave Mankoff
63ee275976 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours am: 47e7bbb1a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31cfd8c30931738392dcab705da5654d89bb0c3f
 2021-11-17 21:59:37 +00:00
Dave Mankoff
47e7bbb1a4 [automerger skipped] RESTRICT AUTOMERGE Remove line of code that was mistakently left in. am: 1b13bc873c -s ours 
am skip reason: Merged-In I56589865427b10e2eab68e1ed2e7c290572a9edc with SHA-1 daba01ddf8 is already in history

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

Change-Id: I39d53ac5e756025317d22b4d4734eb3655fbab69
 2021-11-17 21:47:28 +00:00
Daniel Norman
3dd1c5cff5 Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e066 am: 9370336358 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894442

Change-Id: I89d940e0835f2f6db0449e88182dd23f40d92a05
 2021-11-17 21:42:28 +00:00
Daniel Norman
9370336358 Merge "PackageManagerService: Check for duplicate inactive factory packages" am: 2df3d4e066 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894442

Change-Id: I36a956ea64b64855bb1b2c22430008dad6264b00
 2021-11-17 21:38:44 +00:00
Jeff Sharkey
7e98d3ece9 Merge "Add OWNERS file for AttestationVerificationTest" am: 1716adec5c am: 0229c828ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895603

Change-Id: Ic5639364ba5fddd9bb788e58ef4dced3c0e4b5dd
 2021-11-17 21:36:44 +00:00
Daniel Norman
2df3d4e066 Merge "PackageManagerService: Check for duplicate inactive factory packages" 2021-11-17 21:24:28 +00:00
Jeff Sharkey
0229c828ef Merge "Add OWNERS file for AttestationVerificationTest" am: 1716adec5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895603

Change-Id: I4f2482fdec4d81c2e1688625e48b9115bca43591
 2021-11-17 21:13:48 +00:00
Jeff Sharkey
1716adec5c Merge "Add OWNERS file for AttestationVerificationTest" 2021-11-17 20:50:58 +00:00
Marcus Hagerott
fa2c7f2eb1 Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 am: 36f5ca1920 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I55d1e0532cce2646a2a6839a4e43d4552311c592
 2021-11-17 19:55:24 +00:00
Marcus Hagerott
36f5ca1920 Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I8768bb082094d4062491becc4232ae35907dfc49
 2021-11-17 19:36:36 +00:00
Dave McCloskey
c9d71ec0f4 Add OWNERS file for AttestationVerificationTest 
Change-Id: Ic8400aa7c7e4506f57e6ce50dd5856692108385d
 2021-11-17 19:22:52 +00:00
Dave Mankoff
1b13bc873c RESTRICT AUTOMERGE Remove line of code that was mistakently left in. 
This line was removed in O, S, & P, but somehow survived in the Q and R branches.

Bug: 193444889

Merged-In: I56589865427b10e2eab68e1ed2e7c290572a9edc
Change-Id: I56589865427b10e2eab68e1ed2e7c290572a9edc
 2021-11-17 19:20:48 +00:00
Marcus Hagerott
911df4f515 Merge "Allow ContactsProvider to use compat change framework" 2021-11-17 19:19:21 +00:00
Maciej Żenczykowski
95b11d997d Merge "switch to using OWNERS from master branch of Connectivity module" am: b86ab4ae44 am: 0700ad89f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894917

Change-Id: I649bf90ff9d7c20eaeb32963c3f5c5bfc9be3ea1
 2021-11-17 19:13:50 +00:00
Dave Mankoff
33c4ddb16e [automerger skipped] Merge "RESTRICT AUTOMERGE Remove line of code that was mistakently left in." into rvc-qpr-dev am: 90ca9ba531 -s ours am: 74526215ac -s ours am: 36aff0fb3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbcd15a44af579294b71023c6471a44b5998525f
 2021-11-17 18:46:27 +00:00
Maciej Żenczykowski
0700ad89f8 Merge "switch to using OWNERS from master branch of Connectivity module" am: b86ab4ae44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894917

Change-Id: I5507d2ee171dd529d18486847cb56e80dba0e1b9
 2021-11-17 18:42:42 +00:00
Dave Mankoff
36aff0fb3b [automerger skipped] Merge "RESTRICT AUTOMERGE Remove line of code that was mistakently left in." into rvc-qpr-dev am: 90ca9ba531 -s ours am: 74526215ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2eed1ba8bfa7b16c934f1b958bb24727e1d8cb11
 2021-11-17 18:29:05 +00:00
Maciej Żenczykowski
b86ab4ae44 Merge "switch to using OWNERS from master branch of Connectivity module" 2021-11-17 18:20:59 +00:00
Dave Mankoff
74526215ac [automerger skipped] Merge "RESTRICT AUTOMERGE Remove line of code that was mistakently left in." into rvc-qpr-dev am: 90ca9ba531 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e587a86023cfdcd30f4dca90f9db20fd8900f02
 2021-11-17 18:11:21 +00:00
Dave Mankoff
90ca9ba531 Merge "RESTRICT AUTOMERGE Remove line of code that was mistakently left in." into rvc-qpr-dev 2021-11-17 17:52:23 +00:00
Nicolas Geoffray
02b0ec4681 Merge "Remove obsolete files on preloaded classes." am: 637477eb87 am: a54de89cf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885635

Change-Id: I7a2336951f7e65216fc218e2df8bde8e87983d87
 2021-11-17 11:19:44 +00:00
Nicolas Geoffray
a54de89cf0 Merge "Remove obsolete files on preloaded classes." am: 637477eb87 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1885635

Change-Id: Ie1763534a12744cab0afc5fb7f9f48a73251958e
 2021-11-17 10:58:40 +00:00
Nicolas Geoffray
637477eb87 Merge "Remove obsolete files on preloaded classes." 2021-11-17 10:36:58 +00:00
Bernardo Rufino
04f4d7aa21 Merge "Deprecate unsafe parcel APIs" am: 9f8b914c9f am: 87b6f365d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890540

Change-Id: If483ab5bd836e3700d67bc7ba6701f5e35a58b57
 2021-11-17 10:20:56 +00:00
Bernardo Rufino
87b6f365d3 Merge "Deprecate unsafe parcel APIs" am: 9f8b914c9f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890540

Change-Id: I27a79a0f04d5cf99d9b8efb56fcc32a6dd43c108
 2021-11-17 10:09:27 +00:00
Bernardo Rufino
9f8b914c9f Merge "Deprecate unsafe parcel APIs" 2021-11-17 09:43:11 +00:00
Maciej Żenczykowski
7069443319 switch to using OWNERS from master branch of Connectivity module 
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifa4a38522ac3aa830e2a7f8b23ad190a334458bc
 2021-11-17 00:37:40 -08:00
Yifan Hong
3b546f86e0 Merge "Add ServiceManager.registerForNotifications" am: ce80de5db0 am: 45ddf12cbc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883550

Change-Id: I8f7746e16b1e60fbc29a93dae3046b05f00c212d
 2021-11-17 05:55:32 +00:00
Yifan Hong
45ddf12cbc Merge "Add ServiceManager.registerForNotifications" am: ce80de5db0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1883550

Change-Id: I65215f414aced825be29e036c378057d9c861138
 2021-11-17 05:23:59 +00:00
Yifan Hong
ce80de5db0 Merge "Add ServiceManager.registerForNotifications" 2021-11-17 05:02:35 +00:00
qinyige1
28367ba78a [PeopleService] Catch exception when failed to query call log. 
It's unnecessary to throw exception when failed to query call
log in PeopleService. So catch this exception to avoid system
server crash.

Bug: 204923224
Test: PeopleServiceTest
Change-Id: I77ee31ff456455721c3401f36d4a79390db2f9b5
 2021-11-17 10:10:26 +08:00
Marcus Hagerott
6c681056bb Allow ContactsProvider to use compat change framework 
BUG=188347648
Test: m droid

Change-Id: Ifb6675777c76ca1c44af96ceb02a6207d28bd045
 2021-11-16 13:40:41 -08:00
Sanjana Sunil
cdaa918edc PackageManagerService: Check for duplicate inactive factory packages 
If after a factory reset, APEX modules are updated, duplicate package
names are returned from the API - factory packages are added first and
then inactive factory packages leading to duplication.

After updating APEX modules, inactive factory packages would always be a
subset of factory packages. The fix adds inactive packages only if there
was no factory reset done.

Bug: 200519752
Bug: 200120056
Test: atest 'PackageManagerTest#testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates'
Change-Id: I5b5469fc6879bbeee4dc2ea47b2046ab011a65ce
Merged-In: I5b5469fc6879bbeee4dc2ea47b2046ab011a65ce
 2021-11-16 13:20:33 -08:00
Keith Mok
10bfeb68f7 Merge "Fix EINTR handling" am: 7d0bdd39fd am: 80b29f8241 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891496

Change-Id: Idf9e00c0c57150cd84ce73fe8fc9e661981fbada
 2021-11-16 20:12:15 +00:00
Hunsuk Choi
bbd1c48986 Merge "Add ImsStateCallback" am: b636aacf1d am: 267ee57f27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892996

Change-Id: I54b90d5ecdd265279fca2503e5414fe0c31b2e54
 2021-11-16 20:11:46 +00:00
Keith Mok
80b29f8241 Merge "Fix EINTR handling" am: 7d0bdd39fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891496

Change-Id: I02d1281a2789b6554432a0e852e713af503bc5c8
 2021-11-16 19:54:22 +00:00
Hunsuk Choi
267ee57f27 Merge "Add ImsStateCallback" am: b636aacf1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892996

Change-Id: Ie21d1b5d249e5d0801468f0a3ee42e382242e11c
 2021-11-16 19:53:46 +00:00
Keith Mok
7d0bdd39fd Merge "Fix EINTR handling" 2021-11-16 19:43:29 +00:00
Hunsuk Choi
b636aacf1d Merge "Add ImsStateCallback" 2021-11-16 19:26:16 +00:00
Treehugger Robot
9369a617bd Merge "AndroidRuntime: when CheckJNI is enabled log a message" am: b0993999eb am: 3ef6e00c42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892922

Change-Id: Ib71c4a9bdeec2cad297fc7ad734fbeca769b06ab
 2021-11-16 19:21:02 +00:00
Treehugger Robot
3ef6e00c42 Merge "AndroidRuntime: when CheckJNI is enabled log a message" am: b0993999eb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892922

Change-Id: I85b52928d317ec5a079946255b31a01b9f8c7814
 2021-11-16 19:04:02 +00:00
Treehugger Robot
b0993999eb Merge "AndroidRuntime: when CheckJNI is enabled log a message" 2021-11-16 18:42:48 +00:00
Treehugger Robot
c42b128038 Merge "Fix NPE for UDFPS devices without HBM" am: 6893b19adc am: 26fedd6afe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893387

Change-Id: I5beb53314e63b639a86dd9fb973d6d4636267f3e
 2021-11-16 18:33:38 +00:00
Treehugger Robot
26fedd6afe Merge "Fix NPE for UDFPS devices without HBM" am: 6893b19adc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1893387

Change-Id: I715fd67585d6163a3de8d5bcc940698754c25b22
 2021-11-16 18:16:57 +00:00
Treehugger Robot
6893b19adc Merge "Fix NPE for UDFPS devices without HBM" 2021-11-16 18:11:38 +00:00