Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
538,501 Commits 3 Branches 0 Tags
4adce607d606a466a04158dc2cbeea8032f07d5d
Commit Graph

13976 Commits

Author SHA1 Message Date
Benedict Wong
9e18eeb4a6 Merge "Add methods for IKEv2/IPsec test mode profiles" am: f44b90fdc4 am: 8b0b9d8a26 am: d84c77544b am: faea94fccd am: c4b78b72fd 
Change-Id: Ica5592c8b02effa49a8d672fb30ee703147e025e
 2020-05-15 03:50:20 +00:00
Benedict Wong
d84c77544b Merge "Add methods for IKEv2/IPsec test mode profiles" am: f44b90fdc4 am: 8b0b9d8a26 
Change-Id: I353d999ebcdd108a900abfe20be232e83147b6d2
 2020-05-15 02:51:43 +00:00
Benedict Wong
f44b90fdc4 Merge "Add methods for IKEv2/IPsec test mode profiles" 2020-05-15 02:18:02 +00:00
Antoan Angelov
6f1575bb0d Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 am: 228ba99ce7 am: 509cda43cb am: 02003bffe6 
Change-Id: I847fce4e665022ac623d815bc86f4a77e9a3e87b
 2020-05-13 19:18:31 +00:00
Antoan Angelov
509cda43cb Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 am: 228ba99ce7 
Change-Id: Ibb26480e6ecffe7f18b79a181480ae9cdf8571a2
 2020-05-13 18:30:41 +00:00
Antoan Angelov
a1d2a8d9cc Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev am: b98da91c63 
Change-Id: I9c6336d8060b1f53834752b95dfa1170d2a96f16
 2020-05-13 18:19:25 +00:00
Antoan Angelov
b98da91c63 Merge "Initialize workProfileUserHandle before initial check for work tabs" into rvc-dev 2020-05-13 18:06:06 +00:00
Automerger Merge Worker
236c99e05c Merge "Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 am: 022a82161c" into rvc-d1-dev-plus-aosp am: 3bc82e0fb8 am: 486f2374b8 
Change-Id: Ieb5c1dc254e41c27c68b2dfde94363651ac0d0a8
 2020-05-13 17:19:25 +00:00
Miranda Kephart
1e7448a0b0 Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 am: 022a82161c 
Change-Id: Id572a615f2c907eb88dcb07972167aa9fd085e9a
 2020-05-13 16:29:38 +00:00
Miranda Kephart
2be49604d1 Merge "Fix NPE in ScreenshotHelper" into rvc-dev am: a4b9474647 
Change-Id: I4f5eefd73aec60b2f4606e7bb18916d56384ebc6
 2020-05-13 16:23:58 +00:00
Miranda Kephart
a4b9474647 Merge "Fix NPE in ScreenshotHelper" into rvc-dev 2020-05-13 16:20:14 +00:00
arangelov
8519218a73 Initialize workProfileUserHandle before initial check for work tabs 
The shouldShowTabs() call checks for the existence of the work
profile user, which is actually initialized after that call.

Fixes: 156462936
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: Iff840826f7b008420f1a254c1044c05c27764d0c
 2020-05-13 13:59:22 +00:00
TreeHugger Robot
99edc45752 Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: b16d643e8c am: 08aa39ec2c am: 19b93ed25b 
Change-Id: Ia63c286f4d5570f570e3552b9b974598bd8d8a39
 2020-05-13 13:37:28 +00:00
TreeHugger Robot
19b93ed25b Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: b16d643e8c am: 08aa39ec2c 
Change-Id: I3db44c04ada8061027971135006ac7afab1da226
 2020-05-13 13:19:50 +00:00
TreeHugger Robot
50ab6ee68d Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa am: b16d643e8c 
Change-Id: I4c3749b185f4abf147d5c9d88cc404c53063f1d5
 2020-05-13 13:06:57 +00:00
TreeHugger Robot
a64fc14b85 Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev am: f4fa3eb9fa 
Change-Id: I2800dccca0869637cf87a6f1354ca3cea4b258c4
 2020-05-13 12:54:55 +00:00
TreeHugger Robot
f4fa3eb9fa Merge "Hide the top intent resolver divider when there are tabs" into rvc-dev 2020-05-13 12:41:43 +00:00
Benedict Wong
63d2bfd257 Add methods for IKEv2/IPsec test mode profiles 
This change adds the ability for IKEv2/IPsec VPN profiles to run on Test
Networks. If enabled, the IKEv2/IPsec VPN profiles will request ONLY
test networks.

Bug: 148582947
Test: FrameworksNetTests passing
Test: Added for testing
Change-Id: I2511b39b27a1e29ae97907cdb12728d13fb1628f
 2020-05-12 22:55:55 -07:00
TreeHugger Robot
3ecc9ea11c Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev am: 58c274fdcb am: 9679757fee am: c3d7baf52f am: 6c70a223f5 
Change-Id: I7a72ef2612e142652e2df7b8831d96ee5ff9171c
 2020-05-13 01:31:45 +00:00
TreeHugger Robot
c3d7baf52f Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev am: 58c274fdcb am: 9679757fee 
Change-Id: Ib4393c50d2f3a79dc6d1fed358b4dabee6cbb755
 2020-05-13 01:02:14 +00:00
TreeHugger Robot
1e68d0e33c Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev am: 58c274fdcb 
Change-Id: I0e62291acfcdee38d2ac4a5e418a2a5550508257
 2020-05-13 01:01:10 +00:00
TreeHugger Robot
58c274fdcb Merge "When android:ui process receives callback result of AppPredictionService sortTargets, directly handles result instead of sending to Handler which takes extra time to dispatch messages." into rvc-dev 2020-05-13 00:57:28 +00:00
Beverly Tai
bc7e0347f9 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev am: 3fb4151b06 am: 3ad107e5e0 am: 0aeae479b7 am: 3539d27256 
Change-Id: Ibbe1ed4a7ca6a74ab7515a1073428510b392b153
 2020-05-12 23:55:21 +00:00
Beverly Tai
0aeae479b7 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev am: 3fb4151b06 am: 3ad107e5e0 
Change-Id: I1363e472c19109301070ae663cc8f439a7c9fbea
 2020-05-12 23:20:50 +00:00
Beverly Tai
574fbd1410 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev am: 3fb4151b06 
Change-Id: Ic4225ac0d4cbbdbfd6ca0c048302a74f9715b896
 2020-05-12 22:58:50 +00:00
Beverly Tai
3fb4151b06 Merge "Inject LockPatternUtils into KeyguardUpdateMonitor" into rvc-dev 2020-05-12 22:40:44 +00:00
TreeHugger Robot
51822d01df Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb am: 1e3fe956cf am: 689486059f am: 4623e80530 
Change-Id: I80f338fc23ef80f544bc33d169f262346ab17786
 2020-05-12 22:31:13 +00:00
TreeHugger Robot
689486059f Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb am: 1e3fe956cf 
Change-Id: I36ce5198582b6aa3fe6fc1c89e9438454df09f3f
 2020-05-12 20:44:35 +00:00
TreeHugger Robot
4dca85b87f Merge "Add OWNERS for display, haptics, input and power" into rvc-dev am: f30c225fcb 
Change-Id: Id6ab3fe424d9914f1ec54c0f9a4684578ed89c0b
 2020-05-12 20:28:17 +00:00
TreeHugger Robot
f30c225fcb Merge "Add OWNERS for display, haptics, input and power" into rvc-dev 2020-05-12 20:17:39 +00:00
Michael Wright
2e7e81c950 Add OWNERS for display, haptics, input and power 
Bug: 156349083
Test: N/A
Change-Id: Ia8afccfc2e470095ae3d52c827c0ac78b7c120ae
 2020-05-12 19:11:13 +01:00
Miranda Kephart
cc92b9c370 Fix NPE in ScreenshotHelper 
Check for null before unbinding the screenshot process.

Test: manual
Bug: 155726862
Change-Id: Ica1cc521b6a510b5e15e42e1e2a87ebf613a53aa
 2020-05-12 13:47:33 -04:00
Beverly
f882ee2164 Inject LockPatternUtils into KeyguardUpdateMonitor 
For better testability of KeyguardUpdateMonitor. We don't actually want
to register callbacks to the real lock settings. But if we ever do in
tests, we make sure to cleanup the callbacks in
KeyguardUpdateMonitor.destroy().

Test: atest SystemUITests
Fixes: 156230507
Change-Id: I2548c15da29ef5a15f6d3b512fbfd344ca2bd355
 2020-05-12 12:59:13 -04:00
Menghan Li
09a27835f7 Merge "Refines volume key shortcut confirm dialog strings" into rvc-dev am: 084b2de544 am: 6a7ce20a46 am: ef332ca77c am: 7787c1bfff 
Change-Id: I5103b3c8457afac45eb1dacc8baeffda107fd33f
 2020-05-12 16:48:49 +00:00
Anna Trostanetski
91bc64f18c Merge "Remove atrost (and dbrazdil) from OWNERS files." am: 06e2fe837a am: 389fa5ce4f am: b4a8ebd014 am: 4916a1ac96 am: 520b9b5361 
Change-Id: I22172836a1c7962b235974eeed65506b9dee0717
 2020-05-12 16:47:50 +00:00
Menghan Li
6a7ce20a46 Merge "Refines volume key shortcut confirm dialog strings" into rvc-dev am: 084b2de544 
Change-Id: I3773e65872edd6d1be0bd273b1520faddf3fd0f8
 2020-05-12 16:21:59 +00:00
Menghan Li
084b2de544 Merge "Refines volume key shortcut confirm dialog strings" into rvc-dev 2020-05-12 16:10:51 +00:00
menghanli
3cba1dc1c5 Refines volume key shortcut confirm dialog strings 
- Provide more clear content for single and multiple services are
enabled.
- Avoid non-a11y users accidentally turning shortcut on without
reading this carefully. Hence we put "don't turn on" as the
primary action.

Bug: 155249323
Bug: 138582063
Test: atest AccessibilityShortcutControllerTest
Change-Id: I1c391bb0516bcebfbf6161b94cc0c0b80e0bb72f
 2020-05-12 16:05:50 +00:00
Anna Trostanetski
b4a8ebd014 Merge "Remove atrost (and dbrazdil) from OWNERS files." am: 06e2fe837a am: 389fa5ce4f 
Change-Id: I43430577015ddbcd5aabb10794d250a960eb5def
 2020-05-12 16:03:40 +00:00
Abhijeet Kaur
853068d4eb Merge "Add manage mode workflow for ExternalStorageProvider" into rvc-dev am: e0ae189f8a am: d0772d278e am: 1b712aea0a am: 3fb52c039a 
Change-Id: I3a8f89ac0e7e8eae5b16d4861ab8925180ded193
 2020-05-12 15:23:13 +00:00
Abhijeet Kaur
d0772d278e Merge "Add manage mode workflow for ExternalStorageProvider" into rvc-dev am: e0ae189f8a 
Change-Id: I3c32ac61756b91b68c5eb5c87450542a58734d5a
 2020-05-12 14:42:26 +00:00
Abhijeet Kaur
e0ae189f8a Merge "Add manage mode workflow for ExternalStorageProvider" into rvc-dev 2020-05-12 14:39:19 +00:00
atrost
9cd0ba571c Remove atrost (and dbrazdil) from OWNERS files. 
Test: none
Change-Id: If82422229d1b4cbed5e72d1c9042bd6a38be54e5
 2020-05-12 12:36:02 +01:00
Alex Kershaw
760754ec61 Hide the top intent resolver divider when there are tabs 
Fixes: 155174577
Test: manual
Change-Id: If35f4902e793767cbd38e1f5770d55c4e7b22872
 2020-05-12 12:02:42 +01:00
Antoan Angelov
fa8bbc6748 Merge "Don't show layout with default if in tabbed view" into rvc-dev am: ff779f6d8e am: eee917a2e4 am: b9d7abaf42 am: 5395a26024 
Change-Id: I3fc92d2afd881f1b533ec41758743933bb64eb09
 2020-05-11 15:57:31 +00:00
Antoan Angelov
eee917a2e4 Merge "Don't show layout with default if in tabbed view" into rvc-dev am: ff779f6d8e 
Change-Id: Ie262b8b5b869df1116902175e98ce102b5b92d94
 2020-05-11 15:05:05 +00:00
Antoan Angelov
ff779f6d8e Merge "Don't show layout with default if in tabbed view" into rvc-dev 2020-05-11 14:49:18 +00:00
Abhijeet Kaur
553625de0a Add manage mode workflow for ExternalStorageProvider 
In Scoped Storage world, access to "Android/data" style directories are
hidden for privacy reasons. Allow ExternalStorageProvider to show these
hidden files when in manage mode.

Bug: 150366834
Test: Android/data and Android/obb is visible from Files App, but are
hidden in Picker view from StorageTestApp and Gmail (GMAIL > Compose >
Attach > Go to Pixel > Android)

Change-Id: I58b4fc23d9b479df4fc0480ae55f1f2070d0cb7c
 2020-05-11 11:39:40 +01:00
Jason Hsu
2cc0839ae7 Merge "Logs accessibility shortcut behavior." into rvc-dev am: 5c8f27a56e am: 0eaa712069 am: 08fa17e6fe am: ab899cd56a 
Change-Id: Id8e73df3932f614b878e385e15574c9d5adbdd25
 2020-05-10 06:09:15 +00:00
Jason Hsu
0eaa712069 Merge "Logs accessibility shortcut behavior." into rvc-dev am: 5c8f27a56e 
Change-Id: Ieccf4811d1c7e96917be274365f2d65edd463489
 2020-05-10 05:22:30 +00:00