Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
493,908 Commits 3 Branches 0 Tags
9b0cd12ce4cf04884c0dab78d1f9ceba64beaded
Commit Graph

493908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chun-Wei Wang
9b0cd12ce4 Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397950

Change-Id: Icb2ab0cfc29c8822d5e7f833622fa17357b1bbe9
 2020-08-12 12:30:01 +00:00
Treehugger Robot
82424fe412 Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd am: 50d99fe7c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398112

Change-Id: I5f04dc2f3a2d94c1059aafddda0c2fd1209f675d
 2020-08-12 12:29:43 +00:00
Chun-Wei Wang
51ded68601 Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397950

Change-Id: I87ef70146b5032409b8d6f87932641fa620add01
 2020-08-12 12:24:43 +00:00
Chun-Wei Wang
a5d1ef9837 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 12:18:41 +00:00
Treehugger Robot
50d99fe7c0 Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398112

Change-Id: I474986ba62b8b0c4ddad8491718aab690a7b2595
 2020-08-12 12:16:21 +00:00
Treehugger Robot
dd1415bbcd Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 11:59:45 +00:00
Chiachang Wang
139402e852 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d
 2020-08-12 10:10:11 +00:00
Chiachang Wang
0e7aefd000 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b
 2020-08-12 09:52:30 +00:00
Lais Andrade
1077de0092 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: Icee71d95970b20776b34bc9873a665662da2ae03
 2020-08-12 09:49:03 +00:00
Chiachang Wang
2dd299c5db Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 09:30:11 +00:00
JW Wang
b1e1a42305 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for
reference.

Bug: 162536543
Test: m
Change-Id: I30ca0bf2f77015637a0f36a7083f4044cd29d3b1
 2020-08-12 16:47:53 +08:00
Paul Hu
30c2dc100e Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 06697e0c43 am: f23a7a2d14 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I0878281e2033f093f3b9cbf608c30c44bdd99278
 2020-08-12 06:53:13 +00:00
Paul Hu
f23a7a2d14 Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 06697e0c43 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I91a603d8b37ee750c3f582363bec94977d70014e
 2020-08-12 06:37:34 +00:00
Paul Hu
06697e0c43 Merge "[RFPM05] Add UidNetdPermissionInfo class" 2020-08-12 06:17:46 +00:00
Chiachang Wang
97698a6fc5 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: m ; atest FrameworkNetTests
Change-Id: Ib6b4c9526992c31e05e82be80e2b9b86bc0b57ef
 2020-08-12 12:23:59 +08:00
paulhu
26263b3cd0 [RFPM05] Add UidNetdPermissionInfo class 
Add UidNetdPermissionInfo class to store netd permission info of
each uid. Use the bit mask for combining all netd permission into
one value which can update and get the uid permission easily.
Moreover, aosp/1340042 add carryover package info into this class
which centralizes all netd permissions relevant data.

Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I3b81ea2a5017e8f4d0d603144a33c9b08640d7ba
 2020-08-12 10:33:18 +08:00
Bradley Allen
69863b517d docs: Adjusted language to avoid gender-specific terminology. am: ad19ed2577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347127

Change-Id: I1446431a60f5d8c9ab70685d2d96f92c04c9f7c7
 2020-08-11 18:14:06 +00:00
Bradley Allen
ad19ed2577 docs: Adjusted language to avoid gender-specific terminology. 
Test: none (docs-only change)
Bug: 151156981
Change-Id: I8f06796b2828695f62bf32c033e5406bc3d858ad
 2020-08-11 15:29:44 +00:00
Anton Hansson
9b0a74f0a3 Revert "Add bp-based disting of android stubs" 
This reverts commit d116c60383.

Bug: 162595755
Test: unzip -l out/dist/android_system.jar | grep resources.arsc
Change-Id: I1445bc742ea2f895291ffd80bdc0cf86e1b8878a
 2020-08-11 13:06:17 +01:00
Treehugger Robot
31af0da082 Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497

Change-Id: Ibea8b326aba347acfd948310378580940c3f0cd7
 2020-08-11 08:37:55 +00:00
Treehugger Robot
99ed998f0e Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497

Change-Id: If5f29aac921bf42cbb219715e5e35808b8e47d33
 2020-08-11 08:26:11 +00:00
Treehugger Robot
bad5c4ec49 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-11 08:10:58 +00:00
Sooraj Sasindran
3ae0c9d34c [automerger skipped] Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd95 am: 1e14220da2 -s ours 
am skip reason: Change-Id I494cb93a2c72ff3df2ef45ad737c5606132e32d1 with SHA-1 7dcda7d616 is in history

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

Change-Id: I333acf7966e3aca17cb3b0de1f76141e0d71a949
 2020-08-11 00:36:13 +00:00
Mattias Nilsson
a278421b01 [automerger skipped] Move config_inflateSignalStrength to CC am: f8c6f34832 am: b6bd23c222 -s ours 
am skip reason: Change-Id I067d55b9ae5e1346dd3b3cd50a0097b05b100055 with SHA-1 789432b5d1 is in history

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

Change-Id: Ifd23e098b9d98eadc92cd0f001e367567ca2986a
 2020-08-11 00:35:59 +00:00
Sooraj Sasindran
1e14220da2 Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1219720

Change-Id: Ia3b10d7b602819e150cd4c0d7736ad8da446519b
 2020-08-11 00:21:29 +00:00
Mattias Nilsson
b6bd23c222 Move config_inflateSignalStrength to CC am: f8c6f34832 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1219719

Change-Id: I69456375e59c21d3ba56a6af8f934050fab8b615
 2020-08-11 00:21:25 +00:00
Treehugger Robot
bbf6c3bd7d [automerger skipped] Merge "Update Dagger2 dependencies." am: b34c1fe4ba am: e73de8ccda -s ours 
am skip reason: Change-Id Ic3b43bb8247c6a7ebe4257651bcb5de51699c60a with SHA-1 fa22f61036 is in history

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

Change-Id: I433628f7fc2c0a185f442fc86ef50ffd105ee0d0
 2020-08-11 00:10:33 +00:00
Sooraj Sasindran
922e9bfd95 Merge changes from topic "move-inflate-ss-to-cc" 
* changes:
  Remove config_inflateSignalStrength
  Move config_inflateSignalStrength to CC
 2020-08-11 00:03:09 +00:00
Treehugger Robot
e73de8ccda Merge "Update Dagger2 dependencies." am: b34c1fe4ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365961

Change-Id: I426fd822922c63705405204b90982f3a7a3018cf
 2020-08-10 23:54:24 +00:00
Treehugger Robot
b34c1fe4ba Merge "Update Dagger2 dependencies." 2020-08-10 23:41:18 +00:00
TreeHugger Robot
8835581cc9 Merge changes from topic "inflate-signal" into rvc-dev-plus-aosp 
* changes:
  Remove config_inflateSignalStrength
  Move config_inflateSignalStrength to CC
 2020-08-10 23:05:17 +00:00
Treehugger Robot
2b97b69661 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Ibd396e7b4d12e1765f71413d730d51997c5b4306
 2020-08-10 20:47:00 +00:00
Treehugger Robot
1e16995094 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Idc916d652044a00d7494e17dab2a689de5b7aa61
 2020-08-10 20:36:11 +00:00
Treehugger Robot
e3b0b6d007 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" 2020-08-10 20:22:05 +00:00
Mattias Nilsson
7dcda7d616 Remove config_inflateSignalStrength 
This resource has moved to CarrierConfig to support dual
sim devices and MVNOs.

Bug: 148483577
Test: Manual
Merged-In: I494cb93a2c72ff3df2ef45ad737c5606132e32d1
Change-Id: I494cb93a2c72ff3df2ef45ad737c5606132e32d1
 2020-08-10 11:01:22 -07:00
Mattias Nilsson
789432b5d1 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-08-10 11:01:13 -07:00
Jooyung Han
ce3fd2b509 Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp 2020-08-10 16:31:18 +00:00
Hasini Gunasinghe
67a96b1a03 [automerger skipped] Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d am: 7896d08fec -s ours 
am skip reason: Change-Id I66fbc2b8ed98a34f243387f8550b6523b13cb9a2 with SHA-1 7c336a66d9 is in history

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

Change-Id: I11640f1b6ce9e5cb7722152b73e039aa561e45e3
 2020-08-10 15:40:57 +00:00
Hasini Gunasinghe
7896d08fec Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316774

Change-Id: I50b97bdd1ef26fbc43d3a45801846243211acb51
 2020-08-10 15:23:53 +00:00
Hasini Gunasinghe
d64ab1853d Merge "Add KeystoreKeyEventReported atom for keystore logging." 2020-08-10 15:09:49 +00:00
Jooyung Han
16bac8513e Switch aidl::nullable to std::optional 
AIDL's @nullable is represented as std::optional in C++ backend.
The previous aidl::nullable was a temporary solution to avoid
merge-conflicts between rvc-dev and master branches.

Bug: 151275535
Test: m
Change-Id: I8fe5bfc1763087e7ff364b4408f862436492d1db
 2020-08-10 08:36:35 +00:00
Paul Hu
8d2626f55a Merge "Verify pending intent flags" am: f623c1e2c2 am: d583f34df1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: Id37713388c0c2245e708ca1ca81e78d288168dfd
 2020-08-10 02:04:40 +00:00
Paul Hu
d583f34df1 Merge "Verify pending intent flags" am: f623c1e2c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: I6764ac9bface86d26f395c6a4fd8b63f7a08df6e
 2020-08-10 01:46:50 +00:00
Paul Hu
f623c1e2c2 Merge "Verify pending intent flags" 2020-08-10 01:32:12 +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
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
bee43f5b19 Add alecmouri@ to libhwui OWNERS 
Also alphabetize

Change-Id: Iadf6de2c2cec1ab50ef91c9b548b1087506dae9c
 2020-08-07 19:38:47 +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