Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
b161dfeb3a Merge "Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc" into rvc-d1-dev-plus-aosp 2020-06-12 08:45:55 +00:00
TreeHugger Robot
ed3d4489d6 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 238232ad88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: I135ae4a5e1e66686876c703234d73c174b3e84be
 2020-06-12 08:45:40 +00:00
TreeHugger Robot
032062ba12 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d am: ea74ace506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: I165609023b86a3f158d9493bcdf152c5f171515b
 2020-06-12 08:45:28 +00:00
TreeHugger Robot
a0f8d39903 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d am: 3631562142 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: I009f4e105af3cebeabebc4e59b09f613e71fc7cd
 2020-06-12 08:45:25 +00:00
TreeHugger Robot
ea09596413 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: I47b9b2568f394bfda6432b950ed89eeff9083d59
 2020-06-12 08:45:23 +00:00
TreeHugger Robot
0074b79eb0 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d am: ea74ace506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: I791446f1633c072258c06874522fb2d19802f8c8
 2020-06-12 08:45:08 +00:00
TreeHugger Robot
238232ad88 Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: Iadcc4ef7548a6ffe3bc009897f81112393f721ac
 2020-06-12 08:32:44 +00:00
TreeHugger Robot
617a72f3dc Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838738

Change-Id: Ia600d2ebd7d1a94f45d479f096fbb32f4e4a995e
 2020-06-12 08:32:03 +00:00
TreeHugger Robot
ea74ace506 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: Ia7d54f944eee5909b2da9d77dff0329ab9c59aea
 2020-06-12 08:31:42 +00:00
TreeHugger Robot
3631562142 Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e67d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844170

Change-Id: If2d387e308bb725e4cdc6af9a3a5c0f89236b730
 2020-06-12 08:31:26 +00:00
TreeHugger Robot
6dca466770 Merge "GnssStats atom entity name change" into rvc-dev 2020-06-12 08:17:59 +00:00
TreeHugger Robot
d4d283e67d Merge "Increase configs per uid limit to 20" into rvc-dev 2020-06-12 08:12:53 +00:00
Remi NGUYEN VAN
eee629f4c7 Move Inet[4]AddressUtils to libs/net 
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.

Also refine comments in DhcpResults following feedback in previous
change.

Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
 2020-06-12 17:04:06 +09:00
Remi NGUYEN VAN
0aff83bae4 [automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 am: dccd3d6395 -s ours am: 5082f70804 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 1006a47b29 is in history

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

Change-Id: Ice0b8f2901a265334d3ec32cb9527384a22ff574
 2020-06-12 07:33:27 +00:00
Automerger Merge Worker
798c6fef9f Merge "[automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 -s ours am: 88591584c6 -s ours" into rvc-d1-dev-plus-aosp am: c36b1433a9 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 1006a47b29 is in history

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

Change-Id: I1d353fda00330e0ce1f423eef03601db842ba22a
 2020-06-12 07:33:06 +00:00
Automerger Merge Worker
c201d011d8 Merge "Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: f5615c9707" into rvc-d1-dev-plus-aosp am: 365ea47180 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: I5daa5845d7d151cd0d11bb7b4559698abfdb414d
 2020-06-12 07:32:28 +00:00
Remi NGUYEN VAN
1e2eb3a523 [automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 am: dccd3d6395 am: 4695bfc901 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 ac0c8988ce is in history

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

Change-Id: I08c6b563dea61eb50922224cbf08ed6875c9fad5
 2020-06-12 07:31:51 +00:00
TreeHugger Robot
0746354024 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: f5615c9707 am: 93c00ce6a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: Ia42e03ecd97b628101b19ebb8769c24b4eb463e3
 2020-06-12 07:31:19 +00:00
TreeHugger Robot
1479111ec9 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: b8e0bafbd5 am: defdc42760 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: If75215b9b537e535c13f4dbdf59b0128463e09e2
 2020-06-12 07:31:01 +00:00
Remi NGUYEN VAN
4695bfc901 Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 am: dccd3d6395 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835422

Change-Id: I999f9f95fdd312868660f6750fa8ad69310398c7
 2020-06-12 07:19:37 +00:00
Remi NGUYEN VAN
5082f70804 [automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 am: dccd3d6395 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 ac0c8988ce is in history

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

Change-Id: I0addd6b66d08b973510fc92bcaab517ffbad737d
 2020-06-12 07:19:13 +00:00
Automerger Merge Worker
c36b1433a9 Merge "[automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 -s ours am: 88591584c6 -s ours" into rvc-d1-dev-plus-aosp 2020-06-12 07:19:10 +00:00
Remi NGUYEN VAN
d39688f865 [automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 -s ours am: 88591584c6 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 ac0c8988ce is in history

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

Change-Id: I93f37b306f9be398b951c7a6e90a1c83fc62b875
 2020-06-12 07:19:01 +00:00
TreeHugger Robot
93c00ce6a1 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: f5615c9707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: I0336ea3e2f3e687385793f279e75e46c5a0db54c
 2020-06-12 07:19:00 +00:00
Automerger Merge Worker
365ea47180 Merge "Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: f5615c9707" into rvc-d1-dev-plus-aosp 2020-06-12 07:18:56 +00:00
TreeHugger Robot
ef02488cc1 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: f5615c9707 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: Iceb4fa4685765f3048dc0b14ed4472ade7605baa
 2020-06-12 07:18:48 +00:00
TreeHugger Robot
defdc42760 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb am: b8e0bafbd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: Iea7c49398a8d1995c64ffe7392a119eec2f67e2d
 2020-06-12 07:18:37 +00:00
Remi NGUYEN VAN
dccd3d6395 Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835422

Change-Id: I955833ccea9d29efac0d7e09bc6093f92da6b6ba
 2020-06-12 07:03:22 +00:00
Remi NGUYEN VAN
88591584c6 [automerger skipped] Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev am: 0109b8da49 -s ours 
am skip reason: Change-Id I5b85c1a541ecdf9dd3e9403b9fb1c2b5aba98dd8 with SHA-1 ac0c8988ce is in history

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

Change-Id: I25b899027b1712a63694c40c5b377e89360a6841
 2020-06-12 07:03:14 +00:00
TreeHugger Robot
b8e0bafbd5 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: If3a14335833a78b0306d0f3fa9bcdd15820697c1
 2020-06-12 07:02:56 +00:00
TreeHugger Robot
f5615c9707 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: I72d588033a05ae98efec9b4735e8cf9f5cdc1dda
 2020-06-12 07:02:28 +00:00
Wei Sheng Shih
7f75107f4e Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: cd86ac588f am: fdda6890f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: If584ad331005dd44210b46e5536c495a16838edb
 2020-06-12 06:48:20 +00:00
Automerger Merge Worker
ec70aff47e Merge "Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: 6f5e679917 am: a5c1755a72" into rvc-qpr-dev-plus-aosp 2020-06-12 06:47:19 +00:00
Wei Sheng Shih
eb94603d7b Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: 6f5e679917 am: 85d1eb5af1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: I4258ea24660b936fdbc0890cc763bf864cd55f55
 2020-06-12 06:46:59 +00:00
Wei Sheng Shih
c7db817d5b Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: 6f5e679917 am: a5c1755a72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: Iddcad051ec8e1c9ec9d54a0de2f584141002ef60
 2020-06-12 06:46:58 +00:00
Remi NGUYEN VAN
0109b8da49 Merge "Remove IpClientCallbacks dependency on DhcpResults" into rvc-dev 2020-06-12 06:38:02 +00:00
TreeHugger Robot
70b9d348eb Merge "Reset app routes when global a2dp state changed" into rvc-dev 2020-06-12 06:37:46 +00:00
Tony Huang
8672410848 Let activity resume after bubbles expanded 
Add moveTaskToFront call to ensure activity resume when bubbles
expanded which means activityView status is activity started.

Bug: 152416787
Test: Check event log
Test: Open FB messengers, expand FB messengers bubbles and click back
Change-Id: I9f95e42a4573185df83c0e7438972fea84bbb176
 2020-06-12 14:36:15 +08:00
Wei Sheng Shih
fdda6890f7 Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: cd86ac588f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: I7d81f1f86b5d90e6a0fb090a07142c3c6e808a88
 2020-06-12 06:32:02 +00:00
Wei Sheng Shih
a5c1755a72 Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: 6f5e679917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: Ifd5f9cfce04ab35856e85d752706960b0cd00ed3
 2020-06-12 06:31:54 +00:00
Wei Sheng Shih
85d1eb5af1 Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 am: 6f5e679917 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: I9829427b6817ad001395d497d49364296fd48498
 2020-06-12 06:31:51 +00:00
Wei Sheng Shih
cd86ac588f Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: I92908055859e715ee9cb0cabff5be48a93822b58
 2020-06-12 06:19:51 +00:00
Wei Sheng Shih
6f5e679917 Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev am: 49ded46160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818545

Change-Id: I8bad6eafd5c62eea5fbdaef26fa7cac93ddd93bc
 2020-06-12 06:19:35 +00:00
Winson Chung
f9ef08d7ff Adding blur supported check to shared lib 
Bug: 157946272
Test: Manual
Change-Id: I4b8b63e9096d27a06896058b41c8e2cec271dd0d
 2020-06-11 23:10:34 -07:00
Wei Sheng Shih
49ded46160 Merge "Fix task root bounds be overwritten when dismiss split screen." into rvc-dev 2020-06-12 06:09:33 +00:00
Mady Mellor
c1a75a9fbb Fix an obscure NPE 
Test: treehugger
Fixes: 157660321
Change-Id: I0ad1b45e277bcbd1a4017de009033291968a7b69
 2020-06-11 23:07:29 -07:00
TreeHugger Robot
fcacbd7460 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cab8a73c6d -s ours am: 07f9d18411 -s ours am: b8c7cb2e19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2d45e27f26c183902426ed52f2ab07aca4c60c9
 2020-06-12 06:04:22 +00:00
Automerger Merge Worker
27a9dd8442 Merge "Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb am: e0d455c9d4" into rvc-d1-dev-plus-aosp am: adf965c9fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: Id2d89aad4aaf2925c49483ee1b3f6356b372d03a
 2020-06-12 06:04:13 +00:00
TreeHugger Robot
86da542170 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: cab8a73c6d -s ours am: 4ea2e2e0cc -s ours am: c0548a39a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id235164c2841ed2f67e8ca882effd18f172f5ddd
 2020-06-12 06:04:02 +00:00
TreeHugger Robot
a859f13ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 0f8165ffdb -s ours am: b234a0b518 -s ours am: a772862791 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d0c36efa0520bc58bda53e1da8d27b5dc3c7bde
 2020-06-12 06:03:56 +00:00