Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
482,924 Commits 3 Branches 0 Tags
0877a937602effe8e46ae28d91d777acf799a169
Commit Graph

482924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Zhang
0877a93760 Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 am: 64750d74ea 
Change-Id: Ia0518fef236a148f3aca7c54dd2e4b797f816f09
 2020-04-28 16:37:53 +00:00
Fan Zhang
64750d74ea Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 
Change-Id: Ic9c581ea8e757b9376f1a3b28db623aded5a4884
 2020-04-28 16:23:10 +00:00
Fan Zhang
b9c9917810 Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev 2020-04-28 16:10:44 +00:00
TreeHugger Robot
82d49cc890 Merge "Fix .equals call in ImageDecoder" into rvc-dev am: 33696c1cca am: cd6d5575c5 
Change-Id: I6fd1c91f826c13e550da2b33e3568e38d9cb7055
 2020-04-28 16:04:43 +00:00
TreeHugger Robot
cd6d5575c5 Merge "Fix .equals call in ImageDecoder" into rvc-dev am: 33696c1cca 
Change-Id: I6d02f7fe043af98a0407ad2e2aa109f15b1abfe4
 2020-04-28 15:51:19 +00:00
TreeHugger Robot
33696c1cca Merge "Fix .equals call in ImageDecoder" into rvc-dev 2020-04-28 15:34:37 +00:00
Miranda Kephart
2ac7e8fa19 Merge "Fix screenshot UI entrance animation" into rvc-dev am: 65225acf1e am: 3f0ecdb836 
Change-Id: Id5049cdb2773f9aa44f7b81cc5e378baec9a827b
 2020-04-28 14:56:36 +00:00
Eran Messeri
23867f7189 Merge "Fix work challenge lockscreen being dismissed" into rvc-dev am: e066b2b131 am: 5ec2b080c4 
Change-Id: Ic40b514afd7fd70ef55b38d2eb9bf7c830816f08
 2020-04-28 14:56:26 +00:00
Riddle Hsu
a750866c80 Merge "Fix stack reference is not updated if the task is organized" into rvc-dev am: 35f762fb1f am: f72ccde60a 
Change-Id: I0f3eda12e9aa783eacdcc42d8ea850cadc03ffec
 2020-04-28 14:55:50 +00:00
Miranda Kephart
3f0ecdb836 Merge "Fix screenshot UI entrance animation" into rvc-dev am: 65225acf1e 
Change-Id: Idbb8301a56fe58e7135e94bd5ae860b179f35d8a
 2020-04-28 14:37:36 +00:00
Eran Messeri
5ec2b080c4 Merge "Fix work challenge lockscreen being dismissed" into rvc-dev am: e066b2b131 
Change-Id: I3d4608828e27ec06b40d8425b65a3e9f7119f7e0
 2020-04-28 14:36:54 +00:00
Riddle Hsu
f72ccde60a Merge "Fix stack reference is not updated if the task is organized" into rvc-dev am: 35f762fb1f 
Change-Id: I4ebd5fd4bc57a1d4899ea843c38b0a2a84445642
 2020-04-28 14:36:12 +00:00
Miranda Kephart
65225acf1e Merge "Fix screenshot UI entrance animation" into rvc-dev 2020-04-28 14:34:51 +00:00
Eran Messeri
e066b2b131 Merge "Fix work challenge lockscreen being dismissed" into rvc-dev 2020-04-28 14:29:48 +00:00
Riddle Hsu
35f762fb1f Merge "Fix stack reference is not updated if the task is organized" into rvc-dev 2020-04-28 14:18:31 +00:00
Leon Scroggins III
6419ebff5c Fix .equals call in ImageDecoder 
Bug: 154954875
Bug: 143231863
Test: I93b01cb60a8c76110ea2ff4250d0048512629d8d

I9229039b752bafa9a9b85b914a62093dff1eec34 switched from "==" to
".equals", but it did not take into account that Uri#getScheme() can
return null. Switch around the .equals check so that it is called on
SCHEME_CONTENT, which will never be null.

Change-Id: I0df5d2407a32fad0e21e597697af293fbc2fb315
Merged-In: I0df5d2407a32fad0e21e597697af293fbc2fb315
 2020-04-28 14:14:30 +00:00
TreeHugger Robot
641dd9b462 Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev am: 8862ee3891 am: 904ccaa4c0 
Change-Id: Ifa7ccef1b30dc47146e107b23eb6359a6cde716e
 2020-04-28 14:08:32 +00:00
TreeHugger Robot
f02bb1c5c7 Merge "Add experience for shortcut-less convos" into rvc-dev am: bc78548368 am: a1343ba28c 
Change-Id: I8ae5c746a7f23a82a3a0c41dc1d9429b1f56ed99
 2020-04-28 14:08:22 +00:00
Pavel Grafov
3cc719ae0a Merge "Update personal apps suspension strings." into rvc-dev am: 3b8aa15911 am: e95ff22555 
Change-Id: I1f979ad40af7eac441c5f3166b26b11066e3281c
 2020-04-28 14:08:03 +00:00
TreeHugger Robot
904ccaa4c0 Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev am: 8862ee3891 
Change-Id: I4cf9902477a06f15e08e469fe6e66c0bc47c0b0c
 2020-04-28 14:02:46 +00:00
TreeHugger Robot
a1343ba28c Merge "Add experience for shortcut-less convos" into rvc-dev am: bc78548368 
Change-Id: I5082e8c7b34c956c8fb06d621dadc647f3841f0d
 2020-04-28 14:02:27 +00:00
TreeHugger Robot
8862ee3891 Merge "Only perform autolaunch if list has completely rebuilt" into rvc-dev 2020-04-28 13:59:33 +00:00
TreeHugger Robot
bc78548368 Merge "Add experience for shortcut-less convos" into rvc-dev 2020-04-28 13:57:14 +00:00
Pavel Grafov
e95ff22555 Merge "Update personal apps suspension strings." into rvc-dev am: 3b8aa15911 
Change-Id: I5914bc2391a5f73caaced1052b08f7ceb76951ba
 2020-04-28 13:54:03 +00:00
Pavel Grafov
3b8aa15911 Merge "Update personal apps suspension strings." into rvc-dev 2020-04-28 13:41:20 +00:00
Paul Duffin
1365f58c13 Merge "Rename conscrypt-module-public-api-stubs-source" into rvc-dev am: a780fd9d71 am: 5f991c6184 
Change-Id: Id38096218e511f5c600e5924f08565a4c6f78095
 2020-04-28 13:22:05 +00:00
Paul Duffin
c7e090c29b Merge "Reference libcore, conscrypt and icu sources directly" into rvc-dev am: c96262a856 am: 9f1bead44e 
Change-Id: I5e534bcdf6d90932ddc19aeb5680f28f0c28032a
 2020-04-28 13:21:38 +00:00
Paul Duffin
5f991c6184 Merge "Rename conscrypt-module-public-api-stubs-source" into rvc-dev am: a780fd9d71 
Change-Id: Iafba4190646e4e17ac35306dd97abbad651ebab2
 2020-04-28 13:03:55 +00:00
Paul Duffin
9f1bead44e Merge "Reference libcore, conscrypt and icu sources directly" into rvc-dev am: c96262a856 
Change-Id: I6ad44e4094694c1bafe43b03c61e1792a1a338f7
 2020-04-28 13:03:11 +00:00
Paul Duffin
a780fd9d71 Merge "Rename conscrypt-module-public-api-stubs-source" into rvc-dev 2020-04-28 12:46:27 +00:00
Paul Duffin
c96262a856 Merge "Reference libcore, conscrypt and icu sources directly" into rvc-dev 2020-04-28 12:44:48 +00:00
TreeHugger Robot
b35800ebbe Merge "Add an API to get active icon for screen saver" into rvc-dev am: 8be35ef462 am: 7fdc50fbcf 
Change-Id: Ic61e75e63667b5a2b033aa4e89d1f7a27adf7348
 2020-04-28 12:40:11 +00:00
TreeHugger Robot
2060a357a8 Merge "Make the APKs visible to another test apex." into rvc-dev am: 9fec6af883 am: 97cc65a9d3 
Change-Id: I12723b199b1af91d43418cbcd0f1dc5ee5c2b5b1
 2020-04-28 12:40:02 +00:00
TreeHugger Robot
7fdc50fbcf Merge "Add an API to get active icon for screen saver" into rvc-dev am: 8be35ef462 
Change-Id: I1e1e1379ea9c223ba376d4a85604b2e65539c41a
 2020-04-28 12:21:11 +00:00
TreeHugger Robot
97cc65a9d3 Merge "Make the APKs visible to another test apex." into rvc-dev am: 9fec6af883 
Change-Id: I46734a6ddbd37395fb21296722c886132e5b9a77
 2020-04-28 12:20:47 +00:00
Julia Reynolds
8582df5cc7 Add experience for shortcut-less convos 
- no conversation specific controls
- no 'bubble this' button
- turn off interim placeholder channels
- fix msg tracking - only shortcut-less notifs matter

Test: atest
Bug: 154814754
Change-Id: Ia04ce496d4e7b2f353c71865f338b5229192c395
 2020-04-28 12:11:47 +00:00
TreeHugger Robot
8be35ef462 Merge "Add an API to get active icon for screen saver" into rvc-dev 2020-04-28 12:05:16 +00:00
TreeHugger Robot
9fec6af883 Merge "Make the APKs visible to another test apex." into rvc-dev 2020-04-28 12:03:48 +00:00
arangelov
1b11cc1a17 Only perform autolaunch if list has completely rebuilt 
Previously we would check for autolaunch the first time
onPostListReady is called, but that is too early in the case
when we start the async task for sorting the targets. In
that case onPostListReady is called twice - once before
task is launched, and once after task is finished.

We fix this by passing the rebuildListCompleted parameter to
the onPostListReady callback and use it to check for autolaunch.

Test: atest ChooserActivity
Test: atest ResolverActivity
Test: manual
Fixes: 154728817
Change-Id: Ib1b049af00d791898b908bdb65971c07c558f3ac
 2020-04-28 12:59:18 +01:00
TreeHugger Robot
8e2be8e868 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 6b25213d68 am: 5007cd55a6 
Change-Id: I53709f9dc423d547435aec4f794b3e1128f34c8f
 2020-04-28 11:32:24 +00:00
TreeHugger Robot
5007cd55a6 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev am: 6b25213d68 
Change-Id: I52886ee15197855eb4c95c7a3c7a54bb790a7ff4
 2020-04-28 11:17:25 +00:00
TreeHugger Robot
6b25213d68 Merge "Update prebuilt CTS shim pkgs with the ones built on server" into rvc-dev 2020-04-28 11:00:20 +00:00
Pavel Grafov
0e7d1c49c1 Update personal apps suspension strings. 
String resource names were renamed to differ from the old ones
because the text used to require an integer argument.

Also notification update moved out of synchronized block.

Bug: 154912947
Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest
Change-Id: I83997c2cf575f36bb2b53037ed9a68dfecc290a2
 2020-04-28 11:16:20 +01:00
TreeHugger Robot
bbff6fd533 Merge "Tweak the string for battery saving" into rvc-dev am: 9689eda20f am: 46fc076d61 
Change-Id: Iefbf9f32a41194b2387672377f58787c4788cd05
 2020-04-28 09:54:39 +00:00
TreeHugger Robot
6e99d2b988 Merge "Enforce permission check in getUidStats function" into rvc-dev am: f6288ea881 am: 2fe55ed6d4 
Change-Id: I6053e0e5c346135fd1618f8feb8c585de2963af6
 2020-04-28 09:54:27 +00:00
TreeHugger Robot
46fc076d61 Merge "Tweak the string for battery saving" into rvc-dev am: 9689eda20f 
Change-Id: Ic5b3a8ebf4b7dbcfb8884b4f83750d4f0c55a421
 2020-04-28 09:38:34 +00:00
TreeHugger Robot
9689eda20f Merge "Tweak the string for battery saving" into rvc-dev 2020-04-28 09:30:32 +00:00
TreeHugger Robot
2fe55ed6d4 Merge "Enforce permission check in getUidStats function" into rvc-dev am: f6288ea881 
Change-Id: I9ace72aa0fb2f2e8a604bd2030b8bbea905fb2d8
 2020-04-28 09:29:54 +00:00
TreeHugger Robot
f6288ea881 Merge "Enforce permission check in getUidStats function" into rvc-dev 2020-04-28 09:13:32 +00:00
Mill Chen
57abc612d3 Add an API to get active icon for screen saver 
In order to improve the clarity of current screen saver, we need to get
the active icon from DreamBackend and add it on the left side of current
screen saver preference.

Bug: 129994275
Test: robotests
Change-Id: I844ccdcdccc270f23f1a0f0f0ce5335fce184c5b
 2020-04-28 17:10:27 +08:00