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
Ulyana Trafimovich
10e02f55c0 Merge "Drop dependency of android.test.mock -> android.test.base." am: f08e8871d4 am: 72003fb685 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1434135

Change-Id: I1f396f7d3e6af15c236ece54d7b2decb07c09b51
 2020-09-23 16:14:06 +00:00
Suren Baghdasaryan
193da6e642 Report ION usage event when ION heap size is 0 
In a situation when ION heap size is 0 dumpsys meminfo will not report
ION memory usage. Fix this by differentiating 0-size ION heap or pool
from the cases when /sys/kernel/ion/* do not exist or not readable.

Bug: 168942451
Test: emulate 0-size ION heap and run dumpsys meminfo
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I66624c9e3c73a59462cce8830a36323677db0029
 2020-09-23 16:09:08 +00:00
Ulyana Trafimovich
72003fb685 Merge "Drop dependency of android.test.mock -> android.test.base." am: f08e8871d4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1434135

Change-Id: Ibc8c8869ef2d436aa745dff6220a8e70f47e9a29
 2020-09-23 15:34:57 +00:00
Ulyana Trafimovich
f08e8871d4 Merge "Drop dependency of android.test.mock -> android.test.base." 2020-09-23 14:54:16 +00:00
Marvin Ramin
186d372cba Reconnect CEC HAL callback 
When the HAL service crashes, reconnect to the HAL with retries and
ensure that the callback is reconnected as well.

Bug: 167649125
Test: make; flash; kill cec hal process and ensure CEC messages are
still sent and received afterwards

Change-Id: I5686f5dcf50c8f8bf67533596c39ac697f1e7263
 2020-09-23 13:27:09 +00:00
Treehugger Robot
96c184e1cf Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 am: 5bcf151c30 am: 15c70f85ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378632

Change-Id: I2a32126aae4d315911509b86d44928e6ac8f525b
 2020-09-23 11:32:15 +00:00
Paul Hu
9830fe8a19 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" am: 41344e427c am: a5bd8f91f5 am: 451ab5646b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431470

Change-Id: I44f2db6b3563cf002372a2e97cb6849275d139fd
 2020-09-23 11:31:46 +00:00
Treehugger Robot
15c70f85ba Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 am: 5bcf151c30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378632

Change-Id: Idc9448c78a140962a4eec43cbd6b8358d021ff6e
 2020-09-23 11:04:42 +00:00
Paul Hu
451ab5646b Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" am: 41344e427c am: a5bd8f91f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431470

Change-Id: Iaffb47dc36b6404e3dc8acb823dc8ac8bde3cd7a
 2020-09-23 11:04:09 +00:00
Treehugger Robot
5bcf151c30 Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378632

Change-Id: I01d5caddd880524366df2d6d196908f902534e58
 2020-09-23 10:39:39 +00:00
Paul Hu
a5bd8f91f5 Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" am: 41344e427c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431470

Change-Id: Iff88eb873217cf12ed9fc9d4ed9bd88a9b656b95
 2020-09-23 10:36:50 +00:00
Ulya Trafimovich
c578ab0ada Drop dependency of android.test.mock -> android.test.base. 
There should be no such dependency.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 169137403
Bug: 132357300
Change-Id: Iaa7414be66581c01c6acbf367dc165cd8af78615
 2020-09-23 11:08:01 +01:00
Treehugger Robot
5f7d33da75 Merge "Update language to comply with Android’s inclusive language guidance" 2020-09-23 09:57:17 +00:00
Paul Hu
41344e427c Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to DownloadProvider" 2020-09-23 09:54:41 +00:00
Anton Hansson
00377e4d90 Merge "Add genrules for merged current.txt" am: 591327acd4 am: e21772ed50 am: 5d0b80fb10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432681

Change-Id: Ibd97e2110a0c4b168f8b86cf675c6648b2f3abd4
 2020-09-23 09:40:10 +00:00
Anton Hansson
5d0b80fb10 Merge "Add genrules for merged current.txt" am: 591327acd4 am: e21772ed50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432681

Change-Id: I952efb47b3fb874c38bb805429311cefa37da07e
 2020-09-23 09:09:31 +00:00
Anton Hansson
e21772ed50 Merge "Add genrules for merged current.txt" am: 591327acd4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432681

Change-Id: I19fd4adb80344dd3c500cf326c3cda67db9ba106
 2020-09-23 08:27:52 +00:00
Remi NGUYEN VAN
daed646e47 Remove unused testutils lib from tethering tests 
frameworks-base-testutils is unused in tethering integration tests, so
the dependency can be removed.
That test library also contains test classes, so removing the dependency
allows tethering tests to stop running the associated tests.

Also add jarjar rules to the unit tests to zap (remove) the test classes
from the output APK. Ideally the unit tests should stop depending on
that library too (TestableLooper can be used instead of TestLooper), or
the frameworks-base-testutils library should stop including test
classes.

Bug: 167968946
Test: m CtsTetheringTest TetheringTests
Change-Id: Ie950ce5b6181e388a7f71da430fd2dd8ada32e49
 2020-09-23 17:10:42 +09:00
Anton Hansson
591327acd4 Merge "Add genrules for merged current.txt" 2020-09-23 07:45:37 +00:00
Remi NGUYEN VAN
804d99979a Merge "tethering: DAD Proxy Daemon" am: 199613f2ef am: 692b986c12 am: 0b1738fbd8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645

Change-Id: I308a9f5ba1b77fe1c3263a610354d76dc8b127ae
 2020-09-23 06:19:15 +00:00
Remi NGUYEN VAN
0b1738fbd8 Merge "tethering: DAD Proxy Daemon" am: 199613f2ef am: 692b986c12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645

Change-Id: I25eb7ff486716156a11cfd4b1f15e789ce154a7c
 2020-09-23 05:48:57 +00:00
Remi NGUYEN VAN
692b986c12 Merge "tethering: DAD Proxy Daemon" am: 199613f2ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645

Change-Id: Ib3bbe465b698feace1a3ec1f6588cfa7bff0c9fd
 2020-09-23 05:30:55 +00:00
Remi NGUYEN VAN
199613f2ef Merge "tethering: DAD Proxy Daemon" 2020-09-23 04:57:42 +00:00
Treehugger Robot
70d5e926be Merge "Add Czech keyboard default layout qwerty as optional." am: 2c4733e08d am: 3d0d61dede am: 5f350c94ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418951

Change-Id: I026b3df3e8c8e71a9ef4a1a6878b130be17d2598
 2020-09-22 23:26:00 +00:00
Treehugger Robot
5f350c94ef Merge "Add Czech keyboard default layout qwerty as optional." am: 2c4733e08d am: 3d0d61dede 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418951

Change-Id: Ifaa7edb9c26d0ca15db09fc0a7fe098b695e146c
 2020-09-22 22:57:54 +00:00
Treehugger Robot
3d0d61dede Merge "Add Czech keyboard default layout qwerty as optional." am: 2c4733e08d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418951

Change-Id: Id37b89876223d9b8313bbdb4ef7c8cdc3c53489e
 2020-09-22 22:31:52 +00:00
Treehugger Robot
2c4733e08d Merge "Add Czech keyboard default layout qwerty as optional." 2020-09-22 22:16:27 +00:00
Treehugger Robot
24da2739c0 Merge changes from topic "exif-webp" am: b2356e4d98 am: 00ce3a3594 am: 67ddcd19b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431429

Change-Id: Ibd131f2986a349767a3b22e192e36493eb98780e
 2020-09-22 21:42:50 +00:00
Jin Seok Park
3ba5d7eb2b Remove hidden API usage in ExifInterface am: 40b7a9f873 am: b2df4e05d8 am: 3162dab673 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431428

Change-Id: Ie7ced24e0de01cfc3d15abc673941b432e84e81e
 2020-09-22 21:42:46 +00:00
Treehugger Robot
67ddcd19b2 Merge changes from topic "exif-webp" am: b2356e4d98 am: 00ce3a3594 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431429

Change-Id: I130b0b080472833ca8c23b2ce3302d6e184887ca
 2020-09-22 21:24:09 +00:00
Jin Seok Park
3162dab673 Remove hidden API usage in ExifInterface am: 40b7a9f873 am: b2df4e05d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431428

Change-Id: Idc85109ad4203bfdf0121afaca3ba996789a8bb6
 2020-09-22 21:24:04 +00:00
Treehugger Robot
00ce3a3594 Merge changes from topic "exif-webp" am: b2356e4d98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431429

Change-Id: Ib0ff39b30ba8636006cc66bd8e31e691722e5742
 2020-09-22 20:59:07 +00:00
Jin Seok Park
b2df4e05d8 Remove hidden API usage in ExifInterface am: 40b7a9f873 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431428

Change-Id: If09b0a15a69d809185c174ca2c151490929c5ac5
 2020-09-22 20:55:16 +00:00
Treehugger Robot
01f17b925f Merge "CEC : Add additional validator for message record status" am: 8f150a68d9 am: 79e282d64b am: 74e93ddf98 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413608

Change-Id: I53ec0caefb1b5632adace6e8c433d50d88dfef6f
 2020-09-22 20:41:55 +00:00
Treehugger Robot
b2356e4d98 Merge changes from topic "exif-webp" 
* changes:
  Add function for adding EXIF to WebP files
  Remove hidden API usage in ExifInterface
 2020-09-22 20:10:22 +00:00
Treehugger Robot
74e93ddf98 Merge "CEC : Add additional validator for message record status" am: 8f150a68d9 am: 79e282d64b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413608

Change-Id: Ie8f0f25fcd57ad8c0360456bb5f4ac70aa25fc91
 2020-09-22 19:55:42 +00:00
Treehugger Robot
79e282d64b Merge "CEC : Add additional validator for message record status" am: 8f150a68d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413608

Change-Id: Ie974eb20b33ffcd44c135e86c95de6b5616ac85f
 2020-09-22 19:33:29 +00:00
Anton Hansson
933ad0fb03 Merge "Move api/*current.txt filegroups into api dir" am: 97165aa09e am: 39ce253f05 am: e206b228cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432680

Change-Id: I8a9dddc727506e820e8bce5b43f109f787ffedae
 2020-09-22 19:32:30 +00:00
Anton Hansson
e206b228cd Merge "Move api/*current.txt filegroups into api dir" am: 97165aa09e am: 39ce253f05 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432680

Change-Id: Id87feb4e3b383d6f19151ab50b93d90d8380243d
 2020-09-22 19:09:59 +00:00
Treehugger Robot
8f150a68d9 Merge "CEC : Add additional validator for message record status" 2020-09-22 19:03:41 +00:00
Tyler Wear
79ca7f7878 tethering: DAD Proxy Daemon 
DAD proxy daemon responsible for forwarding NS/NA between
tethered iface and upstream iface.

Change-Id: I2e58e10e7fa7dba6a6f63ad03b000549f3afc37e
 2020-09-22 11:58:49 -07:00
Anton Hansson
39ce253f05 Merge "Move api/*current.txt filegroups into api dir" am: 97165aa09e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432680

Change-Id: I8a5352a092c46edc5be24f4f0e1800926b0eeb2e
 2020-09-22 18:06:39 +00:00
Anton Hansson
85359f6f0b Add genrules for merged current.txt 
Feed metalava all module txt files and write a single file. These are
intended to replace the checked in monolithic current.txt eventually.
Note that they are unused for now, they're getting checked in to enable
easier collaboration.

Bug: 169034951
Test: m frameworks-base-api-{,system-,module-lib-}current-merged.txt
Test: Manual inspection for now, some very minor diffs
Change-Id: I1e1d0aff8475d3aaa354308bb70d54201488de61
 2020-09-22 18:53:15 +01:00
Anton Hansson
97165aa09e Merge "Move api/*current.txt filegroups into api dir" 2020-09-22 17:44:58 +00:00
Treehugger Robot
5b05780b87 Merge "Add jinpark to OWNERS" am: 727e195ee8 am: a8a2f9ad42 am: 442dc2ce6b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432795

Change-Id: I98e3793f49b792792398e7717cdb44bba5bb86c7
 2020-09-22 12:05:05 +00:00
Treehugger Robot
442dc2ce6b Merge "Add jinpark to OWNERS" am: 727e195ee8 am: a8a2f9ad42 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432795

Change-Id: I87e9251c6c3d4adfd7a8de11f6a5afb501a8ae45
 2020-09-22 11:42:59 +00:00
Treehugger Robot
a8a2f9ad42 Merge "Add jinpark to OWNERS" am: 727e195ee8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432795

Change-Id: I02adc4dbfb0a11b960ec10ddf03d0e12834ceba0
 2020-09-22 11:20:17 +00:00
Treehugger Robot
727e195ee8 Merge "Add jinpark to OWNERS" 2020-09-22 10:49:02 +00:00
Treehugger Robot
1052692bda Merge "Add the return branch when ringtone position is POS_UNKNOWN" am: 1e97308138 am: e2cfc0393b am: 3ee2ef20c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426650

Change-Id: I955f0fa0f9312c60d043dbd964a9baffcf941caf
 2020-09-22 09:54:03 +00:00
Mohammad Samiul Islam
b34f6b5c52 Replace broken --wait flag with --wait-for-staged-ready flag 
Read b/158314277#2 to understand how the flag got broken.

Since both streaming install and staged install are using --wait flag,
we need to change one of them to avoid conflict. We decided to change
the generic --wait flag for staged install to something more specific
like --wait-for-ready to avoid future conflicts.

Also added some internal test so that we can catch broken shell commands
sooner.

While at it, added test for --no-wait flag and install-multi-package
command too.

Bug: 158314277
Test: atest StagedInstallInternalTest#testAdbStagedInstallWaitForReadyFlagWorks
Test: atest StagedInstallInternalTest#testAdbStagedInstallNoWaitFlagWorks
Change-Id: I8d2d0db56a00cfffc942963c3ee72464ea770c88
Merged-In: I8d2d0db56a00cfffc942963c3ee72464ea770c88
(cherry picked from commit 42414a3ad8)
 2020-09-22 10:36:35 +01:00