Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,961 Commits 3 Branches 0 Tags
ef59d8ff005184f99e3d3849e608573756ae25cb
Commit Graph

516961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Hansson
ef59d8ff00 Revert "Add bp-based disting of android stubs" am: 9b0a74f0a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12346268

Change-Id: I00bcb2a295570e7d99747e104fa866d5c50f2c2a
 2020-08-11 14:22:10 +00:00
Riddle Hsu
2f5ebc895b Resume next activity if pausing app died am: 9c62ef63fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343635

Change-Id: Iaacc56f1227007e11bed6c9cfe1662ac5c517110
 2020-08-11 14:04:15 +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
a23c657c17 Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497

Change-Id: I8f14f27529dc42e4bf8515ce317024f468622b54
 2020-08-11 08:57:42 +00: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
Riddle Hsu
9c62ef63fd Resume next activity if pausing app died 
If the top activity is crashed before showing any window, when its
process reported dead, it will be regarded as no visible activity
and no need to resume next activity. That may lead to the next top
activity remains in paused state and may be unresponsive.

Bug: 159951007
Test: atest ActivityTaskManagerServiceTests# \
      testResumeNextActivityOnCrashedAppDied
Change-Id: I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b
Merged-In: I635fceb9cf7b782f6ffbb9ebef7cb69053f64a0b
(cherry picked from commit f2e7da7a64)
 2020-08-11 05:35:51 +00:00
Junyu Lai
4dd39b4cb6 [automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours 
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 a67198dbfd is in history

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

Change-Id: Ie4999416cdf9e3a05f3193e3402eae3129481703
 2020-08-11 05:14:45 +00:00
Junyu Lai
c9f7253224 Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev 2020-08-11 05:04:34 +00:00
Lorenzo Colitti
e5a64d49da Fix fd leak in KeepaliveTracker. 
The semantics of FileDescriptor in AIDL are that the callee must close
the file descriptor it receives manually.

Fix: 157789860
Bug: 155136951
Test: treehugger
Change-Id: Ice9fc9abe2959a84ad138a95c900dff676653665
Merged-In: Ice9fc9abe2959a84ad138a95c900dff676653665
(cherry picked from commit db8ae41da2)
 2020-08-11 04:46:09 +00:00
Sooraj Sasindran
9830b28db1 [automerger skipped] Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd95 am: 1e14220da2 -s ours am: 3ae0c9d34c -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: I65669e8bac7e2b89083549ba40a95a045b36f9da
 2020-08-11 00:53:04 +00:00
Mattias Nilsson
7068733091 [automerger skipped] Move config_inflateSignalStrength to CC am: f8c6f34832 am: b6bd23c222 -s ours am: a278421b01 -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: I12cfd9ee954a5b8eb14f40ae8e06e88ce827f972
 2020-08-11 00:52:53 +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
Treehugger Robot
5f0131168c [automerger skipped] Merge "Update Dagger2 dependencies." am: b34c1fe4ba am: e73de8ccda -s ours am: bbf6c3bd7d -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: I2b1a1c085122c1243f7f5cc1821c82bd07db3f09
 2020-08-11 00:28:39 +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
95d44c794e [automerger skipped] Merge changes from topic "inflate-signal" into rvc-dev-plus-aosp am: 8835581cc9 -s ours 
am skip reason: Change-Id I494cb93a2c72ff3df2ef45ad737c5606132e32d1 with SHA-1 8f90a92c18 is in history

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

Change-Id: I33a8aeded3b67ebc69807d6d287d96570c1b8a1c
 2020-08-10 23:25:27 +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
6a6e0c282d Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094 am: 2b97b69661 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Ib21378fd78ad3f69c7dc9c4270b35e94b6bd64b2
 2020-08-10 21:06:59 +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
Lucas Dupin
c3e75d31e6 Change date format for better 'ja' compatibility am: 83f4bc398e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345066

Change-Id: I0ba174d9202d4e4d2ed6151ec929ce24487c58e0
 2020-08-10 20:34:15 +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
Lucas Dupin
83f4bc398e Change date format for better 'ja' compatibility 
eeeMMd doesn't properly translate dates in Japanese.
According to ICU team, we should be using EEEMMd instead.

The date output will be different in ja, ko, th out of 728 locales.

Test: visual
Fixes: 161186825
Change-Id: Ib551d532f08b89be3a0679c44c51b65f493f1a65
(cherry picked from commit 18bd42434f)
 2020-08-10 16:55:04 +00:00
Jooyung Han
668e478fda Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp am: ce3fd2b509 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325559

Change-Id: Ifecb4e7c5ae7a0df26346b50dec6f38ecc9282c2
 2020-08-10 16:51:27 +00:00
Jooyung Han
ce3fd2b509 Merge "Switch aidl::nullable to std::optional" into rvc-dev-plus-aosp 2020-08-10 16:31:18 +00:00
TreeHugger Robot
2af8e46e72 Merge "Make non-blockable notification more robust" into rvc-d1-dev am: d8c6c356c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12333120

Change-Id: I60aeeebfe0c1598817cf608135e0ae9f9808d324
 2020-08-10 16:30:31 +00:00
TreeHugger Robot
d8c6c356c3 Merge "Make non-blockable notification more robust" into rvc-d1-dev 2020-08-10 16:13:54 +00:00
Hasini Gunasinghe
d362bd0e16 [automerger skipped] Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d am: 7896d08fec -s ours am: 67a96b1a03 -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: I158f53e4d87089a30e152b72cf7e6fc7949ab6db
 2020-08-10 15:57:42 +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
1a306394c9 Merge "Verify pending intent flags" am: f623c1e2c2 am: d583f34df1 am: 8d2626f55a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: I885046eb25c6dafbcb4284fd94bff0052f7bdd09
 2020-08-10 02:27:25 +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
Tim Murray
539d92beb7 Merge "Do not leak dump objects." into rvc-d1-dev am: 62c3a4f46b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12319481

Change-Id: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
 2020-08-09 19:55:41 +00:00
Tim Murray
62c3a4f46b Merge "Do not leak dump objects." into rvc-d1-dev 2020-08-09 19:44:23 +00:00
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