Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
732,823 Commits 3 Branches 0 Tags
3c667652fc4030507aaf2d0ee8fc8fe1b703a204
Commit Graph

732823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beverly Tai
3c667652fc Merge "Show bouncer after failed UDFPS attempts" into sc-v2-dev am: dd9f25b195 am: 42f22a8377 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306818

Change-Id: I010c5c2d5b5a03cd272145dac17f8acc57bac733
 2021-11-22 17:47:43 +00:00
Beverly Tai
42f22a8377 Merge "Show bouncer after failed UDFPS attempts" into sc-v2-dev am: dd9f25b195 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306818

Change-Id: Id09b128a3ab944a11c2c9a96d69c05df5db957e7
 2021-11-22 17:36:15 +00:00
Oliver Woodman
757be10fa0 Merge "Tweak Javadoc for mute keycode constants" 2021-11-22 17:30:43 +00:00
Jon Eckenrode
2bde8d52ac Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4 am: abce82bc5d am: 75954281b3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: I744c7fe36f8069025d48198cbec08d2a491631ab
 2021-11-22 17:20:48 +00:00
Beverly Tai
dd9f25b195 Merge "Show bouncer after failed UDFPS attempts" into sc-v2-dev 2021-11-22 17:17:30 +00:00
Garfield Tan
531e9bbdc0 Merge "Make FullscreenTaskListener overridable" 2021-11-22 17:09:32 +00:00
Jon Eckenrode
75954281b3 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4 am: abce82bc5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: Ib93e924bc133945c119e1bdac7c6ecb643b80a7e
 2021-11-22 17:07:17 +00:00
Riya Ghai
2a33f21d24 Merge "Rectify updateFromImpl to handle edge cases better." 2021-11-22 16:51:14 +00:00
Jon Eckenrode
abce82bc5d Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: Icb9a08416599e1dcad31e146a2b8f82bb1ef8281
 2021-11-22 16:50:58 +00:00
Jon Eckenrode
98951a99f4 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: I894941a064dc61c68722036081f0617c47804c83
 2021-11-22 16:38:54 +00:00
Jon Eckenrode
92a4b54de5 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." 2021-11-22 16:21:19 +00:00
Kholoud Mohamed
c273e395e2 Merge "Add MANAGE_PROFILE_AND_DEVICE_OWNERS permission to some APIs" 2021-11-22 15:50:14 +00:00
Alice Kuo
2b0f20e4f5 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d am: cc70fa74f1 am: 2790076272 am: 409c4af111 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: I503ad60c06adb3158cad03cb7440614647f32d27
 2021-11-22 15:26:12 +00:00
Alice Kuo
409c4af111 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d am: cc70fa74f1 am: 2790076272 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: I13eb4dc6c3a7db16e5377bd92be004a8e0b2f0e1
 2021-11-22 15:11:37 +00:00
Alice Kuo
2790076272 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d am: cc70fa74f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: Ifd8991742a362fb32aef8019d667641483323961
 2021-11-22 14:48:01 +00:00
Alice Kuo
cc70fa74f1 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: I6ac7d5b9794eef7581373003960a5009a381cd97
 2021-11-22 14:36:23 +00:00
Yasin Kilicdere
c7b8b6acdd Merge "Change createUser API in UserManager to create a user with seed account data." 2021-11-22 14:24:16 +00:00
Alice Kuo
b29c718a9d Merge "Fix settingLib couldn't receive the broadcast issue." 2021-11-22 14:16:31 +00:00
Alan Stokes
164fd1839b Merge "Add Isolated Compilation service" am: e53d334d7f am: 1fa4b81f7f am: dee9164c6f am: 94303f51cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: I91ebddfb4fd435f78d8d429f8b49468bd24c5ccb
 2021-11-22 12:17:55 +00:00
Alan Stokes
94303f51cd Merge "Add Isolated Compilation service" am: e53d334d7f am: 1fa4b81f7f am: dee9164c6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: Ida1a1bf276139accde99522e408b5d19ae884d30
 2021-11-22 12:04:12 +00:00
Alan Stokes
dee9164c6f Merge "Add Isolated Compilation service" am: e53d334d7f am: 1fa4b81f7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: I45d3c726a18b4ed6c5845390ab9c5ad2d938419c
 2021-11-22 11:48:07 +00:00
Alan Stokes
1fa4b81f7f Merge "Add Isolated Compilation service" am: e53d334d7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: I8172f13d2bd6a1dde33c26400989126bd69a5285
 2021-11-22 11:35:57 +00:00
Jack Yu
4c14ff5311 Merge changes from topic "nfc_workprofile" am: 2740c2f009 am: 3fd3a6579a am: 4d3b2b227c am: c4fadacbdb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: Id6fecd9f86d6cc643b1c01852637748d3e090229
 2021-11-22 11:34:56 +00:00
Jack Yu
c4fadacbdb Merge changes from topic "nfc_workprofile" am: 2740c2f009 am: 3fd3a6579a am: 4d3b2b227c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: Ie8a7dd3cf1d525e22f430beaea95e85c7fc62ce9
 2021-11-22 11:23:29 +00:00
Alan Stokes
e53d334d7f Merge "Add Isolated Compilation service" 2021-11-22 11:17:38 +00:00
Jack Yu
4d3b2b227c Merge changes from topic "nfc_workprofile" am: 2740c2f009 am: 3fd3a6579a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: I940e84e73a065e534e5ace8430b347f71cc016e1
 2021-11-22 11:12:20 +00:00
Jack Yu
3fd3a6579a Merge changes from topic "nfc_workprofile" am: 2740c2f009 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: If86eaccf96acc4b1135b8795ec1b2d86c28fa148
 2021-11-22 11:00:17 +00:00
Jack Yu
2740c2f009 Merge changes from topic "nfc_workprofile" 
* changes:
  NFC support in work profile
  NFC support in work profile
 2021-11-22 10:45:44 +00:00
Alice Kuo
f634234fca Fix settingLib couldn't receive the broadcast issue. 
Bug: 207311784
Test: scan device normal
Change-Id: I3bb628871b4921f87c92e03386bcb6f66d90ae9f
 2021-11-22 18:13:14 +08:00
Wen Zhang
0f8f6a0d89 Merge "Pre-grant the location permission to the system Maps app on AAOS for Android T and after" 2021-11-22 09:10:01 +00:00
Chris Li
a1c1575526 Merge "Fix security bug for TaskFragment creation" into sc-v2-dev am: 5b9b66e85d am: c999171b48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16280766

Change-Id: Id75f6ccf35f8494b2bb6c5994473fb1b1a14458f
 2021-11-22 07:05:28 +00:00
Chris Li
c999171b48 Merge "Fix security bug for TaskFragment creation" into sc-v2-dev am: 5b9b66e85d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16280766

Change-Id: Ic8d56fd36296c031381e3726b5b8915c98ed5e7d
 2021-11-22 07:00:05 +00:00
Remi NGUYEN VAN
015342974e Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce am: 257dba0544 am: df6f4dbd11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015

Change-Id: If8da5de472d3f7f2f387d85c3d829cdcd1f6048c
 2021-11-22 06:59:27 +00:00
Charles Chen
6809aa9913 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 83d6490629 am: ce8201895b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3085219a66c96aa262d0bce217c6090852d59e69
 2021-11-22 06:58:55 +00:00
Charles Chen
da35e992df [automerger skipped] [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 082403816a am: cb89941f83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7f37b25fcc3b29f3865aee01407bf3bc72985d3
 2021-11-22 06:58:41 +00:00
“riyaghai”
6e8fc0f93c Rectify updateFromImpl to handle edge cases better. 
The returned value will be true when the app specific configuration is
successfully stored or removed based on the input provided. It will be
false when the the requested configuration is same as the pre-existing
app-specific configuration.

Bug: 204061036

Test: atest WmTests:ActivityTaskManagerServiceTests

Change-Id: I2f528cbadf0e01ed4dba571bb55b19b2b4890231
 2021-11-22 06:46:57 +00:00
Chris Li
5b9b66e85d Merge "Fix security bug for TaskFragment creation" into sc-v2-dev 2021-11-22 06:46:06 +00:00
Remi NGUYEN VAN
df6f4dbd11 Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce am: 257dba0544 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015

Change-Id: Icb73c93454669e198b557ca13432cb93ff88256a
 2021-11-22 06:45:59 +00:00
Charles Chen
ce8201895b Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 83d6490629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16259164

Change-Id: I308b1e892888bf0d117c0a96e3878880b9691b84
 2021-11-22 06:43:07 +00:00
Charles Chen
cb89941f83 [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 082403816a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16259164

Change-Id: I5f4fa53bdd66b01d491a7c1ac6dbac1e8ce2bc9e
 2021-11-22 06:42:43 +00:00
Shubang Lu
70622cf026 Merge "TIAF: Handle multi-user cases in TvIAppManagerService" 2021-11-22 06:40:38 +00:00
Remi NGUYEN VAN
257dba0544 Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015

Change-Id: I9a83de60e0ff61c0cc41daba65568c944f15d7f7
 2021-11-22 06:35:27 +00:00
Charles Chen
83d6490629 Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev 2021-11-22 06:29:28 +00:00
Remi NGUYEN VAN
f62d2629ce Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015

Change-Id: I06087e1d4828f4fee7a1b9a42e8bb2596e22684c
 2021-11-22 06:19:18 +00:00
Remi NGUYEN VAN
d627d9b1ba Merge "Remove AsyncChannel usage in NsdManager" 2021-11-22 05:58:15 +00:00
Jeff DeCew
7cd57a75ff Merge "Fix snooze guts disappearing in split shade" into sc-v2-dev am: eaaeb2f6a7 am: 1a42e858e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16298489

Change-Id: I1a3578da6521da30f4ff32857d01c57715419e36
 2021-11-22 02:47:05 +00:00
Jeff DeCew
1a42e858e8 Merge "Fix snooze guts disappearing in split shade" into sc-v2-dev am: eaaeb2f6a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16298489

Change-Id: I566ac7c5ea4462df8bdbf3da1ffa2ed880d54cf9
 2021-11-22 02:36:01 +00:00
Jeff DeCew
eaaeb2f6a7 Merge "Fix snooze guts disappearing in split shade" into sc-v2-dev 2021-11-22 02:23:29 +00:00
shubang
7528f96173 TIAF: Handle multi-user cases in TvIAppManagerService 
Bug: 205796541
Test: mmm
Change-Id: Ib3e14247ff488a8ff46050adc7bed6aa2c3f87c0
 2021-11-21 18:06:38 -08:00
Jackal Guo
083bd48e19 Merge "Keep install reason unchanged when package is uninstalled" 2021-11-22 01:41:31 +00:00