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
Treehugger Robot
0521eb758a Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 22:50:33 +00:00
Treehugger Robot
b4cd26b5cf Merge "address use of DummyIME in UI Automator" am: 54bac103d2 am: 4342d200c6 am: adb2c1f51b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: I07055a034954023290e83d2334b0040ff00b9080
 2020-07-31 22:42:54 +00:00
Treehugger Robot
a3b73fba11 Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a am: a42c8fc0c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: If4cc44baac9e5cd03022e539c2c848b0be873740
 2020-07-31 22:42:02 +00:00
Treehugger Robot
adb2c1f51b Merge "address use of DummyIME in UI Automator" am: 54bac103d2 am: 4342d200c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: I54bd0dd55ff753972b145cc626b017068fa1427f
 2020-07-31 22:30:31 +00:00
Treehugger Robot
4342d200c6 Merge "address use of DummyIME in UI Automator" am: 54bac103d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: I8f049883aefd5900e7264ea6d00a298cad245601
 2020-07-31 22:20:06 +00:00
Treehugger Robot
a42c8fc0c1 Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: Ic41fd85340530e59a02ce080bd3487e2a876a69e
 2020-07-31 22:19:09 +00:00
Treehugger Robot
54bac103d2 Merge "address use of DummyIME in UI Automator" 2020-07-31 22:04:02 +00:00
Treehugger Robot
844fc0e52a Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: Icc7d3a01640de4db05e25e4475435f8454cd6973
 2020-07-31 21:54:44 +00:00
Treehugger Robot
262d80ba06 Merge "Update language to comply with Android’s inclusive language guidance." 2020-07-31 21:34:31 +00:00
Treehugger Robot
d82657834a Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1 am: 37be2eefe9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383976

Change-Id: I8214acb88567e8818f0730d6c19437c42c351143
 2020-07-31 21:26:19 +00:00
Curtis Belmonte
5b3f78d36d Merge "Use inclusive language in framework core test APKs" am: a715792f5c am: 6b1799323e am: 13d34cbd5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378656

Change-Id: Iead939405084a422f9b8965bd65fd12ecb4a9e92
 2020-07-31 21:26:00 +00:00
Treehugger Robot
37be2eefe9 Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 am: 436fe675e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383976

Change-Id: I318defffeb05aeb6d742fe95c5ca84f46604e55e
 2020-07-31 21:14:04 +00:00
Curtis Belmonte
13d34cbd5e Merge "Use inclusive language in framework core test APKs" am: a715792f5c am: 6b1799323e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378656

Change-Id: If39f0b52f464d491dbf78ed145bdd2c357f53f67
 2020-07-31 21:13:31 +00:00
Michael Wachenschwanz
134766b33f Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

  #inclusivefixit

Bug: 162536543
Change-Id: I478e3aca39be71f6e2df339a7b9702b2a76c9d29
 2020-07-31 21:11:45 +00:00
Guang Zhu
6e634c03c6 address use of DummyIME in UI Automator 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: compile (code is not active in use)
Change-Id: Ice71490ff09969f229943d6ef952a09f4e283d14
Merged-In: Ice71490ff09969f229943d6ef952a09f4e283d14
 2020-07-31 21:10:17 +00:00
Mattias Nilsson
b5299b5a20 Move config_inflateSignalStrength to CC 
Sim based customizations should not be resources because
of two reasons:
1. The MCC/MNC value in AssetManager for Dual sim devices is undefined
2. There is no support for MVNOs.

For dual sim devices there is only one value for MCC/MNC in
AssetManager and that value is updated from multiple places without
deciding if it should be the default voice sim card, the default
data sim card or whatnot.
  This means that when frameworks is trying to decide what resource
to use there is no guarantee that the resource that arrives is for
the particular subscription we are asking for.

MVNOs cannot be separated through only MCC/MNC but need more
parameters like service provider, imsi, GID1 etc. MVNO support
is available in CarrierConfig.

When we now have support for ADCP updates of customizations and
start using carrier id this is better placed in CarrierConfig,
we then get support for MVNOs at the same time.

Bug: 148483577
Test: Customize for sim card x and not for sim card y, insert both
sim cards in a dual sim device and see the difference.

Merged-In: I067d55b9ae5e1346dd3b3cd50a0097b05b100055
Change-Id: I067d55b9ae5e1346dd3b3cd50a0097b05b100055
 2020-07-31 13:57:01 -07:00
Treehugger Robot
436fe675e1 Merge "Update language to comply with Android's inclusive language guidance" am: 1d2417fa16 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383976

Change-Id: Id9c784613cb542c7b0f2bfb9f92564eebe40e8f9
 2020-07-31 20:53:33 +00:00
Curtis Belmonte
6b1799323e Merge "Use inclusive language in framework core test APKs" am: a715792f5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378656

Change-Id: If057e5ea1a83751e7899019f60a7371f9832c147
 2020-07-31 20:47:28 +00:00
Treehugger Robot
1d2417fa16 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 20:40:50 +00:00
Curtis Belmonte
a715792f5c Merge "Use inclusive language in framework core test APKs" 2020-07-31 20:29:53 +00:00
TreeHugger Robot
019c408f29 Merge "DO NOT MERGE Filter out suppressed notifications in entry manager" into rvc-d1-dev am: 448601b793 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265823

Change-Id: I00745457bed61b7cad6b038256c2af8f9fcd72d3
 2020-07-31 20:14:33 +00:00
Evan Laird
d6d9c23f3d DO NOT MERGE Filter out suppressed notifications in entry manager am: b88b1b68ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265823

Change-Id: I3e29f8510c54524a1e4e6ef1d0934bf2f2cf86cc
 2020-07-31 20:14:27 +00:00
TreeHugger Robot
448601b793 Merge "DO NOT MERGE Filter out suppressed notifications in entry manager" into rvc-d1-dev 2020-07-31 20:02:13 +00:00
yawanng
9210981e57 Notify IORap without including packages for secondary dex opt. am: 8e41a2debb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12283944

Change-Id: I08eec3f730a71e87d5bb7febc0174eb12cbd36be
 2020-07-31 19:45:13 +00:00
Ivan Lozano
2b50c7140e Merge "Update language to comply with Android's inclusive language guidance" am: 09b57ae95f am: 678e3dabaf am: abbbf97c85 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374738

Change-Id: I3f6144199e5672843ed04b5239e4855017c22fa2
 2020-07-31 19:07:55 +00:00
Michael Wachenschwanz
a57c974945 Update language to comply with Android’s inclusive language guidance. 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I6aac06e56507bb6ce69afd9b3db92be6b03a1400
Test: n/a
 2020-07-31 18:54:02 +00:00
Evan Laird
b88b1b68ad DO NOT MERGE Filter out suppressed notifications in entry manager 
`NotificationEntryManager#hasActiveNotifications` used to be in 1:1
correspondence with the visible notifications in the shade, and as such
was suitable for code that needs to do things like calculate the height
of the shade. However if there is a bubble, it's still backed by a
notification but is suppressed from the shade.

This CL is unfortunately hacky because the API for
NotificationEntryManager doesn't have the concept of "a notification
which exists but is not in the shade" and therefore the correct fix
actually would involve creating the correct api and updating all call
sites with the correct semantics.

Test: manual
Bug: 161461739
Change-Id: I9b0fc0f48609b64371d3cb7677228b4bb1fa6aef
Merged-In: I9b0fc0f48609b64371d3cb7677228b4bb1fa6aef
 2020-07-31 18:54:01 +00:00
Alice Kuo
2658f931df Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

  #inclusivefixit

Bug: 162536543
Change-Id: Id328052e95765170520bd35f1872ce4c6457fecb
 2020-07-31 18:52:16 +00:00
Ivan Lozano
abbbf97c85 Merge "Update language to comply with Android's inclusive language guidance" am: 09b57ae95f am: 678e3dabaf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374738

Change-Id: I8af3657bda2f47898d1578711f98677c448fd247
 2020-07-31 18:49:10 +00:00
Ivan Lozano
678e3dabaf Merge "Update language to comply with Android's inclusive language guidance" am: 09b57ae95f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374738

Change-Id: I259fb2ecd5ab6936ae7fc1ff4d3c78658d7b2b59
 2020-07-31 18:31:20 +00:00
Ivan Lozano
09b57ae95f Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 18:11:10 +00:00
yawanng
8e41a2debb Notify IORap without including packages for secondary dex opt. 
The current secondary dex opt doesn't distinct between
opt performed and skipped, which causes unnecessary traces
purge for IORap.

Bug:161633001
Test: manually trigger bg-dexopt via 'adb shell cmd jobscheduler run -f
android 800' and check the log.


(cherry picked from commit ff800a363b)
Merged-In: Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0
Change-Id: Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0
 2020-07-31 17:08:33 +00:00
Patrick Baumann
929ab61a14 RESTRICT AUTOMERGE 
Do not set referrerUri on SessionInfo for non-owners

This change leaves the referrerUri field null when the caller leading to
its production is not the owner of the session.

Bug: 142125338
Test: Manual via test app in related bug
Change-Id: I84679ea0636aa2097e25e23813c48134c9cc1d75
 2020-07-31 16:55:24 +00:00
Winson Chung
57b3d2aa49 Merge "Only apply back gesture device config if there are existing insets" into rvc-d1-dev am: f7a4faa241 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272603

Change-Id: I60642aa24d0d3ac575b4d4b9dd9ac1441a32fd48
 2020-07-31 16:51:39 +00:00
Treehugger Robot
acbb11f541 Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 am: 6f22d2c310 am: 9bade16516 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382541

Change-Id: I7e66cab05528c20fe01549f98eabff544e7d64b7
 2020-07-31 16:29:07 +00:00
Winson Chung
f7a4faa241 Merge "Only apply back gesture device config if there are existing insets" into rvc-d1-dev 2020-07-31 16:28:53 +00:00
Treehugger Robot
b3252fa9c4 Merge "Use blocklist sub-property in sanitize" am: 1d87df7859 am: 7f229e6523 am: 5e143755b8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375091

Change-Id: I3e0b94c130243ca53c91e19338716b59353d3604
 2020-07-31 16:27:57 +00:00
Treehugger Robot
9bade16516 Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 am: 6f22d2c310 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382541

Change-Id: I94da777e46e45795d01708f3ba52ce81f61aec87
 2020-07-31 16:10:11 +00:00
Treehugger Robot
5e143755b8 Merge "Use blocklist sub-property in sanitize" am: 1d87df7859 am: 7f229e6523 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375091

Change-Id: Icf51b0f7f9b40c90ca29708bf71287e2b398f4cf
 2020-07-31 16:09:49 +00:00
Treehugger Robot
6f22d2c310 Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382541

Change-Id: I44f9202099941a7c5cd80cae325a3d000d33f4fe
 2020-07-31 15:50:43 +00:00
Treehugger Robot
804e59de87 Merge "Update language to comply with Android's inclusive language guidance" am: 4cb1ece9d1 am: 0fa2ec2c23 am: 58c0f8dbbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382538

Change-Id: Ie3bb8e082ff9818db8d9c35877449f512400a568
 2020-07-31 15:50:39 +00:00
Treehugger Robot
7f229e6523 Merge "Use blocklist sub-property in sanitize" am: 1d87df7859 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375091

Change-Id: I70207c753089ebdeba82b9041e9aab7cb6501b52
 2020-07-31 15:50:13 +00:00
Treehugger Robot
8ecdbfaafa Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a am: d89a8edb77 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: I3cdf20331f857d08184a66ff9ff1e1c3a84cdce6
 2020-07-31 15:50:10 +00:00
Treehugger Robot
e2d9b14b60 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 15:43:51 +00:00
Treehugger Robot
1d87df7859 Merge "Use blocklist sub-property in sanitize" 2020-07-31 15:37:10 +00:00
Treehugger Robot
58c0f8dbbe Merge "Update language to comply with Android's inclusive language guidance" am: 4cb1ece9d1 am: 0fa2ec2c23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382538

Change-Id: I9a6266db3231e52a23a26a753f002068daa9d072
 2020-07-31 15:33:09 +00:00
Treehugger Robot
d89a8edb77 Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe am: 22298bfb7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: I29dbd2c00e3e4f22e14024ed61e4eb931063d48a
 2020-07-31 15:32:40 +00:00
Alex Light
9d7ff99a07 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
 2020-07-31 08:18:33 -07:00
Treehugger Robot
0fa2ec2c23 Merge "Update language to comply with Android's inclusive language guidance" am: 4cb1ece9d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382538

Change-Id: I1198ac5c6d212f19661c96cda7f14c9cd03fad6f
 2020-07-31 15:16:40 +00:00
Treehugger Robot
22298bfb7a Merge "Update language to comply with Android's inclusive language guidance" am: 4aab6d6cfe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382387

Change-Id: Ifdb813f3714eb284d1c37c6e0ce383801b9418a3
 2020-07-31 15:16:23 +00:00