Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
519,022 Commits 3 Branches 0 Tags
c19fd3c4cba0f02a1ef8a897a4aa6e00a6e3df93
Commit Graph

519022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Nguyen
f7ba6a3c5f Merge "Disable Java coverage for multidex tests." am: 11ce7bf502 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406250

Change-Id: I8be76e096544e70cc967c7f62e507b8cea6391af
 2020-08-21 22:25:28 +00:00
TreeHugger Robot
fc30db1bd8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-21 22:24:09 +00:00
TreeHugger Robot
68755307c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-21 22:12:30 +00:00
Oliver Nguyen
11ce7bf502 Merge "Disable Java coverage for multidex tests." 2020-08-21 22:11:06 +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
Siyamed Sinir
153ae28af7 Merge "Remove clarabayarri from text OWNERS" am: 3fe6523d2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406974

Change-Id: I7bb9481aa09decec9b137f5a7df20b8d17a379a8
 2020-08-21 19:34:58 +00:00
Siyamed Sinir
3fe6523d2f Merge "Remove clarabayarri from text OWNERS" 2020-08-21 19:08:49 +00:00
Louis Pullen-Freilich
8a42ceda65 Merge "Adds lpf@ to preference owners" am: 0c66523a48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406973

Change-Id: I4944d3cbe07cd39baa0fd2ba6fdcb8af43c96d8d
 2020-08-21 17:31:10 +00:00
Louis Pullen-Freilich
0c66523a48 Merge "Adds lpf@ to preference owners" 2020-08-21 17:08:07 +00:00
Clara Bayarri
0ac2e4ac31 Remove clarabayarri from text OWNERS 
Change-Id: Ic67b5937d150096fddfe839d3406b29ba4bcb3a7
 2020-08-21 17:07:57 +00:00
Louis Pullen-Freilich
76ec215c01 Adds lpf@ to preference owners 
Change-Id: I11c74417090ce3b4da8c26512425df624a3932b9
 2020-08-21 17:05:34 +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
Treehugger Robot
e8586725cd Merge "Add systrace tag for system property" am: bd04e45980 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1403551

Change-Id: I9fb99cc5419d43050581a6eed7f56ef15d730b72
 2020-08-21 10:06:13 +00:00
Treehugger Robot
bd04e45980 Merge "Add systrace tag for system property" 2020-08-21 09:33:53 +00: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
Bill Yi
4cac9f064d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3914d55af5616bbae3c8441da1c0e53f3b0583a1
 2020-08-20 22:15:43 -07:00
Oliver Nguyen
69bbb330e1 Disable Java coverage for multidex tests. 
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
platform_tests
Bug: 165312932

Change-Id: I56574b43aaacd890738d33011ea1c870926e464d
 2020-08-20 17:15:02 -07: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
Jason Hsu
711a4b4b2d Merge "Update language to comply with Android's inclusive language guidance" am: 267cc11642 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398278

Change-Id: I7669e251f127147b765c61a9cba760083c7d43d3
 2020-08-20 17:57:41 +00:00
Jason Hsu
267cc11642 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-20 17:41:44 +00:00
Treehugger Robot
844ceb6d89 Merge "Adding TEST_MAPPING to frameworks/base/keystore" am: 5dd8206c04 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1405551

Change-Id: Ic024e549c8676ad772b707e737ed52c00bf75c88
 2020-08-20 16:39:32 +00:00
Treehugger Robot
5dd8206c04 Merge "Adding TEST_MAPPING to frameworks/base/keystore" 2020-08-20 16:25:37 +00:00
Treehugger Robot
5267d92272 Merge "Switch to callback animation" am: 51060f3f7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399752

Change-Id: I48d71f9f156430fc62016e2cdc8fcd2498a3363b
 2020-08-20 16:23:10 +00:00
Treehugger Robot
51060f3f7a Merge "Switch to callback animation" 2020-08-20 16:05:28 +00:00
Treehugger Robot
525ed1c275 Merge "profman: inclusive language updates" am: cde7692843 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392981

Change-Id: Ib5adcc8d80feefc361f681d9fea50ea3baccfee7
 2020-08-20 13:49:32 +00:00
Treehugger Robot
cde7692843 Merge "profman: inclusive language updates" 2020-08-20 13:25:01 +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