Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
624,962 Commits 3 Branches 0 Tags
ff0919f8780eefc803d0f0b5b27e0f95e331bd9b
Commit Graph

624962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Kozynski
ff0919f878 Implement privacy chip design 
Implement margins and colors

Fixes: 179678441
Test: manual
Change-Id: If6f10019352a9db6f603a5ea74f445acf68775a0
 2021-02-09 13:10:49 -05:00
Matt Pietal
988dfcdf5c Merge "Controls in Lockscreen Dialog" into sc-dev am: 0cc57111bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13532766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10d9a73683154dfec55c7d2ec14019b28778f9e6
 2021-02-09 17:53:21 +00:00
Lee Shombert
d6e8cc080d Merge "Ensure PM watches all Watchables" into sc-dev am: df7b5b3ae3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13501298

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424954e27c90bccbf24c2c9d3a7c8e448b56f1df
 2021-02-09 17:52:54 +00:00
Matt Pietal
0cc57111bb Merge "Controls in Lockscreen Dialog" into sc-dev 2021-02-09 17:52:33 +00:00
Tim Van Patten
b565addeb8 Merge "Add proper permission check and multi-user handling to GameManagerService" into sc-dev am: d8850ff6b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13454824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e30908c1b1b491d4161c85081b117b92a9421ef
 2021-02-09 17:52:28 +00:00
TreeHugger Robot
7f093e1c83 Merge "[CEC] Always send <Set Stream Path> after Routing Changes" 2021-02-09 17:44:35 +00:00
Lee Shombert
df7b5b3ae3 Merge "Ensure PM watches all Watchables" into sc-dev 2021-02-09 17:34:47 +00:00
Tim Van Patten
d8850ff6b9 Merge "Add proper permission check and multi-user handling to GameManagerService" into sc-dev 2021-02-09 17:31:38 +00:00
Nathalie Le Clair
0e2a0488ee [automerger skipped] Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770 am: 158f098e07 am: 0831b52c25 -s ours am: 6eade62314 -s ours 
am skip reason: Change-Id I50a1423ef223156f98c6f21e9be82130a284295a with SHA-1 3ecb6747a9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd29ed0a049369d3ac0ef92343c5fe9f08fdbe0
 2021-02-09 17:31:20 +00:00
Paul Duffin
9c78763313 Merge changes from topic "hiddenapi-without-fb" am: 0a31146013 am: 832a258431 am: 326f89720f am: 8fc0749ed7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d045b536d75947e782f199340a1a077eb5fdfbe
 2021-02-09 17:30:52 +00:00
Paul Duffin
ee9fd2d672 Fix lint errors in tools/hiddenapi am: f16a93c5b2 am: 5705a1f7ee am: 80167cbe5c am: 9578eebdbb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb7bb39eebe89afb3e5ad0d7f7d4730457d2bfe8
 2021-02-09 17:30:48 +00:00
Paul Duffin
483a91bc53 Fix generate_hiddenapi_lists_test.py am: 2019bc53c2 am: f74d4b8da7 am: c22ef81485 am: 1b51133ca2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93f172e38b4d4dbe6e64955301e701b7b4bca87b
 2021-02-09 17:30:45 +00:00
Nathalie Le Clair
6eade62314 [automerger skipped] Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770 am: 158f098e07 am: 0831b52c25 -s ours 
am skip reason: Change-Id I50a1423ef223156f98c6f21e9be82130a284295a with SHA-1 3ecb6747a9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id821209bf6812333a160bee08d58e2445cd87627
 2021-02-09 17:20:00 +00:00
Paul Duffin
8fc0749ed7 Merge changes from topic "hiddenapi-without-fb" am: 0a31146013 am: 832a258431 am: 326f89720f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaea9954c4c1f195940470ea5f0822efd5f1b13f5
 2021-02-09 17:19:37 +00:00
Paul Duffin
9578eebdbb Fix lint errors in tools/hiddenapi am: f16a93c5b2 am: 5705a1f7ee am: 80167cbe5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87be2aa6f4428a699ef45ea1016da85e81c1fbcd
 2021-02-09 17:19:25 +00:00
Paul Duffin
1b51133ca2 Fix generate_hiddenapi_lists_test.py am: 2019bc53c2 am: f74d4b8da7 am: c22ef81485 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6b9d22d3752ed21e92f975921a8dea9f233d31
 2021-02-09 17:19:05 +00:00
Chloris Kuo
43851f130e Merge "NAS Allowed Adjustments Migration" into sc-dev am: 3c54db7b83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13483558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea484fc18f3a0d382045d5d125416cbef709b7d1
 2021-02-09 17:17:40 +00:00
TreeHugger Robot
53cbaeb84b Merge "Only force layout legacy apps with SOFT_INPUT_ADJUST_RESIZE" into sc-dev am: d938189165 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13517005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4376481068d84c5de2a2708b6004ac8246384e7f
 2021-02-09 17:17:24 +00:00
TreeHugger Robot
2a6c4af5c5 Merge "Add overlayPaths to ApplicationInfo" into sc-dev am: 419f4eeb6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429374

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e3d6597d8a1f329faab00b8ad018b0124bff57
 2021-02-09 17:16:48 +00:00
Chloris Kuo
3c54db7b83 Merge "NAS Allowed Adjustments Migration" into sc-dev 2021-02-09 17:12:24 +00:00
TreeHugger Robot
d938189165 Merge "Only force layout legacy apps with SOFT_INPUT_ADJUST_RESIZE" into sc-dev 2021-02-09 17:07:50 +00:00
TreeHugger Robot
419f4eeb6c Merge "Add overlayPaths to ApplicationInfo" into sc-dev 2021-02-09 17:05:34 +00:00
Lucas Dupin
3919eed545 Merge "Hook-up colorForeground to new style" into sc-dev am: fd20e23658 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13522700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaca6078d29a8c324c2455ee20caf744c2a38749a
 2021-02-09 17:02:23 +00:00
Lucas Dupin
fd20e23658 Merge "Hook-up colorForeground to new style" into sc-dev 2021-02-09 16:50:41 +00:00
TreeHugger Robot
51723baca7 Merge "Use vibrator manager controller in VibratorManagerService" into sc-dev am: 8fddb7a431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417830

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id021ba789b712847f9f4fa6a94ab43c5277b8c8e
 2021-02-09 16:49:58 +00:00
Nathalie Le Clair
0831b52c25 Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770 am: 158f098e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdfc0e4788cecc3a358d358e1141ad2b3246deba
 2021-02-09 16:49:47 +00:00
Fabian Kozynski
05339b0802 Merge "Change landing page from PrivacyDialog" into sc-dev am: f8c2d0ebf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13519231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0b4a879de3b6abd307860b1bf41985026fcbb03
 2021-02-09 16:49:44 +00:00
Songchun Fan
48a71c50b6 Merge "Revert^2 "[SettingsProvider] @Readable annotation to restrict access to hidden keys"" into sc-dev am: c4e2866c12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13441055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6548507a76468ff13cc9b7641f049f911201aec6
 2021-02-09 16:49:32 +00:00
Paul Duffin
326f89720f Merge changes from topic "hiddenapi-without-fb" am: 0a31146013 am: 832a258431 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I034c118d8eb0aa64a0168b39f74d60abfe2ed0d1
 2021-02-09 16:48:51 +00:00
Paul Duffin
80167cbe5c Fix lint errors in tools/hiddenapi am: f16a93c5b2 am: 5705a1f7ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25553707d34b70d05abc250bdb0a55c1c66da4b5
 2021-02-09 16:48:48 +00:00
Paul Duffin
c22ef81485 Fix generate_hiddenapi_lists_test.py am: 2019bc53c2 am: f74d4b8da7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fb89e043e5ea788f0c30698a3465a82cc43d7c9
 2021-02-09 16:48:45 +00:00
TreeHugger Robot
8fddb7a431 Merge "Use vibrator manager controller in VibratorManagerService" into sc-dev 2021-02-09 16:37:57 +00:00
Fabian Kozynski
f8c2d0ebf5 Merge "Change landing page from PrivacyDialog" into sc-dev 2021-02-09 16:36:38 +00:00
Songchun Fan
c4e2866c12 Merge "Revert^2 "[SettingsProvider] @Readable annotation to restrict access to hidden keys"" into sc-dev 2021-02-09 16:34:20 +00:00
Cassie Wang
b40fb3e553 Merge "Require unlocked user for AppSearchImpl." into sc-dev am: 6f200eb94f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13452680

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89658b27c0404882990faa57fad0d585e4f726e5
 2021-02-09 16:27:41 +00:00
TreeHugger Robot
b858d2623b Merge "Remove two macros" into sc-dev am: 9ab8e869bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13520788

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9273202f6444d2251ee6a11ce2e7a56d2fc35195
 2021-02-09 16:26:35 +00:00
Cassie Wang
6f200eb94f Merge "Require unlocked user for AppSearchImpl." into sc-dev 2021-02-09 16:20:21 +00:00
TreeHugger Robot
9ab8e869bc Merge "Remove two macros" into sc-dev 2021-02-09 16:16:47 +00:00
Matt Pietal
d62b8cf81f Controls in Lockscreen Dialog 
After an action is taken by the user while the device is locked, we
need to start the bouncer and continue the action after successful
unlock. This action now supports either launching the
GlobalActionsDialog again or continuing in the newer dialog.

Bug: 179782498
Test: manual
Change-Id: I3829bed7e999fcfc2924d19e0f2ab0cac0afcb77
 2021-02-09 11:12:22 -05:00
TreeHugger Robot
d4b75e607d Merge "Rotate keyguard indication messages" into sc-dev am: 224e5f0b31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474373

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3560dfcc678c6b8c0025b0f85047165c000f036
 2021-02-09 15:57:40 +00:00
TreeHugger Robot
baa7b91fd3 Merge "Block calls to canAdminGrantSensorsPermissions on parent" into sc-dev am: 77cad7c3d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518736

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5e32386b10a29b08739a46ab3d03abe0dfadea3
 2021-02-09 15:57:24 +00:00
Nathalie Le Clair
158f098e07 Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30b5741fea5441bcae5975c7fa52ac97ca43b313
 2021-02-09 15:53:30 +00:00
Paul Duffin
832a258431 Merge changes from topic "hiddenapi-without-fb" am: 0a31146013 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b40794b7cb0fbd874e2a76403d275cb388e6ac9
 2021-02-09 15:50:12 +00:00
Paul Duffin
5705a1f7ee Fix lint errors in tools/hiddenapi am: f16a93c5b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4b514c5f72ad163b89d8281b86afed8939491ea
 2021-02-09 15:48:15 +00:00
Paul Duffin
f74d4b8da7 Fix generate_hiddenapi_lists_test.py am: 2019bc53c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I536d504457ff5fffb0a2e278681bf9b003ab9140
 2021-02-09 15:45:13 +00:00
Stevie Kideckel
7eae81bff6 Merge "Add the android:clipToOutline attribute for views." 2021-02-09 15:38:31 +00:00
TreeHugger Robot
224e5f0b31 Merge "Rotate keyguard indication messages" into sc-dev 2021-02-09 15:36:14 +00:00
TreeHugger Robot
77cad7c3d9 Merge "Block calls to canAdminGrantSensorsPermissions on parent" into sc-dev 2021-02-09 15:28:41 +00:00
Nathalie Le Clair
1d1c6ae770 Merge "Fix CEC init twice in normal boot" 2021-02-09 15:24:49 +00:00
Paul Duffin
0a31146013 Merge changes from topic "hiddenapi-without-fb" 
* changes:
  Move hiddenapi tools used by build/soong into build/soong
  Fix lint errors in tools/hiddenapi
  Fix generate_hiddenapi_lists_test.py
 2021-02-09 15:17:42 +00:00