Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,379 Commits 3 Branches 0 Tags
401dd1cfd4e671e382f3a657f5b8d34375d520bd
Commit Graph

485379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
401dd1cfd4 Simplify MockVpn. am: 7c4ae16b94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425310

Change-Id: Iff91a12ced969b34ba28b792e476c945eecdb817
 2021-03-17 09:14:36 +00:00
Lorenzo Colitti
d66f3623f6 Test a VPN with an underlying network that does not yet exist. am: 334a66342c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425309

Change-Id: Iac0a5305600fc70e05de90e4552258a0225d7f94
 2021-03-17 09:14:32 +00:00
TreeHugger Robot
800dbab181 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-17 05:50:16 +00:00
TreeHugger Robot
624e605bc9 Merge "Update javadoc for Intent.ACTION_VIEW_PERMISSION_USAGE" into mainline-prod 2021-03-16 23:01:16 +00:00
Bill Yi
0159c2626a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad1d835496753a38ec850b1af6d4f97bc83aa2ef
 2021-03-16 21:53:42 +00:00
Bill Yi
0c69c63107 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8683847952c90ae434459956ef0092d244a15bf6
 2021-03-14 06:18:28 +00:00
Guojing Yuan
92b204d879 Update javadoc for Intent.ACTION_VIEW_PERMISSION_USAGE 
BUG: 182204957

Test: N/A

Merged-In: I70f0dd7dffaa14730ebc96c0e9c7f82bbe36bb9f

Change-Id: I70f0dd7dffaa14730ebc96c0e9c7f82bbe36bb9f
 2021-03-12 23:35:57 +00:00
Winson Chiu
636c57cf22 Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f am: e75b482280 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727756

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cc354cfa0eada20825ec61240a7538700e14aa9
 2021-03-12 00:08:44 +00:00
Winson Chiu
e75b482280 Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" am: f83d79928f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727756

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9ad54a05bfebadde7cd9cb516342cb6d763c328
 2021-03-11 23:14:28 +00:00
Winson Chiu
f83d79928f Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened" 
Reason for revert: Punted to future release due to invalid fix

Bug: 175319005

Merged-In: I00b78d596ee05c5a4a228771bbf8082af2b0ab8a
Merged-In: I78284e0a0dd5c41345753cdd2ed9a518db1df930
Change-Id: I78284e0a0dd5c41345753cdd2ed9a518db1df930
(cherry picked from commit ffe45e4497)
 2021-03-11 00:27:59 +00:00
Miranda Kephart
109f2fdd81 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 am: 91175a30c6 -s ours am: c202b0836a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica5b7ec8db446f05b35b56915a5b8b561bcc7da0
 2021-03-10 21:37:05 +00:00
Miranda Kephart
e34af6e97e [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 am: 46ecf995d7 -s ours am: 55255a5a1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a621be2b97e157d382ecce530b9ff11f4a0cc23
 2021-03-10 21:36:52 +00:00
Miranda Kephart
5c5b40193b [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev am: e0135acaa6 am: 1c0fa75c03 -s ours am: 8d2a5195e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c851418655524b3988532cbeda7efb8493ea01a
 2021-03-10 21:36:08 +00:00
Miranda Kephart
e85534a9fa [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: 9908e1a145 -s ours am: e46f0812c6 -s ours am: a53e25c4c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6155fe047207798e38bd30e0935869f9bfcad42
 2021-03-10 21:35:59 +00:00
Miranda Kephart
c202b0836a [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 am: 91175a30c6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie819e8cfd7d5101c7e86f0e9c871c71bae453856
 2021-03-10 20:33:51 +00:00
Miranda Kephart
55255a5a1d [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 am: 46ecf995d7 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15020d4303fa78f01395e88ded1d1c18496310b9
 2021-03-10 20:33:31 +00:00
Miranda Kephart
8d2a5195e2 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev am: e0135acaa6 am: 1c0fa75c03 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie32197ff743b6ea550c2386b06d6e6e855155982
 2021-03-10 20:32:50 +00:00
Miranda Kephart
a53e25c4c4 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: 9908e1a145 -s ours am: e46f0812c6 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I955754f0c35642791c205dfe229cbebcc37a85c5
 2021-03-10 20:32:37 +00:00
Miranda Kephart
91175a30c6 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into oc-mr1-dev am: 84fcb616be -s ours am: 663162c3b0 -s ours am: 250d08c924 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420818

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfc60f4d303c8443cb22f25a8ae7eebbba672094
 2021-03-10 19:55:04 +00:00
Miranda Kephart
46ecf995d7 [automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into pi-dev am: 5a8e9742ed -s ours am: c7d3369e99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420817

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ce3345d347fc746e99012b48a53f7baff608a18
 2021-03-10 19:54:49 +00:00
Miranda Kephart
1c0fa75c03 Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-dev am: e0135acaa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad70261e338ed3b04b69c48f12ecdc664bfe0056
 2021-03-10 19:54:27 +00:00
Miranda Kephart
e46f0812c6 [automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: 9908e1a145 -s ours 
am skip reason: skipped by user mkephart

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcae7f5fe087582ef0aa546e33eeafdb25b0b87c
 2021-03-10 19:54:21 +00:00
TreeHugger Robot
66bf9dc817 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-08 17:32:35 +00:00
Bill Yi
fa6924dd26 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I030fdd53c46d665ee1fed2ef95cb89579747d5d1
 2021-03-08 06:39:03 +00:00
TreeHugger Robot
e6ce1e90e9 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-07 19:00:47 +00:00
Bill Yi
30f7021cfd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaad6d833f97bb6d76f48f682f72305466aaa7177
 2021-03-07 14:07:06 +00:00
Baligh Uddin
9261bed60b Merge "Migrate apex/permission to packages/modules/Permission" into mainline-prod 2021-03-06 22:36:33 +00:00
Baligh Uddin
be2534a428 Migrate apex/permission to packages/modules/Permission 
BUG: 167963264
Test: TH
Merged-In: I1a6aac95deabeee6d301ad83a2ad31ed2663c02e
Change-Id: I2db4fd75fe696b29f4e84d03fd0e88fc66e999a7
 2021-03-06 14:40:40 +00:00
Bill Yi
b5d2443bf5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia2d2950c320bfc67ee42d4e92e1ac0a7f3a8cfe3
 2021-03-06 01:39:02 +00:00
TreeHugger Robot
4a20f01889 Merge "Add pkg target to snoozing alarm" into rvc-dev am: 0ec06d7b11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf2311988765e4d0556086f1fc785d5f245fb4c8
 2021-03-05 04:30:43 +00:00
TreeHugger Robot
0ec06d7b11 Merge "Add pkg target to snoozing alarm" into rvc-dev 2021-03-05 00:43:45 +00:00
Julien Desprez
683f573462 Merge "DO NOT MERGE: Move AlarmManager to apex" into mainline-prod 2021-03-04 17:14:33 +00:00
Miranda Kephart
da87107602 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev am: 9c62f07486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c800e9deb541cef26cb5f668b337b6b8a63e28
 2021-03-04 16:13:14 +00:00
Miranda Kephart
cc526dd833 [DO NOT MERGE] Make screenshot error notification PendingIntent immutable am: 1eecc874b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58a4ced63c067522eed4015eaef82e155ca2e119
 2021-03-04 16:13:10 +00:00
Miranda Kephart
9c62f07486 Merge "[DO NOT MERGE] Make screenshot error notification PendingIntent immutable" into rvc-dev 2021-03-04 15:27:25 +00:00
TreeHugger Robot
43ccc03aa0 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-04 06:34:33 +00:00
Hall Liu
c4c7142216 Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554971

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I419d9acef8f843871677fd509682041c2dcef177
 2021-03-04 02:46:40 +00:00
Hall Liu
d80b097d82 Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554969

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I481f17b14cac37be689af462843cc1576bbbebae
 2021-03-04 02:46:32 +00:00
Suprabh Shukla
7c0ee35b1e DO NOT MERGE: Move AlarmManager to apex 
Mechanical refactoring to move all except native code to the apex
directory. Accesses across the jar boundary will be cleaned up in
follow-ups.
Also, moved alarm manager code into its own package for better
organization.

Test: Buids, boots. Existing tests:
atest FrameworksMockingServicesTests:AlarmManagerServiceTest
atest CtsAlarmManagerTestCases

Bug: 181724498
Change-Id: Ida46491c1f1dff02dce4c50d3fafd4efbf977766
Merged-In: Ida46491c1f1dff02dce4c50d3fafd4efbf977766
 2021-03-04 02:33:17 +00:00
Hall Liu
5fa6de7421 Merge "Allow empty tokens in strict grammar" into rvc-dev 2021-03-04 02:25:54 +00:00
Hall Liu
c5c9242194 Merge "Allow empty tokens in strict grammar" into rvc-dev 2021-03-04 02:25:54 +00:00
TreeHugger Robot
b7967ff9a8 Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13137831

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf46fcae18c9548c755ede7b402e1965c5cc26a3
 2021-03-04 02:14:59 +00:00
Bill Yi
67a9eecc69 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I681da31f7b543e9507bcd6f6b8aed30cb74fb81b
 2021-03-04 01:42:47 +00:00
TreeHugger Robot
b9e15c3f1a Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev 2021-03-04 00:35:42 +00:00
Hongwei Wang
31a836e67a Merge "Restrict the overridden min size for PiP" into rvc-dev am: 2ed6d3891b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13746374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f163efc4614654de88657d693b1542c86cfc1e
 2021-03-03 23:56:17 +00:00
Hongwei Wang
2ed6d3891b Merge "Restrict the overridden min size for PiP" into rvc-dev 2021-03-03 23:01:26 +00:00
Beth Thibodeau
35e7a1408e Merge "Limit maximum allowed size for a status bar icon" into rvc-dev am: 542be62b05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430466

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4fe6f1d746a8f643663418db22b2b8c2373b633
 2021-03-03 22:04:43 +00:00
Beth Thibodeau
542be62b05 Merge "Limit maximum allowed size for a status bar icon" into rvc-dev 2021-03-03 20:53:01 +00:00
Hongwei Wang
2a18b15dfb Restrict the overridden min size for PiP 
Per go/cdd-proposal-pip-size, the absolute minimum size when overridden
should be 48dp.

Bug: 174302616
Test: atest PinnedStackTests#testEnterPipWithTinyMinimalSize
Merged-In: I2f0dfd9a79049aaf696fde8703994deaecce63f5
Change-Id: I2f0dfd9a79049aaf696fde8703994deaecce63f5
 2021-03-03 11:37:19 -08:00
Patrick Baumann
8812683740 Merge "Adds caller check to getAllPackages()" into rvc-dev am: 649d086c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13616181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67fbada42a0b710f9180951240b0357ee706b540
 2021-03-03 18:47:24 +00:00