Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
530,366 Commits 3 Branches 0 Tags
04dede7600a0da25fa29fedd9a9ae493bfc0bf0c
Commit Graph

530366 Commits

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

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

Change-Id: Ifa4d4ea39b041367a0f40e4033bdaab86113d530
 2020-08-09 14:30:28 +00:00
TreeHugger Robot
2a315b21f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 2c2b126b52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4c40af3cf1562ae1ac3439b62f439540feabf8e
 2020-08-09 14:29:24 +00:00
TreeHugger Robot
a4af2130f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-09 14:16:52 +00:00
TreeHugger Robot
2c2b126b52 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-09 14:16:26 +00:00
Bill Yi
5eefe71bc7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I231323075ed55d149dbbcb8d02d8ed7cb3380aea
 2020-08-09 05:19:17 -07:00
Bill Yi
23fee1d03e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib355ffc91b507ce25507bb5a75a12c17155ac1d5
 2020-08-09 06:17:45 +00:00
TreeHugger Robot
e9baa64de3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 82993ac937 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fbeb86c8b5809a23ab4bb55c4cc17bc1445bdcc
 2020-08-08 20:16:18 +00:00
TreeHugger Robot
82993ac937 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-08 20:01:35 +00:00
TreeHugger Robot
b4fd733790 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: aacdd33718 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia37dc178c07d8522bf920c57ad860b6acb47ff89
 2020-08-08 19:48:25 +00:00
Bill Yi
46e400d093 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467ede0175 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ff349511202b66eed99158055d292e86a6cffb7
 2020-08-08 19:48:12 +00:00
TreeHugger Robot
aacdd33718 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-08 19:43:28 +00:00
Bill Yi
467ede0175 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cdb4ae0d333cbf58312e160b19d5c65128adb15
 2020-08-08 08:54:01 -07:00
Bill Yi
6a9d87fa2f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia867d8eca71ec0437072b2e2353348a726d7e9a9
 2020-08-08 10:37:10 +00:00
Bill Yi
5f902db801 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b8a3c9db6d78347404870b64cdd622f9ec94109
 2020-08-07 23:42:33 -07:00
Alec Mouri
482802a76a Support dispatchNullEvent virtual method am: 1315f1105e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12326214

Change-Id: Iffa6b5ea3a62a49ab98207c544ba921f394d795d
 2020-08-07 23:07:34 +00:00
Treehugger Robot
2ce7f8b1dd Merge "Add alecmouri@ to libhwui OWNERS" am: 38edcd001a am: ea49092992 am: 2a98e05f9a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392715

Change-Id: I48c904ddff3768eb05ef4d789e441945e9f7e78f
 2020-08-07 22:01:09 +00:00
Treehugger Robot
2a98e05f9a Merge "Add alecmouri@ to libhwui OWNERS" am: 38edcd001a am: ea49092992 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392715

Change-Id: Ie00877e1205be422b467854bea36cc104ea777d9
 2020-08-07 21:43:19 +00:00
Sooraj Sasindran
9da3d65fb3 Merge changes from topic "inflate-signal" into rvc-d1-dev-plus-aosp 
* changes:
  Remove config_inflateSignalStrength
  Move config_inflateSignalStrength to CC
 2020-08-07 21:39:31 +00:00
Treehugger Robot
ea49092992 Merge "Add alecmouri@ to libhwui OWNERS" am: 38edcd001a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392715

Change-Id: I25a51fcc04fce6257c3df7d3685ba1cc69774b68
 2020-08-07 21:22:15 +00:00
Treehugger Robot
38edcd001a Merge "Add alecmouri@ to libhwui OWNERS" 2020-08-07 21:10:16 +00:00
Alec Mouri
1315f1105e Support dispatchNullEvent virtual method 
Added for AChoreographer in I66abc2e28e60f06987ce3a54be294c94b77524fc

Bug: 154874011
Bug: 158680912
Bug: 161406626
Test: builds
Change-Id: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
Merged-In: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
 2020-08-07 21:01:38 +00:00
Alec Mouri
bee43f5b19 Add alecmouri@ to libhwui OWNERS 
Also alphabetize

Change-Id: Iadf6de2c2cec1ab50ef91c9b548b1087506dae9c
 2020-08-07 19:38:47 +00:00
Andrei Onea
5074e60452 Drop deprecated API lists from csv merge script 
Only support the new API list names.

Bug: 162500436
Test: build and check hiddenapi-flags.csv
Change-Id: I5e3c2f8d14524d59dd65d26ce5196efcc15d6d8e
 2020-08-07 19:06:41 +01:00
Treehugger Robot
c7b8432e5a Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 am: 2db2e500ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I21b9567bf11eda9a678f4b6e2549d8297f395bd9
 2020-08-07 17:33:04 +00:00
Treehugger Robot
875cba236d Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea am: 8a027191d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496

Change-Id: I92d8e2748b7ce3954646236dcacb318185c7385a
 2020-08-07 17:32:46 +00:00
Treehugger Robot
13d7aeb155 Merge "Refactor of PointerController" am: 3ca2400a53 am: adaedfa3fa am: 15bbc06795 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364598

Change-Id: I67566cbe5e398c2da24dad800efe3d3136fe4cd3
 2020-08-07 17:32:14 +00:00
Treehugger Robot
2db2e500ee Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I31d939fbb443e76fc912dfe663d0b5a060ecba22
 2020-08-07 17:31:17 +00:00
Treehugger Robot
ab5d157062 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I32bb103ca0abdfde5688bc1208294dd1073be8d0
 2020-08-07 17:17:55 +00:00
Treehugger Robot
8a027191d2 Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496

Change-Id: I46453773f083eaa4e3a8988ee1a496d79f756dc7
 2020-08-07 17:10:27 +00:00
Treehugger Robot
15bbc06795 Merge "Refactor of PointerController" am: 3ca2400a53 am: adaedfa3fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364598

Change-Id: I46f3a14b56c18ae2977791e81ea5d768f5e163f3
 2020-08-07 17:09:31 +00:00
Treehugger Robot
4ec7604b48 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" 2020-08-07 16:54:11 +00:00
Treehugger Robot
22ac3a45ea Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496

Change-Id: I51d38bc7e187c40b512cf3542ac802cb309a9530
 2020-08-07 16:43:22 +00:00
Treehugger Robot
adaedfa3fa Merge "Refactor of PointerController" am: 3ca2400a53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364598

Change-Id: I7345f718b827c049072459abebd5b13ddecdd138
 2020-08-07 16:42:40 +00:00
Treehugger Robot
8f0008900d Merge "Fixed how com.android.server.pm.Settings handle pre-created users." 2020-08-07 16:23:36 +00:00
Treehugger Robot
3ca2400a53 Merge "Refactor of PointerController" 2020-08-07 16:20:14 +00:00
Florian Mayer
7f12a30e74 Do not leak dump objects. 
Bug: 163024455

Change-Id: Ia0710c3462f03a85bc22aaac7b190961da1f8be3
Merged-in: I9c1737647d762f478c0e452e5b72f98ec3d43c28
 2020-08-07 16:15:40 +00:00
Florian Mayer
29154b178d Do not leak dump objects. 
Bug: 163024455

Change-Id: Ia0710c3462f03a85bc22aaac7b190961da1f8be3
Merged-in: I9c1737647d762f478c0e452e5b72f98ec3d43c28
 2020-08-07 16:15:20 +00:00
Julia Reynolds
046114dc68 Make non-blockable notification more robust 
By keeping track of them in preferenceshelper, so
they can be applied to apps/channel settings created on the
first boot post a factory reset

Test: atest
Bug: 140893722
Change-Id: Ied7d66bd4ca59f831fc77eff3ef6030a1ad8d6f7
(cherry picked from commit 204b391fc2)
 2020-08-07 13:15:32 +00:00
Yanting Yang
3b0453b440 Merge "Skip loading tiles from non-current user if primary profile only" into rvc-d1-dev am: 550d625622 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316857

Change-Id: Ia357cca1e7d7af18daca43da420e3acfbe8c5198
 2020-08-07 12:18:33 +00:00
Yanting Yang
550d625622 Merge "Skip loading tiles from non-current user if primary profile only" into rvc-d1-dev 2020-08-07 12:08:11 +00:00
Santiago Seifert
70070892cc Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca am: e7b045a9fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I2f44e2378aadc8dd703651568c856fc5bec91124
 2020-08-07 10:26:57 +00:00
Santiago Seifert
c6b868b1f5 Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca am: a1299a938d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I1347bb08a7594dddddcb07089f01de8aee0e7abe
 2020-08-07 10:26:44 +00:00
Santiago Seifert
a1299a938d Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I14f83d532922ffcd343d1efd48b28513b5672154
 2020-08-07 10:18:15 +00:00
Santiago Seifert
e7b045a9fd Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I59a2a2cec54d286299be1048db602e6c9c4071b0
 2020-08-07 10:18:06 +00:00
Santiago Seifert
a52141c6ca Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev 2020-08-07 10:02:28 +00:00
Santos Cordon
69603f319e Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev am: fdc35a2491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282513

Change-Id: I4913d33ac3e20e97ebdc524189e40f772f4dbbe3
 2020-08-07 09:46:31 +00:00
Yanting Yang
4393c7a562 Skip loading tiles from non-current user if primary profile only 
Symptom:
Disabling an injected activity or provider can't remove the tile
entirely. The tile is still shown if the device has a work profile.

Root cause:
Settings loads tiles from all injected components of all users via
PackageManager. When an injected app disables its component of current
user to remove tiles, the component for the work profile user is still
enabled. Therefore the tiles are still loaded.

Solution:
Skip loading tiles from non-current user if the injected component is
tagged "primary_profile_only".

Bug: 161885575
Test: make RunSettingsLibRoboTests
Change-Id: I00338204ddccfcbcf84a3eed34e6b8f8d5829d56
 2020-08-07 17:40:16 +08:00
Santos Cordon
fdc35a2491 Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev 2020-08-07 09:33:05 +00:00
Chalard Jean
8b9473a80b [automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1ef am: cbcb46cb87 -s ours am: 26187e2fba -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history

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

Change-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b
 2020-08-07 07:26:54 +00:00
Chalard Jean
c64e1a0e2c [automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: be00709344 am: 62a694f865 -s ours am: b4cf848fe7 -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history

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

Change-Id: I853068e1d6301fc99466f255e9084a130d122971
 2020-08-07 07:26:47 +00:00