Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
517,276 Commits 3 Branches 0 Tags
dda4f26a2d57e30ca8645d45a2da36f28ca36bc5
Commit Graph

517276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
dda4f26a2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 68755307c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I662e1b81fd31372a6ec3ab94fb0a929812cd61a0
 2020-08-21 22:31:37 +00:00
TreeHugger Robot
429ae48fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d379a76ad4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I630d0462a732616587f9727e036f031bd08b9df5
 2020-08-21 22:31:01 +00:00
TreeHugger Robot
68755307c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-21 22:12:30 +00:00
TreeHugger Robot
d379a76ad4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-21 22:10:43 +00:00
Automerger Merge Worker
5f53a927a6 Merge "docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 am: d3093ce956" into rvc-d1-dev-plus-aosp 2020-08-21 21:04:13 +00:00
Kevin Hufnagle
7ee3403f3c docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 am: d3093ce956 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12418304

Change-Id: I9951af59ee7e7e7d44c17175376e95621342d695
 2020-08-21 21:04:02 +00:00
Kevin Hufnagle
75e21ea878 docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 am: 53f6fe0a82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12418304

Change-Id: I88a67e4f78f0f9081499c7e50e3c73a31d55ddf2
 2020-08-21 21:03:46 +00:00
Kevin Hufnagle
d3093ce956 docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12418304

Change-Id: I0a9b0550c4f129e9f8839f149b704b956cee4451
 2020-08-21 20:48:15 +00:00
Kevin Hufnagle
53f6fe0a82 docs: Fix note about new intent action changes coming with Android 11. am: e69b8a9006 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12418304

Change-Id: I90566db73bb86ec900ae8246dd8f504ad3adb104
 2020-08-21 20:48:04 +00:00
Riddle Hsu
f464e29367 Remove home snapshot immediately am: 106f745c3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12421225

Change-Id: I8f9cac7e7afc6deb26f2afb55b145b8df015f46f
 2020-08-21 14:47:45 +00:00
Bill Yi
d93dade833 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e4b0eaf336bdbd8184bc0afb9ad85080fd74c90
 2020-08-21 07:25:54 -07:00
Bill Yi
9c193197f2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d9f76d3ce0b0c2d831e6529e8c439d68fe41a08
 2020-08-21 05:34:58 -07:00
Riddle Hsu
106f745c3a Remove home snapshot immediately 
If the size of snapshot is mismatched, the removal of the starting
window will be deferred. But if the snapshot target is home, since
it is only presented for unlocking, it is better to dismiss it as
soon as possible to avoid outdated content from being shown on screen
if the windows of home have drawn.

Bug: 161530286
Test: Keep home on top and turn off screen with secured lock. Use
      fingerprint to unlock. If home is drawn fast enough, the
      previous state won't show on screen (e.g. the time on clock).
Change-Id: I103f49eb539f78455ad38f48f9cd853dee51b135
(cherry picked from commit a17c813b40)
 2020-08-21 07:44:40 +00:00
Kevin Hufnagle
e69b8a9006 docs: Fix note about new intent action changes coming with Android 11. 
Bug: 155091482
Change-Id: I3dfeb333cbe95880142ed97d0d50fd9f85c52f50
Test: Documentation changes - no test necessary
 2020-08-20 18:48:17 +00:00
Treehugger Robot
fdeef2b1ed Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc am: 28a65b8942 am: 92876acc20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403549

Change-Id: I99915dd0ff99245aad2c31e2d0c0a7daa79f0b92
 2020-08-20 13:02:46 +00:00
Treehugger Robot
92876acc20 Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc am: 28a65b8942 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403549

Change-Id: I7c40c508a60dd793d0ffc3cd01ab0cc17345e759
 2020-08-20 12:34:19 +00:00
Treehugger Robot
28a65b8942 Merge "Update language to comply with Android's inclusive language guidance" am: 4983d13ccc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403549

Change-Id: Ifea6fad00c226eeeffa5455d8a38d086469eba86
 2020-08-20 12:25:21 +00:00
Treehugger Robot
4983d13ccc Merge "Update language to comply with Android's inclusive language guidance" 2020-08-20 12:14:31 +00:00
Tiger Huang
606a45341b Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406774

Change-Id: I9b1e07559a3194b22d07d7b107d780abc4f1bcc9
 2020-08-20 11:05:46 +00:00
Tiger Huang
6383ac86ca Merge "Refine system bar position restoring" into rvc-d1-dev 2020-08-20 10:56:44 +00:00
lpeter
2736db57ff Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Build pass and boot
Change-Id: I0a46d4366948addad629142157c361c7133179af
 2020-08-20 18:00:49 +08:00
Yo Chiang
07f7f83826 Merge "Post a notification if reboot to DSU failed" am: 5432af8406 am: dcdec0017e am: 3a3ec27223 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: I580a7c859f1e343c1704916eab90d9b328ec2bf1
 2020-08-20 09:06:33 +00:00
Paul Hu
1c66746130 Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 am: 6c6c7cdb81 am: 45f2280d3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: Ie7ac76d52a1bc8e58fc660a86a5f30ab7f2a25b4
 2020-08-20 09:06:22 +00:00
Paul Hu
4f3df4b152 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 am: 4143779e4b am: bcc1edb897 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I159f2052d27ad2c923c4463f161fbb3358eb1bb2
 2020-08-20 09:05:53 +00:00
Yo Chiang
3a3ec27223 Merge "Post a notification if reboot to DSU failed" am: 5432af8406 am: dcdec0017e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: I803697de02e4d676f8cd986de8ca7c29bd20a90e
 2020-08-20 08:52:25 +00:00
Paul Hu
45f2280d3a Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 am: 6c6c7cdb81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I393e91873923d7b6601d4e8c863cca6986f66f23
 2020-08-20 08:52:04 +00:00
Paul Hu
bcc1edb897 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 am: 4143779e4b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: Ifa19cb8fce8dca66ac5f4ecc7737c1c095b7b35b
 2020-08-20 08:51:45 +00:00
Yo Chiang
dcdec0017e Merge "Post a notification if reboot to DSU failed" am: 5432af8406 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404648

Change-Id: I1b119555630a65a1dec26a14a4cdcda6d9de8151
 2020-08-20 08:34:15 +00:00
Paul Hu
6c6c7cdb81 Merge "Revert "[RFPM03] Check permission by uid."" am: 50bb631f03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I51b37f8e717123a2725ade859d5b9dcff19ef484
 2020-08-20 08:33:41 +00:00
Yo Chiang
5432af8406 Merge "Post a notification if reboot to DSU failed" 2020-08-20 08:30:20 +00:00
Paul Hu
4143779e4b Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: aad5331ee2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c
 2020-08-20 08:27:16 +00:00
Paul Hu
50bb631f03 Merge "Revert "[RFPM03] Check permission by uid."" 2020-08-20 08:24:30 +00:00
Paul Hu
aad5331ee2 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" 2020-08-20 08:14:48 +00:00
Jason Hsu
0710b9589d [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: fc81e4d388 -s ours 
am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history

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

Change-Id: I5ebdc744322c6396d4e55c8806249bfdb821d9d5
 2020-08-20 07:46:56 +00:00
TreeHugger Robot
21e0928368 Merge "Add systrace tag for system property" into rvc-dev-plus-aosp am: baaf7f8540 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406766

Change-Id: I51d7b18e3dd4c2ab5f8686189feaf4b30fab7b2f
 2020-08-20 07:46:27 +00:00
Paul Hu
1f8fc11362 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 am: 62160754cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I148fd645e30d866073a883550628f4013569af3c
 2020-08-20 07:45:15 +00:00
Jason Hsu
fc81e4d388 Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp 2020-08-20 07:21:21 +00:00
TreeHugger Robot
baaf7f8540 Merge "Add systrace tag for system property" into rvc-dev-plus-aosp 2020-08-20 07:17:54 +00:00
Paul Hu
62160754cf Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 am: 654c328426 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I9edf5bfaa9cbc037e87f5781ba07a2c87932f3aa
 2020-08-20 07:04:43 +00:00
Paul Hu
654c328426 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: f8115452a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I8cef4a21aa8fd1923334c2a99e4ff2e864f516a5
 2020-08-20 06:44:04 +00:00
Paul Hu
f8115452a7 Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" 2020-08-20 06:25:06 +00:00
Paul Hu
7e947abcb5 Revert "[RFPM03] Check permission by uid." 
This reverts commit ab4ad20eef.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7
 2020-08-20 06:23:16 +00:00
Paul Hu
2878288b3a Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method" 
This reverts commit 29100e8892.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed
 2020-08-20 06:23:00 +00:00
TreeHugger Robot
94fd0add47 Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev am: f942b399f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: I33bf59bdfa900bf119106106eb70f64df7a8796d
 2020-08-20 06:10:52 +00:00
Jeff Chang
504f2d42dd [RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 31fc73a707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12400345

Change-Id: I1cc21d2c55d87ef09c8edd607ea5640720a6c948
 2020-08-20 06:10:38 +00:00
TreeHugger Robot
f942b399f2 Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-d1-dev 2020-08-20 05:58:37 +00:00
Treehugger Robot
8a72818f65 [automerger skipped] Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 am: e30e470fab -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 d75a22bc20 is in history

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

Change-Id: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a
 2020-08-20 04:43:44 +00:00
junyulai
d2eebb8ef2 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d am: 6124af6736 -s ours am: 3256c9ce52 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 317ba5bf3b is in history

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

Change-Id: I653f77d2f7d5b0b69602ab362888c43c1a2aceb3
 2020-08-20 04:43:33 +00:00
Treehugger Robot
e30e470fab Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
 2020-08-20 04:06:51 +00:00
junyulai
3256c9ce52 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 5cbd1a756d am: 6124af6736 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 317ba5bf3b is in history

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

Change-Id: I36cacaf70c7a067fc93d01d0f2c89a90cc2694ae
 2020-08-20 04:06:47 +00:00