Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
494,809 Commits 3 Branches 0 Tags
49bcd7f2367d3556d82cab9bea46ade1729580d9
Commit Graph

494809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shafik Nassar
49bcd7f236 Merge "MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp" into rvc-dev am: 559792fb96 am: d9de60ce6b 
Change-Id: I94fa65645c45a3614e62991cd7d31df4488a8c49
 2020-04-27 15:51:53 +00:00
TreeHugger Robot
3b91d7e07b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: e712d106bf -s ours 
am skip reason: subject contains skip directive

Change-Id: I76082bd000d3673b9e4b69ffcd0375d998a525ce
 2020-04-27 15:48:06 +00:00
Beverly Tai
83cc22b066 Merge "Separate managed/primary profile sensitive notifs" into rvc-dev am: d3162cf2ba am: 8bd6b59dca 
Change-Id: I8dc92a203904dc39673d4b5dfc97cb962f4e59ac
 2020-04-27 15:47:58 +00:00
Shafik Nassar
3c67013490 Merge "MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp" into rvc-dev am: 559792fb96 am: 0b047cffb6 
Change-Id: Ie1d5e54db04e50c778b10f99326744799b5e97fe
 2020-04-27 15:47:39 +00:00
TreeHugger Robot
e712d106bf Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-27 15:40:26 +00:00
Beverly Tai
8bd6b59dca Merge "Separate managed/primary profile sensitive notifs" into rvc-dev am: d3162cf2ba 
Change-Id: Ifd341b028654e9cb9912f8bcfc5dea0f5f0c2ed3
 2020-04-27 15:39:34 +00:00
Shafik Nassar
d9de60ce6b Merge "MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp" into rvc-dev am: 559792fb96 
Change-Id: I609502768d979f7e4acb828a1e919dc2b7b98d60
 2020-04-27 15:38:50 +00:00
Shafik Nassar
0b047cffb6 Merge "MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp" into rvc-dev am: 559792fb96 
Change-Id: Ia26b51d76ecd4d12d40a54d77ef010eacee08589
 2020-04-27 15:38:49 +00:00
Beverly Tai
d3162cf2ba Merge "Separate managed/primary profile sensitive notifs" into rvc-dev 2020-04-27 15:34:52 +00:00
TreeHugger Robot
f1f7ce61d6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: fa496230e7 -s ours 
am skip reason: subject contains skip directive

Change-Id: I054bbfacc6e84c078f4f9eed18808be13e3755e0
 2020-04-27 15:33:13 +00:00
TreeHugger Robot
c0e28ec67b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 74023fa2e2 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic559320c039ac82caa9f9f791240d91876bc8729
 2020-04-27 15:33:06 +00:00
Beverly Tai
26aabbbf18 Merge "Check importance to determine if notif sounds" into rvc-dev am: 10649bff17 am: cc950913ef 
Change-Id: I36c4dce5db8b304727f5aeedd13d05b372b03871
 2020-04-27 15:32:58 +00:00
Beverly Tai
ac28dee1bf Merge "Check importance to determine if notif sounds" into rvc-dev am: 10649bff17 am: a088c85cba 
Change-Id: Ia5dee6c4d73d0e7d089a90f59f06c182fdf459aa
 2020-04-27 15:32:11 +00:00
TreeHugger Robot
11dba39118 Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 am: 2327a3b62a 
Change-Id: Iae72ed75125bc3c25acdee5479d55bfa04d393ac
 2020-04-27 15:31:38 +00:00
Shafik Nassar
559792fb96 Merge "MANAGE_EXTERNAL_STORAGE cleanup: remove isIgnoredAppOp" into rvc-dev 2020-04-27 15:30:59 +00:00
TreeHugger Robot
c7a2a5f041 Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 am: d48ac781fe 
Change-Id: Ia80909b90cd0bb45fac5720df0fc8750953a1115
 2020-04-27 15:30:48 +00:00
TreeHugger Robot
fa496230e7 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-27 15:27:39 +00:00
TreeHugger Robot
74023fa2e2 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-27 15:21:24 +00:00
Beverly Tai
a088c85cba Merge "Check importance to determine if notif sounds" into rvc-dev am: 10649bff17 
Change-Id: Iaa3746e48d87628d95343f67c3b66db8b7eb7dfd
 2020-04-27 15:15:26 +00:00
TreeHugger Robot
2327a3b62a Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 
Change-Id: Ic6d274f9938675757c9e21324d9257a987a135e4
 2020-04-27 15:15:11 +00:00
Beverly Tai
cc950913ef Merge "Check importance to determine if notif sounds" into rvc-dev am: 10649bff17 
Change-Id: I05e398973496ad805a49d9be03d54d03f799a314
 2020-04-27 15:15:05 +00:00
TreeHugger Robot
d48ac781fe Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev am: a3460d1831 
Change-Id: I5afb3ecab3a0cedbc25267971c879d2461f27339
 2020-04-27 15:14:30 +00:00
Beverly Tai
10649bff17 Merge "Check importance to determine if notif sounds" into rvc-dev 2020-04-27 15:11:26 +00:00
TreeHugger Robot
6bfb9d1566 Merge "App title in PiP notification" into rvc-dev am: 29f0eb33f0 am: b237e495ba 
Change-Id: I9c14c9b1a72be4a0cb294c3000bf1d7212443436
 2020-04-27 15:09:38 +00:00
TreeHugger Robot
39e56b80be [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8e2ed4e573 -s ours am: e17694c321 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9875ddaf442f855b861a958fe3096f38ffabe9a3
 2020-04-27 15:09:28 +00:00
TreeHugger Robot
5c129a7ad5 Merge "App title in PiP notification" into rvc-dev am: 29f0eb33f0 am: cdee597185 
Change-Id: I9046ec537837766c03a4907c8d3c0d689af0c337
 2020-04-27 15:09:11 +00:00
Automerger Merge Worker
200ecb9e6d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a2b1a3fd61 -s ours am: 44d121d360 -s ours" into rvc-d1-dev-plus-aosp 2020-04-27 15:09:09 +00:00
TreeHugger Robot
31da7c6b25 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a2b1a3fd61 -s ours am: 44d121d360 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia895eea61565db5c3273fd575c0f44864df1c44c
 2020-04-27 15:09:04 +00:00
TreeHugger Robot
cebe047139 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8e2ed4e573 -s ours am: 447b1079cf -s ours 
am skip reason: subject contains skip directive

Change-Id: Ifaf2d0736ef6ca3af6f97a8f039f1150cb79f31e
 2020-04-27 15:09:03 +00:00
Automerger Merge Worker
b913abca7a Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a2b1a3fd61 -s ours am: 584a01d521 -s ours" into rvc-d1-dev-plus-aosp 2020-04-27 15:09:00 +00:00
TreeHugger Robot
c4856d3a59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a2b1a3fd61 -s ours am: 584a01d521 -s ours 
am skip reason: subject contains skip directive

Change-Id: I52e26a1f12749a878a860c2f714fda47092eb78f
 2020-04-27 15:08:53 +00:00
Ruslan Tkhakokhov
ca7e4c9429 Merge "Skip backup/restore of wallpaper package" into rvc-dev am: 6eca78cd87 am: 9df1032486 
Change-Id: Icb120fb247c856b23fa5a24735b844f011b584f0
 2020-04-27 15:08:47 +00:00
Ruslan Tkhakokhov
7efb090c7d Merge "Skip backup/restore of wallpaper package" into rvc-dev am: 6eca78cd87 am: 22e29a8b64 
Change-Id: I3aba4f5e96bf60a2e535f9f6d83f136f5bd8be79
 2020-04-27 15:08:09 +00:00
TreeHugger Robot
a3460d1831 Merge "Distinguish shortcut vs non shortcut convos" into rvc-dev 2020-04-27 15:03:53 +00:00
TreeHugger Robot
cdee597185 Merge "App title in PiP notification" into rvc-dev am: 29f0eb33f0 
Change-Id: Ibb7bcfab03c44b019e661dae363f2842dc7fa1da
 2020-04-27 14:43:10 +00:00
TreeHugger Robot
b237e495ba Merge "App title in PiP notification" into rvc-dev am: 29f0eb33f0 
Change-Id: I88538f3a6dd813cdb6bce15a3f3b78297fae21c2
 2020-04-27 14:43:02 +00:00
TreeHugger Robot
447b1079cf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8e2ed4e573 -s ours 
am skip reason: subject contains skip directive

Change-Id: I66e40a9e290b6b7ce3112f78d7dee110895b9ff0
 2020-04-27 14:42:59 +00:00
TreeHugger Robot
584a01d521 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a2b1a3fd61 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic105dddee57c204b2264686c22ce41e7b3f911b7
 2020-04-27 14:42:43 +00:00
TreeHugger Robot
e17694c321 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8e2ed4e573 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic42c12b8172a1126637ac22eea504bc13f69aca5
 2020-04-27 14:42:39 +00:00
TreeHugger Robot
44d121d360 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a2b1a3fd61 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5afe5954b98be5724974e939dc1ce0bf4e4716e2
 2020-04-27 14:42:24 +00:00
Ruslan Tkhakokhov
22e29a8b64 Merge "Skip backup/restore of wallpaper package" into rvc-dev am: 6eca78cd87 
Change-Id: I7ee12fec9a65dea135bfdd2f6718c61e1690cad1
 2020-04-27 14:41:49 +00:00
Ruslan Tkhakokhov
9df1032486 Merge "Skip backup/restore of wallpaper package" into rvc-dev am: 6eca78cd87 
Change-Id: I6d4a3ef152735e52312c827d8436853707eb1b27
 2020-04-27 14:41:33 +00:00
TreeHugger Robot
29f0eb33f0 Merge "App title in PiP notification" into rvc-dev 2020-04-27 14:36:33 +00:00
TreeHugger Robot
8e2ed4e573 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:30:43 +00:00
TreeHugger Robot
a2b1a3fd61 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:24:33 +00:00
Ruslan Tkhakokhov
6eca78cd87 Merge "Skip backup/restore of wallpaper package" into rvc-dev 2020-04-27 14:23:53 +00:00
Beverly
11976b6401 Separate managed/primary profile sensitive notifs 
Previously if the current (primary) user didn't allow sensitive
notifications to show all their info on the lockscreen, then
notifications for managed profiles also wouldn't show their sensitive
info despite the user intentionally allowing work profile notifications
to be shown on the lock screen.

Now, if a notification is sent to a managed/work profile, then we only
use the work profile setting to redact the sensitive notification
information on the lockscreen. For all other notifications, we
additionally check the current user's redactivility setting.

Test: atest NotificationLockscreenUserManagerTest
Fixes: 143536631
Change-Id: I468ca0b68188a594ebf0b78ebcc3bc0bb93687ac
 2020-04-27 09:30:40 -04:00
Treehugger Robot
c61317de19 Merge "Make style of srcs consistent" am: b9c89bb3fa am: 79ebf07558 am: bfb50fdc5f 
Change-Id: I1d0b665ff43bb0730380442abffb1f8fc7b4cb5c
 2020-04-27 13:16:31 +00:00
Treehugger Robot
bfb50fdc5f Merge "Make style of srcs consistent" am: b9c89bb3fa am: 79ebf07558 
Change-Id: I2d1fde93e1084230dfa857e84c3efec7a016cd7e
 2020-04-27 12:57:47 +00:00
Treehugger Robot
79ebf07558 Merge "Make style of srcs consistent" am: b9c89bb3fa 
Change-Id: I3a3546760840453964c1a6b72fa0b96bc16c1203
 2020-04-27 12:48:23 +00:00