Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
550,309 Commits 3 Branches 0 Tags
3c68185224adf9666d145488bfedd4e67bfcef66
Commit Graph

550309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junyu Lai
3c68185224 [automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 am: db24dfba36 -s ours 
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 e5a64d49da is in history

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

Change-Id: Ia46ccaf9e9c1f5d77f2da1adc7aa0fb9c9963284
 2020-08-11 05:29:27 +00:00
Junyu Lai
c12434d355 [automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours am: 4dd39b4cb6 -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: Ib986336e2d7ef9c34474cc8c21d181f680b4823e
 2020-08-11 05:28:38 +00:00
Junyu Lai
db24dfba36 Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557

Change-Id: I277aa6490272eb83eca87d01f0df1b6cf08f137e
 2020-08-11 05:16:15 +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
TreeHugger Robot
003989a2f3 Merge "Change ASSISTANT_SESSION_UNKNOWN ID" into rvc-qpr-dev am: d0cf46f6f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345488

Change-Id: I052fe620fe69f453b17bd7fe1a16ed6dd8041a78
 2020-08-11 02:11:16 +00:00
TreeHugger Robot
d0cf46f6f3 Merge "Change ASSISTANT_SESSION_UNKNOWN ID" into rvc-qpr-dev 2020-08-11 02:03:03 +00:00
Nikita Dubrovsky
cce1c87815 Merge "Add DeviceConfig flag for drag direction angle threshold for cursor drag" into rvc-qpr-dev am: 7094198a26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12318230

Change-Id: Ie8d6995567b32b5552ee2e1d0eb92d9643e9bc08
 2020-08-11 02:02:41 +00:00
TreeHugger Robot
c563fd2fb0 Merge "Shorten month on AOD date" into rvc-qpr-dev am: 2cdf843ca8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12347247

Change-Id: I7ee17e127c3405c063686a0562d0ca979f3a5519
 2020-08-11 02:01:35 +00:00
Nikita Dubrovsky
7094198a26 Merge "Add DeviceConfig flag for drag direction angle threshold for cursor drag" into rvc-qpr-dev 2020-08-11 01:53:10 +00:00
TreeHugger Robot
2cdf843ca8 Merge "Shorten month on AOD date" into rvc-qpr-dev 2020-08-11 01:49:00 +00:00
Sooraj Sasindran
3e68813dc6 [automerger skipped] Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd95 am: 1e14220da2 -s ours am: 3ae0c9d34c -s ours am: 9830b28db1 -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: Ibeb3e19783dc6fba6fbdc277deb5f48b64097f1d
 2020-08-11 01:13:14 +00:00
Mattias Nilsson
815b1b4ddf [automerger skipped] Move config_inflateSignalStrength to CC am: f8c6f34832 am: b6bd23c222 -s ours am: a278421b01 -s ours am: 7068733091 -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: I7e511b3bc7c14618e8462ae9136ce8abc6ae05bd
 2020-08-11 01:13:03 +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
Treehugger Robot
6c1df0c6a4 [automerger skipped] Merge "Update Dagger2 dependencies." am: b34c1fe4ba am: e73de8ccda -s ours am: bbf6c3bd7d -s ours am: 5f0131168c -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: Ic5d7336be6998b2beeb09f26d4f44c7160ec6434
 2020-08-11 00:44:28 +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
Lucas Dupin
e5f5be9fd2 Shorten month on AOD date 
Test: visual
Fixes: 161186825
Fixes: 163309955
Change-Id: I8e62eef0f32812380bc1d19d87d7611bd395eabb
 2020-08-11 00:18:50 +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
99b5b1855d [automerger skipped] Merge changes from topic "inflate-signal" into rvc-dev-plus-aosp am: 8835581cc9 -s ours am: 95d44c794e -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: Id6864f51d90e408fad3b3c65b697e6188c1ea9ca
 2020-08-10 23:44:08 +00:00
Treehugger Robot
b34c1fe4ba Merge "Update Dagger2 dependencies." 2020-08-10 23:41:18 +00:00
TreeHugger Robot
8b47e63e92 Merge "Resume next activity if pausing app died" into rvc-qpr-dev am: 813999adbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12343623

Change-Id: Ie4ef8043dd947cc9e56fb6b970867089927a7f85
 2020-08-10 23:34:33 +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
813999adbd Merge "Resume next activity if pausing app died" into rvc-qpr-dev 2020-08-10 23:18:41 +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
2cf9b73e4c Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 am: 1e16995094 am: 2b97b69661 am: 6a6e0c282d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Ic160dbf7e56f64adc1deffef34b9f08fbda9ac54
 2020-08-10 21:27:46 +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
Automerger Merge Worker
7e0893e8fa Merge "Change date format for better 'ja' compatibility am: 83f4bc398e am: afe934fbfb" into rvc-qpr-dev-plus-aosp 2020-08-10 20:47:24 +00:00
Lucas Dupin
70753c4509 Change date format for better 'ja' compatibility am: 83f4bc398e am: afe934fbfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345066

Change-Id: I945e5548379e8d69ff3de28efad2377450c9dd99
 2020-08-10 20:47:10 +00:00
Lucas Dupin
256df9ea88 Change date format for better 'ja' compatibility am: 83f4bc398e am: c3e75d31e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345066

Change-Id: Idf3639b34c7219ad61f8ced1dd293e9518de66fe
 2020-08-10 20:47:02 +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
afe934fbfb Change date format for better 'ja' compatibility am: 83f4bc398e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345066

Change-Id: Ib6893aae866f86d7c241a8e43daefe7bd1b745de
 2020-08-10 20:35:38 +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
TreeHugger Robot
b6cc6f9ced Merge "Use header font on emergency button" into rvc-qpr-dev am: 51be8f8d5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345355

Change-Id: I486ca2597833a3a5c8eebce6fa2b9da16119a405
 2020-08-10 18:16:11 +00:00
TreeHugger Robot
46c190f2eb Merge "Add guts to media player on long press" into rvc-qpr-dev am: 994c26d04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12345484

Change-Id: I58a8160edba7e7e9c57ab863243fbe3b8d63c363
 2020-08-10 18:15:40 +00:00
TreeHugger Robot
51be8f8d5d Merge "Use header font on emergency button" into rvc-qpr-dev 2020-08-10 18:01:58 +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
TreeHugger Robot
994c26d04f Merge "Add guts to media player on long press" into rvc-qpr-dev 2020-08-10 17:56:47 +00:00
TreeHugger Robot
7dfc3e52d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 473433fced -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8014b785facd9616c882edbcd8ec1f405bbb1c8
 2020-08-10 17:38:37 +00:00
TreeHugger Robot
473433fced Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-10 17:18:37 +00:00