Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
485,098 Commits 3 Branches 0 Tags
dbaad120896b01ec5df4549d32bb683bafa324e2
Commit Graph

485098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JW Wang
dbaad12089 Run expiration when rollback lifetime is changed. DO NOT MERGE am: 9f8407b0aa am: 8121699da3 
Change-Id: Idedaa10232f4dc0425a2b2b620c48eb2dce9a4d8
 2020-04-01 03:05:42 +00:00
JW Wang
266e7c3893 [automerger skipped] Add logs for debugging am: 5b163cfcee am: 36cd122117 -s ours 
am skip reason: Change-Id I85adb8c3c5598ef4ce11550b51f22d1ce3c282a6 with SHA-1 5b163cfcee is in history

Change-Id: I1d25fbd1eb90bdc5374f7f7499cd968e1679cbd2
 2020-04-01 03:05:35 +00:00
JW Wang
8121699da3 Run expiration when rollback lifetime is changed. DO NOT MERGE am: 9f8407b0aa 
Change-Id: I16987d7e00c3fbab2ea9d8c25eafc826c18c4afa
 2020-04-01 02:56:01 +00:00
JW Wang
36cd122117 Add logs for debugging am: 5b163cfcee 
Change-Id: If1b7b84bccd2297b8bfa62514ce264173e89f8e7
 2020-04-01 02:55:58 +00:00
JW Wang
45fa425587 Merge changes I10355143,I85adb8c3 into rvc-dev am: 1d68911a9d am: f3f8d1b1d7 
Change-Id: Ic4c05a62db9855a00b48e6be4b0608555e2dcfb7
 2020-04-01 02:55:49 +00:00
JW Wang
4ff00a9403 Run expiration when rollback lifetime is changed. DO NOT MERGE am: 9f8407b0aa am: 8b07029f26 
Change-Id: If9193952f8b73350dff6cfa7e73a611124a0904f
 2020-04-01 02:55:46 +00:00
JW Wang
7a4e41bf08 Add logs for debugging am: 5b163cfcee am: ca390e122d 
Change-Id: I65bb30920d07f4119f1912e759918c7fcd77addb
 2020-04-01 02:55:42 +00:00
TreeHugger Robot
831c8d17c6 Merge "Cancel animation in previous rotation" into rvc-dev am: 9ba74bee62 am: c073006c5a 
Change-Id: I7f8e66e82b847e9da4f3f1a4d395197acf582f25
 2020-04-01 02:55:28 +00:00
Feng Cao
88e44b17d7 Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d33 am: 526ddca90c 
Change-Id: Ie0e3e2237192fbe7e4a1c273b0a142513ce7678a
 2020-04-01 02:55:04 +00:00
TreeHugger Robot
509ee26f1b Merge "Cancel animation in previous rotation" into rvc-dev am: 9ba74bee62 am: fa60bd709d 
Change-Id: I66a5404aa4f9d3ecf73b53094e0bc249c326472c
 2020-04-01 02:54:49 +00:00
Feng Cao
b6ad7232ad Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d33 am: 12a7be983b 
Change-Id: I478331739048158a4091f744560f9f7f57ebdb26
 2020-04-01 02:54:10 +00:00
TreeHugger Robot
fa60bd709d Merge "Cancel animation in previous rotation" into rvc-dev am: 9ba74bee62 
Change-Id: I05e57a0ed6fbb78d0395fbe8df182238a0f902b6
 2020-04-01 02:51:46 +00:00
JW Wang
f3f8d1b1d7 Merge changes I10355143,I85adb8c3 into rvc-dev am: 1d68911a9d 
Change-Id: I646313550fa2ff89f3a6df6394845d4824c31663
 2020-04-01 02:51:01 +00:00
JW Wang
8b07029f26 Run expiration when rollback lifetime is changed. DO NOT MERGE am: 9f8407b0aa 
Change-Id: I5e5f19289a1fb9224d9a2d4dfa2d45dde5614359
 2020-04-01 02:50:57 +00:00
JW Wang
ca390e122d Add logs for debugging am: 5b163cfcee 
Change-Id: Idbef34b58b57605d7044fe0cc04995743a4ceaa5
 2020-04-01 02:50:52 +00:00
Feng Cao
12a7be983b Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d33 
Change-Id: I1f12af050790ece8574c7e7f8f1545ab35fff369
 2020-04-01 02:50:49 +00:00
TreeHugger Robot
c073006c5a Merge "Cancel animation in previous rotation" into rvc-dev am: 9ba74bee62 
Change-Id: I989907f796cd0553dfd7b5b8cf1fe1ae5a0f1ef2
 2020-04-01 02:50:35 +00:00
Feng Cao
526ddca90c Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev am: f1771c0d33 
Change-Id: I6f20690be1dd45b240ee382b70ea9de8fcaf79a8
 2020-04-01 02:50:05 +00:00
JW Wang
1d68911a9d Merge changes I10355143,I85adb8c3 into rvc-dev 
* changes:
  Run expiration when rollback lifetime is changed. DO NOT MERGE
  Add logs for debugging
 2020-04-01 02:49:40 +00:00
TreeHugger Robot
9ba74bee62 Merge "Cancel animation in previous rotation" into rvc-dev 2020-04-01 02:48:42 +00:00
Automerger Merge Worker
54db8fedee Merge "Merge "3/n Refactor TaskContainers to TaskDisplayArea" into rvc-dev am: 886d2cf0f1 am: 50502a91ad" into rvc-d1-dev-plus-aosp 2020-04-01 02:43:52 +00:00
Andrii Kulian
4ed380145f Merge "3/n Refactor TaskContainers to TaskDisplayArea" into rvc-dev am: 886d2cf0f1 am: 86447d461c 
Change-Id: Ic1e8cfbd87784eeb07376cf8fab8c0bc43680e75
 2020-04-01 02:43:43 +00:00
Andrii Kulian
9e52592d29 Merge "3/n Refactor TaskContainers to TaskDisplayArea" into rvc-dev am: 886d2cf0f1 am: 50502a91ad 
Change-Id: I6e9a1d185db504e8183a170949a7134bcbdf13e6
 2020-04-01 02:43:33 +00:00
Feng Cao
f1771c0d33 Merge "Replace Nullable bundle with NonNull and use Bundle.EMPTY" into rvc-dev 2020-04-01 02:32:43 +00:00
Andrii Kulian
86447d461c Merge "3/n Refactor TaskContainers to TaskDisplayArea" into rvc-dev am: 886d2cf0f1 
Change-Id: I145f288240aaff27742bc0981e7bdd037ff97dd9
 2020-04-01 02:23:59 +00:00
Andrii Kulian
50502a91ad Merge "3/n Refactor TaskContainers to TaskDisplayArea" into rvc-dev am: 886d2cf0f1 
Change-Id: I30ce6ae643ede63b491c64dff78ba6696ae5161e
 2020-04-01 02:23:03 +00:00
Andrii Kulian
886d2cf0f1 Merge "3/n Refactor TaskContainers to TaskDisplayArea" into rvc-dev 2020-04-01 02:05:35 +00:00
Lucas Dupin
c906685847 Merge "Reset blur radius after dialog is gone" into rvc-dev am: 88c870e6e8 am: a2c31b3c77 
Change-Id: I4f0d50cce1e18f5a7794ee876da05d93f4eba90a
 2020-04-01 01:42:23 +00:00
Lucas Dupin
5d215d0e6c Merge "Do not crash if window is invalid" into rvc-dev am: 12a7967791 am: 06147234a8 
Change-Id: If439b9138287fdb55f04f65100e30076f4f58ce2
 2020-04-01 01:42:14 +00:00
Automerger Merge Worker
4d977980c6 Merge changes from topic "am-62cf96e558d742ccab9d58387a2cabd1" into rvc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803be8 am: 6f8db1afdd -s ours
  [automerger skipped] Simplify unregister logic for Connectivity Diagnostics callbacks. am: 982013743b am: f3cc967bc6 -s ours
  [automerger skipped] Clarify comments for Connectivity Diagnostics reports. am: 95a98c2efd am: 412cbc8760 -s ours
  [automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 93c1e656b5 am: 2bf058b202 -s ours
  [automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab03 am: ea9699a505 -s ours
  [automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in CS. am: 4600fa52a6 am: af15704e32 -s ours
  [automerger skipped] Decrement networkRequestPerUid when callbacks are unregistered. am: 13564eedd5 am: c3f92fbdce -s ours
  [automerger skipped] Invoke onConnectivityReport on registering ConnectivityDiagnostics. am: 560eb2655b am: 9b95f41038 -s ours
 2020-04-01 01:41:44 +00:00
Lucas Dupin
de9e6ed005 Merge "Reset blur radius after dialog is gone" into rvc-dev am: 88c870e6e8 am: 459da77d3b 
Change-Id: I6a92d9fe7e82315031f61b6cb6fbac4543c202af
 2020-04-01 01:41:39 +00:00
Cody Kesting
01bdb427e3 [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803be8 am: 6f8db1afdd -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 45bbc4f6ac is in history

Change-Id: Ic6ec72c3d809fab0f50a6f4b386ebf050bf60d25
 2020-04-01 01:41:34 +00:00
Lucas Dupin
8cc9303a00 Merge "Do not crash if window is invalid" into rvc-dev am: 12a7967791 am: c486134839 
Change-Id: I499362f333f7764d7d3c3f44a4c11c771573baf4
 2020-04-01 01:41:32 +00:00
Cody Kesting
6cfe1583fe [automerger skipped] Simplify unregister logic for Connectivity Diagnostics callbacks. am: 982013743b am: f3cc967bc6 -s ours 
am skip reason: Change-Id I9096969a1bf33da72b117f5bbc88257df805e688 with SHA-1 f047313940 is in history

Change-Id: I92333ea01c7b82c132ba3c3d83a7ce4f43b3a09e
 2020-04-01 01:41:30 +00:00
Cody Kesting
fc09d2c686 [automerger skipped] Clarify comments for Connectivity Diagnostics reports. am: 95a98c2efd am: 412cbc8760 -s ours 
am skip reason: Change-Id I748bd9ded72a34d89f13bd4362d6d4da62b910b8 with SHA-1 604dd40cf0 is in history

Change-Id: Ice3af5e3bcbbeb2c84e188f74c5e1ae59b3501ee
 2020-04-01 01:41:25 +00:00
Cody Kesting
ab62767ec1 [automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 93c1e656b5 am: 2bf058b202 -s ours 
am skip reason: Change-Id Ia5387ca2ce7c3fcbd04dc7fbff5266f7bcc71694 with SHA-1 2091bd9059 is in history

Change-Id: I3c4c90fa43ac063c5c10e5d0e5156b9cc53c3759
 2020-04-01 01:41:22 +00:00
Chalard Jean
b5c9854ddb [automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab03 am: ea9699a505 -s ours 
am skip reason: Change-Id I803bdec80e27ee80d3a39844c5fb7aed584ab07d with SHA-1 5fad8aa761 is in history

Change-Id: Ia706cfbcea4f390417a5af91a435e3f031e04b0c
 2020-04-01 01:41:19 +00:00
Cody Kesting
c24efd79b7 [automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in CS. am: 4600fa52a6 am: af15704e32 -s ours 
am skip reason: Change-Id Ib99e68d5ae47fa27e12428f9a60a2c1204ac59a2 with SHA-1 c7c6a4ac12 is in history

Change-Id: I8f05b2bc6914fac024513c455ed800ce5578f494
 2020-04-01 01:41:17 +00:00
Cody Kesting
aae9b74a67 [automerger skipped] Decrement networkRequestPerUid when callbacks are unregistered. am: 13564eedd5 am: c3f92fbdce -s ours 
am skip reason: Change-Id Ia5ed39c1d8e6221cd402be4f8baf69fa643a6113 with SHA-1 662076b1a7 is in history

Change-Id: I769105b5f30a741e70a7a46d593d2d48905d620f
 2020-04-01 01:41:15 +00:00
Cody Kesting
f7b07e3aee [automerger skipped] Invoke onConnectivityReport on registering ConnectivityDiagnostics. am: 560eb2655b am: 9b95f41038 -s ours 
am skip reason: Change-Id I924ba8fdcc847f453557021591bde38602fe089c with SHA-1 95ec0b206b is in history

Change-Id: I176af823f438a9fc095af176563b141d7acc98fb
 2020-04-01 01:41:12 +00:00
Cody Kesting
12f778cd8c [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803be8 -s ours am: e4b8b2ec2a -s ours 
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 45bbc4f6ac is in history

Change-Id: I6505fc96431a2a283c9e1f0c3a39c0873827b80b
 2020-04-01 01:41:00 +00:00
TreeHugger Robot
50cf6bb302 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 1db5f59dcf am: 4597d66a6f 
Change-Id: Ica3bb4d054510662993c7c4958321fa93b7a8c4d
 2020-04-01 01:39:58 +00:00
TreeHugger Robot
cf26643475 Merge "[SM06] Collect mobile NetworkStats metrics by collapsed rat type" into rvc-dev am: 1db5f59dcf am: 1596f03415 
Change-Id: Ib1f614fcbd49b8b0fbc9a37cca0800664a23f425
 2020-04-01 01:39:39 +00:00
Lucas Dupin
a2c31b3c77 Merge "Reset blur radius after dialog is gone" into rvc-dev am: 88c870e6e8 
Change-Id: Ic716220e93c0c28bf42b99ac69673ff198c7bc84
 2020-04-01 01:34:21 +00:00
Lucas Dupin
06147234a8 Merge "Do not crash if window is invalid" into rvc-dev am: 12a7967791 
Change-Id: I07da60b86811971b0aac4910a438d5598ab07ba4
 2020-04-01 01:33:59 +00:00
Cody Kesting
6f8db1afdd Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803be8 
Change-Id: Id83214bd033f56295868f7c54a659a4d4b84fe79
 2020-04-01 01:33:46 +00:00
Cody Kesting
f3cc967bc6 Simplify unregister logic for Connectivity Diagnostics callbacks. am: 982013743b 
Change-Id: I6b9541fd562c3e65af65e9b5b754909d96f332fd
 2020-04-01 01:33:42 +00:00
Cody Kesting
412cbc8760 Clarify comments for Connectivity Diagnostics reports. am: 95a98c2efd 
Change-Id: I9263ddeb7b757e6c147fcf57b5fd9825f2fd3860
 2020-04-01 01:33:40 +00:00
Cody Kesting
2bf058b202 Sort administrator UIDs for NetworkCapabilities. am: 93c1e656b5 
Change-Id: I06d79c338f9994988373f43ab67efc1315596e5c
 2020-04-01 01:33:36 +00:00
Chalard Jean
ea9699a505 Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab03 
Change-Id: I4b52b619cde3b080bfe58f69dacdb0078a11a7e8
 2020-04-01 01:33:30 +00:00