Commit ff5b158
Dianne Hackborn
Keep activities stopped while the lock screen is up.
Tell the activity manager when the lock screen is shown, so it
can keep itself (mostly) in sleep mode during this time, having
the foreground actvities remain in their stopped state.
Change-Id: I71c86d3298f23a98014d7ae36fd540c9df9a64e61 parent b0398f5 commit ff5b158
File tree
4 files changed
+98
-13
lines changed- core/java/android/app
- policy/src/com/android/internal/policy/impl
- services/java/com/android/server/am
4 files changed
+98
-13
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1000 | 1000 | | |
1001 | 1001 | | |
1002 | 1002 | | |
1003 | | - | |
| 1003 | + | |
1004 | 1004 | | |
1005 | 1005 | | |
1006 | 1006 | | |
| |||
1015 | 1015 | | |
1016 | 1016 | | |
1017 | 1017 | | |
| 1018 | + | |
| 1019 | + | |
| 1020 | + | |
| 1021 | + | |
| 1022 | + | |
| 1023 | + | |
| 1024 | + | |
1018 | 1025 | | |
1019 | 1026 | | |
1020 | 1027 | | |
| |||
2912 | 2919 | | |
2913 | 2920 | | |
2914 | 2921 | | |
| 2922 | + | |
| 2923 | + | |
| 2924 | + | |
| 2925 | + | |
| 2926 | + | |
| 2927 | + | |
| 2928 | + | |
| 2929 | + | |
| 2930 | + | |
| 2931 | + | |
| 2932 | + | |
2915 | 2933 | | |
2916 | 2934 | | |
2917 | 2935 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
205 | 205 | | |
206 | 206 | | |
207 | 207 | | |
208 | | - | |
| 208 | + | |
| 209 | + | |
209 | 210 | | |
210 | 211 | | |
211 | 212 | | |
| |||
588 | 589 | | |
589 | 590 | | |
590 | 591 | | |
| 592 | + | |
591 | 593 | | |
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
567 | 567 | | |
568 | 568 | | |
569 | 569 | | |
| 570 | + | |
570 | 571 | | |
571 | 572 | | |
572 | 573 | | |
| |||
1162 | 1163 | | |
1163 | 1164 | | |
1164 | 1165 | | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
1165 | 1174 | | |
1166 | 1175 | | |
1167 | 1176 | | |
| |||
1173 | 1182 | | |
1174 | 1183 | | |
1175 | 1184 | | |
| 1185 | + | |
1176 | 1186 | | |
1177 | 1187 | | |
1178 | 1188 | | |
| |||
1207 | 1217 | | |
1208 | 1218 | | |
1209 | 1219 | | |
| 1220 | + | |
1210 | 1221 | | |
1211 | 1222 | | |
1212 | 1223 | | |
| |||
1324 | 1335 | | |
1325 | 1336 | | |
1326 | 1337 | | |
| 1338 | + | |
1327 | 1339 | | |
1328 | 1340 | | |
1329 | 1341 | | |
| |||
Lines changed: 64 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
696 | 696 | | |
697 | 697 | | |
698 | 698 | | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
699 | 709 | | |
700 | 710 | | |
701 | 711 | | |
| |||
6656 | 6666 | | |
6657 | 6667 | | |
6658 | 6668 | | |
| 6669 | + | |
| 6670 | + | |
| 6671 | + | |
| 6672 | + | |
| 6673 | + | |
| 6674 | + | |
6659 | 6675 | | |
6660 | | - | |
| 6676 | + | |
6661 | 6677 | | |
6662 | 6678 | | |
6663 | | - | |
| 6679 | + | |
| 6680 | + | |
| 6681 | + | |
6664 | 6682 | | |
6665 | | - | |
6666 | | - | |
6667 | | - | |
6668 | | - | |
6669 | | - | |
| 6683 | + | |
| 6684 | + | |
| 6685 | + | |
| 6686 | + | |
| 6687 | + | |
| 6688 | + | |
6670 | 6689 | | |
6671 | 6690 | | |
6672 | 6691 | | |
| |||
6726 | 6745 | | |
6727 | 6746 | | |
6728 | 6747 | | |
| 6748 | + | |
| 6749 | + | |
| 6750 | + | |
| 6751 | + | |
| 6752 | + | |
| 6753 | + | |
| 6754 | + | |
| 6755 | + | |
| 6756 | + | |
| 6757 | + | |
6729 | 6758 | | |
| 6759 | + | |
| 6760 | + | |
| 6761 | + | |
| 6762 | + | |
| 6763 | + | |
| 6764 | + | |
6730 | 6765 | | |
| 6766 | + | |
6731 | 6767 | | |
6732 | | - | |
6733 | | - | |
6734 | | - | |
| 6768 | + | |
| 6769 | + | |
| 6770 | + | |
| 6771 | + | |
| 6772 | + | |
| 6773 | + | |
| 6774 | + | |
| 6775 | + | |
| 6776 | + | |
| 6777 | + | |
| 6778 | + | |
| 6779 | + | |
| 6780 | + | |
| 6781 | + | |
6735 | 6782 | | |
6736 | 6783 | | |
6737 | 6784 | | |
| |||
8815 | 8862 | | |
8816 | 8863 | | |
8817 | 8864 | | |
8818 | | - | |
| 8865 | + | |
| 8866 | + | |
| 8867 | + | |
| 8868 | + | |
| 8869 | + | |
| 8870 | + | |
| 8871 | + | |
8819 | 8872 | | |
8820 | 8873 | | |
8821 | 8874 | | |
| |||
0 commit comments